Update transormations.

[apache] / configure.in

diff --git a/configure.in b/configure.in
index c15b51a6b9e78248aea621e2bde09c4b678eeb64..318e488c80f74c12ee9e7728217e90eebc0fc5b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -93,9 +93,9 @@ if test "$apr_found" = "reconfig"; then
 
   dnl We have to find apr-N-config when we reconfigure APR.
   for majorver in 1 2; do
-    test_apr_config="$srcdir/srclib/apr/apr-${majorver}-config"
-    if test -f $test_apr_config; then
-      apr_config=$test_apr_config
+    test_apr_config="./srclib/apr/apr-${majorver}-config"
+    if test -f "$test_apr_config"; then
+      apr_config="$test_apr_config"
     fi
   done
 fi
@@ -150,7 +150,7 @@ if test "$apu_found" = "reconfig"; then
   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
   AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS"
   dnl APR and APR-Util major versions must match
-  apu_config="${srcdir}/srclib/apr-util/apu-${apr_major_version}-config"
+  apu_config="./srclib/apr-util/apu-${apr_major_version}-config"
 fi
 
 if test "$apu_found" = "obsolete"; then
@@ -170,6 +170,9 @@ dnl PCRE and for our config tests will be whatever PCRE determines.
 AC_PROG_CC
 AC_PROG_CPP
 
+dnl Try to get c99 support for variadic macros
+ifdef([AC_PROG_CC_C99], [AC_PROG_CC_C99])
+
 if test "x${cache_file}" = "x/dev/null"; then
   # Likewise, ensure that CC and CPP are passed through to the pcre
   # configure script iff caching is disabled (the autoconf 2.5x default).
@@ -273,7 +276,6 @@ case $host in
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
       ;;
   *os2-emx*)
-      APR_SETVAR(APACHE_MPM, [mpmt_os2])
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
       ;;
   *-linux-*)
@@ -421,7 +423,8 @@ initgroups \
 bindprocessor \
 prctl \
 timegm \
-getpgid
+getpgid \
+fopen64
 )
 
 dnl confirm that a void pointer is large enough to store a long integer
@@ -525,6 +528,11 @@ AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable f
 AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging and compile time warnings),
 [
   APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
+  if test "$GCC" = "yes"; then
+    APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations])
+  elif test "$AIX_XLC" = "yes"; then
+    APR_ADDTO(CFLAGS,-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro)
+  fi
 ])dnl
 
 dnl Conditionally enable PIE support for GNU toolchains.
@@ -577,7 +585,7 @@ fi
 
 dnl enable_so tells us if *any* modules can be built as DSOs
 
-if test "$enable_so" = "yes"; then
+if test "$enable_so" = "yes" -o "$enable_so" = "static"; then
   case $host in
     *-ibm-aix*)
       APR_ADDTO(HTTPD_LDFLAGS, [-Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp])