From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 21 May 2016 14:55:06 +0000 (+0100)
Subject: Add glibc version to libraries report
X-Git-Tag: exim-4_88_RC1~99
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=01f3091ab20e5b78419d2b7cff106b421600e553

Add glibc version to libraries report
---

diff --git a/src/src/exim.c b/src/src/exim.c
index 4ea42fdc2..d462c3e84 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -12,6 +12,10 @@ Also a few functions that don't naturally fit elsewhere. */
 
 #include "exim.h"
 
+#ifdef __GLIBC__
+# include <gnu/libc-version.h>
+#endif
+
 #ifdef USE_GNUTLS
 # include <gnutls/gnutls.h>
 # if GNUTLS_VERSION_NUMBER < 0x030103 && !defined(DISABLE_OCSP)
@@ -1025,6 +1029,14 @@ DEBUG(D_any) do {
   fprintf(f, "Compiler: <unknown>\n");
 #endif
 
+#ifdef __GLIBC__
+  fprintf(f, "Library version: Glibc: Compile: %d.%d\n",
+	       	__GLIBC__, __GLIBC_MINOR__);
+  if (__GLIBC_PREREQ(2, 1))
+    fprintf(f, "                        Runtime: %s\n",
+	       	gnu_get_libc_version());
+#endif
+
 #ifdef SUPPORT_TLS
   tls_version_report(f);
 #endif
@@ -1040,7 +1052,7 @@ DEBUG(D_any) do {
   characters; unless it's an ancient version of PCRE in which case it
   is not defined. */
 #ifndef PCRE_PRERELEASE
-#define PCRE_PRERELEASE
+# define PCRE_PRERELEASE
 #endif
 #define QUOTE(X) #X
 #define EXPAND_AND_QUOTE(X) QUOTE(X)