svn commit: r893542 - /httpd/httpd/trunk/server/main.c

[rp...@apache.org]

Author: rpluem
Date: Wed Dec 23 15:09:21 2009
New Revision: 893542

URL: http://svn.apache.org/viewvc?rev=893542&view=rev
Log:
* With APR >= 2.0 there is no longer an APR-UTIL only an APR.

Modified:
    httpd/httpd/trunk/server/main.c

Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=893542&r1=893541&r2=893542&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Wed Dec 23 15:09:21 2009
@@ -97,10 +97,15 @@
     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);
+#if APR_MAJOR_VERSION >= 2
+    printf("Server loaded:  APR %s\n", apr_version_string());
+    printf("Compiled using: APR %s\n", APR_VERSION_STRING);
+#else
     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);
+#endif
     /* sizeof(foo) is long on some platforms so we might as well
      * make it long everywhere to keep the printf format
      * consistent