Fix RedirectMatch so it won't emit invalid Location fields.

[apache] / configure.in

diff --git a/configure.in b/configure.in
index 806b60eb313b2874dcf84d5fdf1446a97f903c3d..285d6464f2ae05d83ef07fef5cf9d9d52c8c087d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -103,6 +103,7 @@ case $host in
       echo "using aplibtool"
       LIBTOOL="$abs_srcdir/srclib/apr/build/aplibtool"
       SH_LIBTOOL="$LIBTOOL --shared --export-all"
+      SH_LIBS="\$(ALL_LIBS)"
       CORE_IMPLIB_FILE="ApacheCoreOS2.la"
       CORE_IMPLIB="$abs_srcdir/server/$CORE_IMPLIB_FILE"
       MK_IMPLIB="emximp"
@@ -238,16 +239,30 @@ getpwnam \
 getgrnam \
 initgroups \
 bindprocessor \
+timegm \
 )
 
+dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
+AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
+  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
+if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
+    AC_DEFINE(HAVE_GMTOFF)
+fi
+
 dnl ## Set up any appropriate OS-specific environment variables for apachectl
 
 case $host in
     *aix*)
-        OS_SPECIFIC_VARS="set LDR_CNTRL=\"MAXDATA=0x80000000\" ; export LDR_CNTRL ; set AIXTHREAD_SCOPE=S ; export AIXTHREAD_SCOPE"
+        # for 32-bit builds, increase MAXDATA to allow lots of threads
+        if test x$COMPILE_MODE != 64; then
+            OS_SPECIFIC_VARS="set LDR_CNTRL=\"MAXDATA=0x80000000\" ; export LDR_CNTRL ;"
+        fi
+        OS_SPECIFIC_VARS="$OS_SPECIFIC_VARS set AIXTHREAD_SCOPE=S ; export AIXTHREAD_SCOPE"
         ;;
     *os390*)
-        OS_SPECIFIC_VARS="export _CEE_RUNOPTS=\"(STACK(,,ANY))\" ; export _EDC_ADD_ERRNO2=1"
+        OS_SPECIFIC_VARS="export _CEE_RUNOPTS=\"STACK(,,ANY)\" ; export _EDC_ADD_ERRNO2=1"
         ;;
     *)
         OS_SPECIFIC_VARS=""
@@ -295,6 +310,7 @@ if test "$enable_so" = "yes"; then
   case $host in
     *-ibm-aix*)
       HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
+      SH_LDFLAGS="$SH_LDFLAGS \$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)"
       UTIL_LDFLAGS="$UTIL_LDFLAGS -Wl,-uXML_Parse"
       ;;
     *beos)
@@ -355,13 +371,11 @@ AC_ARG_WITH(suexec-umask,
 APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[
   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
 
-dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
 dnl AP_LIBS specifies the actual libraries. note we have some required libs.
 AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $abs_builddir/srclib/apr-util/libaprutil.la $AP_LIBS"
 
 dnl APR should go after the other libs, so the right symbols can be picked up
 AP_LIBS="$AP_LIBS $abs_builddir/srclib/apr/libapr.la"
-APACHE_SUBST(AP_LIB_DIRS)
 APACHE_SUBST(AP_LIBS)
 
 AC_DEFINE(AP_USING_AUTOCONF, 1,
@@ -393,9 +407,6 @@ APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile)
 APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile os/Makefile)
 APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
 APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
-for i in $AP_LIB_DIRS; do
-  APACHE_FAST_OUTPUT(srclib/$i/Makefile)
-done
 
 if test -d ./test; then
     APACHE_FAST_OUTPUT(test/Makefile)
@@ -404,6 +415,8 @@ fi
 dnl get the exported vars from APRUTIL
 . ./srclib/apr-util/export_vars.sh
 APR_ADDTO(LIBS, $APRUTIL_EXPORT_LIBS)
+APR_ADDTO(INCLUDES, $APRUTIL_EXPORT_INCLUDES)
+APR_ADDTO(LDFLAGS, $APRUTIL_LDFLAGS)
 AP_LIBS="$AP_LIBS $LIBTOOL_LIBS"
 
 dnl ## Finalize the variables