Bootstrapped

diff --git a/configure b/configure
index 1ddab580c45705fc23af3af52cb98c4ff9c449f3..fc54db87e3f3d70d222c33bf3a185eafa946d8de 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.436 .
+# From configure.in Revision.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for Squid Web Proxy 3.0.PRE4-CVS.
 #
@@ -469,7 +469,7 @@ ac_includes_default="\
 
 ac_subdirs_all="$ac_subdirs_all lib/libTrie"
 ac_subdirs_all="$ac_subdirs_all lib/cppunit-1.10.0"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE WIN32_PSAPI USE_IPC_WIN32_TRUE USE_IPC_WIN32_FALSE MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS STORE_TESTS USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE USE_AIO_WIN32_TRUE USE_AIO_WIN32_FALSE DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_ICAP_CLIENT_TRUE USE_ICAP_CLIENT_FALSE ICAP_LIBS USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPPUNITCONFIG SQUID_CPPUNIT_LIBS SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SQUID_CPPUNIT_DIR SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE WIN32_PSAPI USE_IPC_WIN32_TRUE USE_IPC_WIN32_FALSE MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS STORE_TESTS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE USE_AIO_WIN32_TRUE USE_AIO_WIN32_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_ICAP_CLIENT_TRUE USE_ICAP_CLIENT_FALSE ICAP_LIBS USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPPUNITCONFIG SQUID_CPPUNIT_LIBS SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SQUID_CPPUNIT_DIR SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -20438,35 +20438,18 @@ if test -z "$FOUND_AIO" && test -n "$NEED_AIO"; then
     DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/AIO/AIODiskIOModule.o"
 fi
 echo "IO Modules built: $DISK_MODULES"
+USE_AIOPS_WIN32=0
+USE_AIO_WIN32=0
 for fs in $DISK_MODULES none; do
     case "$fs" in
     DiskThreads)
        if test -z "$with_pthreads"; then
             case "$host_os" in
             mingw|mingw32|cygwin|cygwin32)
-
-
-if true; then
-  USE_AIOPS_WIN32_TRUE=
-  USE_AIOPS_WIN32_FALSE='#'
-else
-  USE_AIOPS_WIN32_TRUE='#'
-  USE_AIOPS_WIN32_FALSE=
-fi
-
+               USE_AIOPS_WIN32=1
                echo "DiskThreads IO Module used, Windows threads support automatically enabled"
                 ;;
             *)
-
-
-if false; then
-  USE_AIOPS_WIN32_TRUE=
-  USE_AIOPS_WIN32_FALSE='#'
-else
-  USE_AIOPS_WIN32_TRUE='#'
-  USE_AIOPS_WIN32_FALSE=
-fi
-
                echo "DiskThreads IO Module used, pthreads support automatically enabled"
                with_pthreads=yes
                 ;;
@@ -20477,29 +20460,10 @@ fi
        if test -z "$with_aio"; then
             case "$host_os" in
             mingw|mingw32|cygwin|cygwin32)
-
-
-if true; then
-  USE_AIO_WIN32_TRUE=
-  USE_AIO_WIN32_FALSE='#'
-else
-  USE_AIO_WIN32_TRUE='#'
-  USE_AIO_WIN32_FALSE=
-fi
-
+               USE_AIO_WIN32=1
                echo "Aio IO Module used, Windows overlapped I/O support automatically enabled"
                 ;;
             *)
-
-
-if false; then
-  USE_AIO_WIN32_TRUE=
-  USE_AIO_WIN32_FALSE='#'
-else
-  USE_AIO_WIN32_TRUE='#'
-  USE_AIO_WIN32_FALSE=
-fi
-
                echo "Aio IO Module used, aio support automatically enabled"
                with_aio=yes
                 ;;
@@ -20513,6 +20477,26 @@ done
 
 
 
+
+if test "$USE_AIOPS_WIN32" = 1; then
+  USE_AIOPS_WIN32_TRUE=
+  USE_AIOPS_WIN32_FALSE='#'
+else
+  USE_AIOPS_WIN32_TRUE='#'
+  USE_AIOPS_WIN32_FALSE=
+fi
+
+
+
+if test "$USE_AIO_WIN32" = 1; then
+  USE_AIO_WIN32_TRUE=
+  USE_AIO_WIN32_FALSE='#'
+else
+  USE_AIO_WIN32_TRUE='#'
+  USE_AIO_WIN32_FALSE=
+fi
+
+
 # Check whether --enable-removal-policies or --disable-removal-policies was given.
 if test "${enable_removal_policies+set}" = set; then
   enableval="$enable_removal_policies"
@@ -44079,20 +44063,6 @@ echo "$as_me: error: conditional \"USE_AIOPS_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${USE_AIOPS_WIN32_TRUE}" && test -z "${USE_AIOPS_WIN32_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_AIOPS_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_AIOPS_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_AIO_WIN32_TRUE}" && test -z "${USE_AIO_WIN32_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_AIO_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_AIO_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${USE_AIO_WIN32_TRUE}" && test -z "${USE_AIO_WIN32_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"USE_AIO_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -44987,13 +44957,13 @@ s,@STORE_OBJS@,$STORE_OBJS,;t t
 s,@STORE_LIBS@,$STORE_LIBS,;t t
 s,@STORE_LINKOBJS@,$STORE_LINKOBJS,;t t
 s,@STORE_TESTS@,$STORE_TESTS,;t t
+s,@DISK_LIBS@,$DISK_LIBS,;t t
+s,@DISK_PROGRAMS@,$DISK_PROGRAMS,;t t
+s,@DISK_LINKOBJS@,$DISK_LINKOBJS,;t t
 s,@USE_AIOPS_WIN32_TRUE@,$USE_AIOPS_WIN32_TRUE,;t t
 s,@USE_AIOPS_WIN32_FALSE@,$USE_AIOPS_WIN32_FALSE,;t t
 s,@USE_AIO_WIN32_TRUE@,$USE_AIO_WIN32_TRUE,;t t
 s,@USE_AIO_WIN32_FALSE@,$USE_AIO_WIN32_FALSE,;t t
-s,@DISK_LIBS@,$DISK_LIBS,;t t
-s,@DISK_PROGRAMS@,$DISK_PROGRAMS,;t t
-s,@DISK_LINKOBJS@,$DISK_LINKOBJS,;t t
 s,@REPL_POLICIES@,$REPL_POLICIES,;t t
 s,@REPL_OBJS@,$REPL_OBJS,;t t
 s,@REPL_LIBS@,$REPL_LIBS,;t t