Correct the approach to std file handles by simplifying the approach

[apache] / configure.in

diff --git a/configure.in b/configure.in
index 807adc67ce414ae61f9beaac8d88cef25e91cbfc..7f267f200080cedc06efa6440d189a70866a00ba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl
 dnl     Use ./buildconf to produce a configure script
 dnl
 
-AC_PREREQ(2.13)
+AC_PREREQ(2.50)
 AC_INIT(ABOUT_APACHE)
 
 AC_CONFIG_HEADER(include/ap_config_auto.h)
@@ -64,11 +64,14 @@ echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 AC_ARG_WITH(included-apr,
 APACHE_HELP_STRING(--with-included-apr,Use bundled copies of APR/APR-Util))
 
+# Only APR 1.x is supported.
+apr_version=1
+
 if test "x$with_included_apr" = "xyes"; then
    apr_found=reconfig
-   apr_config="$srcdir/srclib/apr/apr-1-config"
+   apr_config="$srcdir/srclib/apr/apr-${apr_version}-config"
 else 
-   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1)
+   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, ${apr_version})
 fi
 
 if test "$apr_found" = "no"; then
@@ -92,16 +95,20 @@ APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
 SHLIBPATH_VAR=`$apr_config --shlib-path-var`
 APR_BINDIR=`$apr_config --bindir`
 APR_INCLUDEDIR=`$apr_config --includedir`
+APR_INCLUDES=`$apr_config --includes`
 APR_VERSION=`$apr_config --version`
 APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
+# Only APR-util 1.x is supported.
+apu_version=1
+
 if test "x$with_included_apr" = "xyes"; then
    apu_found=reconfig
-   apu_config="${srcdir}/srclib/apr-util/apu-1-config"
+   apu_config="${srcdir}/srclib/apr-util/apu-${apu_version}-config"
 else 
-   APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, 1)
+   APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apu_version})
 fi
 
 if test "$apu_found" = "no"; then
@@ -130,6 +137,7 @@ fi
 APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
 APU_BINDIR=`$apu_config --bindir`
 APU_INCLUDEDIR=`$apu_config --includedir`
+APU_INCLUDES=`$apu_config --includes`
 APU_VERSION=`$apu_config --version`
 APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
 
@@ -160,7 +168,7 @@ yes) AC_PATH_PROG(PCRE_CONFIG, pcre-config, false) ;;
        PCRE_CONFIG=$with_pcre
      fi
 
-     if $PCRE_CONFIG --version >&/dev/null; then :; else
+     if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
        AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG])
      fi
      ;;
@@ -287,6 +295,13 @@ case $host in
       APR_SETVAR(APACHE_MPM, [prefork])
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
       ;;
+  *mingw32*)
+      APR_SETVAR(APACHE_MPM, [winnt])
+      APR_ADDTO(CPPFLAGS, [-DAP_DECLARE_EXPORT])
+      APR_SETIFNULL(ac_cv_func_times, [no])
+      APR_SETIFNULL(ac_cv_func_getpwnam, [no])
+      APR_SETIFNULL(ac_cv_func_getgrnam, [no])
+      ;;
   *aix*)
       aixver=`echo $host | sed 's/^[[^0-9]]*//' | sed 's/\.//g'`
       if test $aixver -ge 4320; then
@@ -386,6 +401,7 @@ initgroups \
 bindprocessor \
 prctl \
 timegm \
+getpgid
 )
 
 dnl confirm that a void pointer is large enough to store a long integer
@@ -527,7 +543,9 @@ if test "$enable_so" = "yes"; then
       HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
       SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll"
   esac
+  MOD_SO_ENABLED=yes
 fi
+AC_SUBST(MOD_SO_ENABLED)
 
 APACHE_SUBST(PRE_SHARED_CMDS)
 APACHE_SUBST(POST_SHARED_CMDS)