From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 1 Apr 2006 02:48:24 +0000 (+0000)
Subject:   With all of the, uhm, interesting manners in which httpd
X-Git-Tag: 2.3.0~2476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a60c07a942b7351daf742cca6da8f32b99b5fa4;p=thirdparty%2Fapache%2Fhttpd.git

  With all of the, uhm, interesting manners in which httpd
  can be built and installed, let's ensure httpd -V gives the
  reporter a chance to identify the APR flavor used to compile
  and to run httpd when reporting bugs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390573 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/main.c b/server/main.c
index 72f79634df6..fe0bc84a0a2 100644
--- a/server/main.c
+++ b/server/main.c
@@ -20,6 +20,8 @@
 #include "apr_general.h"
 #include "apr_lib.h"
 #include "apr_md5.h"
+#include "apr_version.h"
+#include "apu_version.h"
 
 #define APR_WANT_STDIO
 #define APR_WANT_STRFUNC
@@ -90,7 +92,10 @@ static void show_compile_settings(void)
     printf("Server built:   %s\n", ap_get_server_built());
     printf("Server's Module Magic Number: %u:%u\n",
            MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
-
+    printf("Server loaded:  APR %s, APR-UTIL %s\n",
+           apr_version_string(), apu_version_string());
+    printf("Compiled using: APR %s, APR-UTIL %s\n",
+           APR_VERSION_STRING, APU_VERSION_STRING);
     /* sizeof(foo) is long on some platforms so we might as well
      * make it long everywhere to keep the printf format
      * consistent