Update year to 2008

[apache] / configure.in

diff --git a/configure.in b/configure.in
index dcdafb5bbaa32d631cc0999cd159eb99620619a1..65bad7c0244532b0ca60a4112c6902f626074d09 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)
@@ -61,7 +61,18 @@ orig_prefix="$prefix"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
-APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1)
+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-${apr_version}-config"
+else 
+   APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, ${apr_version})
+fi
 
 if test "$apr_found" = "no"; then
   AC_MSG_ERROR([APR not found.  Please read the documentation.])
@@ -84,17 +95,21 @@ 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"
 
-if test "${apr_found}" = "yes"; then
-  # Require APR 1.2.x otherwise fail
-  APACHE_CHECK_APxVER([apr], 1, 2)
-fi
-
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
-APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, 1)
+# 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-${apu_version}-config"
+else 
+   APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apu_version})
+fi
 
 if test "$apu_found" = "no"; then
   AC_MSG_ERROR([APR-util not found.  Please read the documentation.])
@@ -117,14 +132,12 @@ if test "$apu_found" = "reconfig"; then
   dnl We must be the last to build and the first to be cleaned
   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
   AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS"
-else
-  # Require APR-util 1.2.x otherwise fail
-  APACHE_CHECK_APxVER([apu], 1, 2)
 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"
 
@@ -155,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
      ;;
@@ -282,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
@@ -323,6 +343,18 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
+# Ensure that satisfactory versions of apr and apr-util are 
+# found if external copies are configured.
+if test "${apr_found}" = "yes"; then
+  # Require APR 1.3.x otherwise fail
+  APACHE_CHECK_APxVER([apr], 1, 3)
+fi
+
+if test "${apu_found}" = "yes"; then
+  # Require APR-util 1.2.x otherwise fail
+  APACHE_CHECK_APxVER([apu], 1, 2)
+fi
+
 dnl Check for what we can generate dependency files with
 APR_CHECK_DEPEND
 
@@ -356,10 +388,6 @@ AC_HEADER_SYS_WAIT
 dnl ## Check for typedefs, structures, and compiler characteristics.
 
 AC_C_CONST
-if test "x$GCC" = "xyes"; then
-  AC_DEFINE([AP_HAVE_DESIGNATED_INITIALIZER], 1,
-            [Define if the compiler supports designated initializers])
-fi
 
 dnl ## Check for library functions
 AC_SEARCH_LIBS(sqrt, m)
@@ -373,6 +401,7 @@ initgroups \
 bindprocessor \
 prctl \
 timegm \
+getpgid
 )
 
 dnl confirm that a void pointer is large enough to store a long integer
@@ -414,6 +443,10 @@ AC_ARG_WITH(port,APACHE_HELP_STRING(--with-port=PORT,Port on which to listen (de
         [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-port requires a value (the TCP port number)'); else PORT="$withval"; fi],
        [PORT=80])
 
+AC_ARG_WITH(sslport,APACHE_HELP_STRING(--with-sslport=SSLPORT,Port on which to securelisten (default is 443)),
+        [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-sslport requires a value (the SSL TCP port number)'); else SSLPORT="$withval"; fi],
+       [SSLPORT=443])
+
 APR_CHECK_APR_DEFINE(APR_HAVE_IPV6)
 
 AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets to handle IPv4 connections),
@@ -514,7 +547,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)