From: serassio <> Date: Thu, 7 Sep 2006 01:38:09 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE5~106 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7cee0a72dea2b765b2b8c2ec585299241e33770;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/Makefile.in b/Makefile.in index ba443de544..03845eb19f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.92 2006/09/04 20:16:56 serassio Exp $ +# $Id: Makefile.in,v 1.93 2006/09/06 19:38:09 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -213,6 +213,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/configure b/configure index 35c847480c..6600d56d18 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.435 . +# 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_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 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_files='' # Initialize some variables set by options. @@ -20430,6 +20430,7 @@ if test -z "$FOUND_DISKTHREADS" && test -n "$NEED_DISKTHREADS"; then DISK_MODULES="$DISK_MODULES DiskThreads" DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskThreads/DiskThreadsDiskIOModule.o" fi + if test -z "$FOUND_AIO" && test -n "$NEED_AIO"; then echo "adding AIO, as it is used by an active, legacy Store Module" DISK_LIBS="$DISK_LIBS libAIO.a" @@ -20441,8 +20442,35 @@ for fs in $DISK_MODULES none; do case "$fs" in DiskThreads) if test -z "$with_pthreads"; then - echo "DiskThreads IO Module used, pthreads support automatically enabled" - with_pthreads=yes + 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 + + 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 + ;; + esac fi ;; AIO) @@ -44044,6 +44072,20 @@ echo "$as_me: error: conditional \"USE_IPC_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_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 @@ -44945,6 +44987,8 @@ 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,@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 diff --git a/contrib/Makefile.in b/contrib/Makefile.in index b18c6d67f7..a2cb5e3ebe 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -189,6 +189,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 853fb20544..991c4a2881 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.66 2006/09/04 20:16:57 serassio Exp $ +# $Id: Makefile.in,v 1.67 2006/09/06 19:38:10 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -196,6 +196,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/errors/Makefile.in b/errors/Makefile.in index a99b2e15fe..0523a3a863 100644 --- a/errors/Makefile.in +++ b/errors/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.82 2006/09/04 20:16:57 serassio Exp $ +# $Id: Makefile.in,v 1.83 2006/09/06 19:38:10 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -188,6 +188,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/Makefile.in b/helpers/Makefile.in index ac4eb476af..ba45f5b24c 100644 --- a/helpers/Makefile.in +++ b/helpers/Makefile.in @@ -193,6 +193,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in index eefeb91b26..a4c4ef8b49 100644 --- a/helpers/basic_auth/LDAP/Makefile.in +++ b/helpers/basic_auth/LDAP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.72 2006/09/04 20:16:58 serassio Exp $ +# $Id: Makefile.in,v 1.73 2006/09/06 19:38:12 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -219,6 +219,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in index b72bf73a42..e97ed2279b 100644 --- a/helpers/basic_auth/MSNT/Makefile.in +++ b/helpers/basic_auth/MSNT/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.75 2006/09/04 20:17:01 serassio Exp $ +# $Id: Makefile.in,v 1.76 2006/09/06 19:38:14 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -228,6 +228,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in index 187994bb85..4cf41cb0c3 100644 --- a/helpers/basic_auth/Makefile.in +++ b/helpers/basic_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.70 2006/09/04 20:16:57 serassio Exp $ +# $Id: Makefile.in,v 1.71 2006/09/06 19:38:11 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -197,6 +197,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in index 8cef850b12..307e959fef 100644 --- a/helpers/basic_auth/NCSA/Makefile.in +++ b/helpers/basic_auth/NCSA/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.72 2006/09/04 20:17:02 serassio Exp $ +# $Id: Makefile.in,v 1.73 2006/09/06 19:38:14 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -216,6 +216,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in index 476e1ec586..d3532262ed 100644 --- a/helpers/basic_auth/PAM/Makefile.in +++ b/helpers/basic_auth/PAM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.73 2006/09/04 20:17:02 serassio Exp $ +# $Id: Makefile.in,v 1.74 2006/09/06 19:38:14 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -218,6 +218,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in index 05fb570f05..7d3f1ab702 100644 --- a/helpers/basic_auth/SASL/Makefile.in +++ b/helpers/basic_auth/SASL/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.69 2006/09/04 20:17:03 serassio Exp $ +# $Id: Makefile.in,v 1.70 2006/09/06 19:38:14 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in index ca6ca4f61a..e9f7564fb6 100644 --- a/helpers/basic_auth/SMB/Makefile.in +++ b/helpers/basic_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.71 2006/09/04 20:17:03 serassio Exp $ +# $Id: Makefile.in,v 1.72 2006/09/06 19:38:15 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -224,6 +224,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in index f4589888ab..47020568f8 100644 --- a/helpers/basic_auth/YP/Makefile.in +++ b/helpers/basic_auth/YP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.72 2006/09/04 20:17:04 serassio Exp $ +# $Id: Makefile.in,v 1.73 2006/09/06 19:38:15 serassio Exp $ # # @@ -214,6 +214,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in index f66d6f9091..04d210bdb0 100644 --- a/helpers/basic_auth/getpwnam/Makefile.in +++ b/helpers/basic_auth/getpwnam/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.70 2006/09/04 20:17:06 serassio Exp $ +# $Id: Makefile.in,v 1.71 2006/09/06 19:38:15 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -216,6 +216,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/mswin_sspi/Makefile.in b/helpers/basic_auth/mswin_sspi/Makefile.in index 0585561a8c..fe0d0402e0 100755 --- a/helpers/basic_auth/mswin_sspi/Makefile.in +++ b/helpers/basic_auth/mswin_sspi/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.14 2006/09/04 20:17:06 serassio Exp $ +# $Id: Makefile.in,v 1.15 2006/09/06 19:38:15 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in index dbcfc45705..444bb0af77 100644 --- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in +++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.68 2006/09/04 20:17:06 serassio Exp $ +# $Id: Makefile.in,v 1.69 2006/09/06 19:38:15 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -196,6 +196,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index cfe5b40869..f1dbdfe7cb 100644 --- a/helpers/digest_auth/Makefile.in +++ b/helpers/digest_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.68 2006/09/04 20:17:06 serassio Exp $ +# $Id: Makefile.in,v 1.69 2006/09/06 19:38:15 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -197,6 +197,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/digest_auth/ldap/Makefile.in b/helpers/digest_auth/ldap/Makefile.in index daedecf4b5..50fd9034b1 100644 --- a/helpers/digest_auth/ldap/Makefile.in +++ b/helpers/digest_auth/ldap/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.14 2006/09/04 20:17:06 serassio Exp $ +# $Id: Makefile.in,v 1.15 2006/09/06 19:38:16 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -218,6 +218,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index ed3f7b3c71..8cdad2736e 100644 --- a/helpers/digest_auth/password/Makefile.in +++ b/helpers/digest_auth/password/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.73 2006/09/04 20:17:06 serassio Exp $ +# $Id: Makefile.in,v 1.74 2006/09/06 19:38:17 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -217,6 +217,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in index f164237036..9fa116929b 100644 --- a/helpers/external_acl/Makefile.in +++ b/helpers/external_acl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.59 2006/09/04 20:17:08 serassio Exp $ +# $Id: Makefile.in,v 1.60 2006/09/06 19:38:17 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -197,6 +197,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in index 21cc339a58..473c9f9862 100644 --- a/helpers/external_acl/ip_user/Makefile.in +++ b/helpers/external_acl/ip_user/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.58 2006/09/04 20:17:11 serassio Exp $ +# $Id: Makefile.in,v 1.59 2006/09/06 19:38:17 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in index 38b0ad83ea..65ac0192fd 100644 --- a/helpers/external_acl/ldap_group/Makefile.in +++ b/helpers/external_acl/ldap_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.60 2006/09/04 20:17:12 serassio Exp $ +# $Id: Makefile.in,v 1.61 2006/09/06 19:38:18 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -220,6 +220,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/mswin_lm_group/Makefile.in b/helpers/external_acl/mswin_lm_group/Makefile.in index db7a30eee8..3cc5c945df 100755 --- a/helpers/external_acl/mswin_lm_group/Makefile.in +++ b/helpers/external_acl/mswin_lm_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.14 2006/09/04 20:17:13 serassio Exp $ +# $Id: Makefile.in,v 1.15 2006/09/06 19:38:19 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/session/Makefile.in b/helpers/external_acl/session/Makefile.in index 2bf5d8d705..7c92468ea4 100644 --- a/helpers/external_acl/session/Makefile.in +++ b/helpers/external_acl/session/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.11 2006/09/04 20:17:13 serassio Exp $ +# $Id: Makefile.in,v 1.12 2006/09/06 19:38:20 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -218,6 +218,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in index b11153b056..e482e88702 100644 --- a/helpers/external_acl/unix_group/Makefile.in +++ b/helpers/external_acl/unix_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.58 2006/09/04 20:17:13 serassio Exp $ +# $Id: Makefile.in,v 1.59 2006/09/06 19:38:20 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -217,6 +217,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in index 4f2e5b99d8..531c39788d 100644 --- a/helpers/external_acl/wbinfo_group/Makefile.in +++ b/helpers/external_acl/wbinfo_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.56 2006/09/04 20:17:13 serassio Exp $ +# $Id: Makefile.in,v 1.57 2006/09/06 19:38:20 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -196,6 +196,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/negotiate_auth/Makefile.in b/helpers/negotiate_auth/Makefile.in index 925036102b..739d50871c 100755 --- a/helpers/negotiate_auth/Makefile.in +++ b/helpers/negotiate_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for negotiate authentication helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.13 2006/09/04 20:17:13 serassio Exp $ +# $Id: Makefile.in,v 1.14 2006/09/06 19:38:20 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -197,6 +197,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/negotiate_auth/mswin_sspi/Makefile.in b/helpers/negotiate_auth/mswin_sspi/Makefile.in index ecad7b3e2f..a2a22642d0 100755 --- a/helpers/negotiate_auth/mswin_sspi/Makefile.in +++ b/helpers/negotiate_auth/mswin_sspi/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.13 2006/09/04 20:17:14 serassio Exp $ +# $Id: Makefile.in,v 1.14 2006/09/06 19:38:20 serassio Exp $ # srcdir = @srcdir@ @@ -214,6 +214,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in index ce87b0c7d9..8e87d54da5 100644 --- a/helpers/ntlm_auth/Makefile.in +++ b/helpers/ntlm_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.70 2006/09/04 20:17:14 serassio Exp $ +# $Id: Makefile.in,v 1.71 2006/09/06 19:38:20 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -197,6 +197,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in index 815eaaab5a..1a2b651cfe 100644 --- a/helpers/ntlm_auth/SMB/Makefile.in +++ b/helpers/ntlm_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.70 2006/09/04 20:17:14 serassio Exp $ +# $Id: Makefile.in,v 1.71 2006/09/06 19:38:20 serassio Exp $ # srcdir = @srcdir@ @@ -221,6 +221,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in index d63d422c50..36a6aada8a 100644 --- a/helpers/ntlm_auth/SMB/smbval/Makefile.in +++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in @@ -209,6 +209,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in index e8884d1bd2..c268308941 100644 --- a/helpers/ntlm_auth/fakeauth/Makefile.in +++ b/helpers/ntlm_auth/fakeauth/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.67 2006/09/04 20:17:14 serassio Exp $ +# $Id: Makefile.in,v 1.68 2006/09/06 19:38:24 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -216,6 +216,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.in b/helpers/ntlm_auth/mswin_sspi/Makefile.in index 0eaf68194d..c119215331 100755 --- a/helpers/ntlm_auth/mswin_sspi/Makefile.in +++ b/helpers/ntlm_auth/mswin_sspi/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.13 2006/09/04 20:17:15 serassio Exp $ +# $Id: Makefile.in,v 1.14 2006/09/06 19:38:24 serassio Exp $ # srcdir = @srcdir@ @@ -213,6 +213,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in index ff2d8dce42..af35de4ed2 100644 --- a/helpers/ntlm_auth/no_check/Makefile.in +++ b/helpers/ntlm_auth/no_check/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.69 2006/09/04 20:17:17 serassio Exp $ +# $Id: Makefile.in,v 1.70 2006/09/06 19:38:24 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -196,6 +196,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 485e367320..3ec0a0868c 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.83 2006/09/04 20:17:17 serassio Exp $ +# $Id: Makefile.in,v 1.84 2006/09/06 19:38:24 serassio Exp $ # srcdir = @srcdir@ @@ -197,6 +197,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 2d998eef0e..f6b29cfab5 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.125 2006/09/04 20:17:17 serassio Exp $ +# $Id: Makefile.in,v 1.126 2006/09/06 19:38:26 serassio Exp $ # srcdir = @srcdir@ @@ -273,6 +273,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 750e6e563a..ebf9c0e0af 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -194,6 +194,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in index a46c66a467..c5952ba9f0 100644 --- a/snmplib/Makefile.in +++ b/snmplib/Makefile.in @@ -207,6 +207,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/src/Makefile.in b/src/Makefile.in index 58a41a0335..97336f6a38 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.403 2006/09/04 20:17:18 serassio Exp $ +# $Id: Makefile.in,v 1.404 2006/09/06 19:38:26 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -115,7 +115,19 @@ am_libDiskDaemon_a_OBJECTS = DiskIO/DiskDaemon/DiskdFile.$(OBJEXT) \ libDiskDaemon_a_OBJECTS = $(am_libDiskDaemon_a_OBJECTS) libDiskThreads_a_AR = $(AR) $(ARFLAGS) libDiskThreads_a_LIBADD = -am_libDiskThreads_a_OBJECTS = DiskIO/DiskThreads/aiops.$(OBJEXT) \ +am__libDiskThreads_a_SOURCES_DIST = DiskIO/DiskThreads/aiops.cc \ + DiskIO/DiskThreads/aiops_win32.cc \ + DiskIO/DiskThreads/async_io.cc \ + DiskIO/DiskThreads/DiskThreads.h \ + DiskIO/DiskThreads/DiskThreadsDiskFile.cc \ + DiskIO/DiskThreads/DiskThreadsDiskFile.h \ + DiskIO/DiskThreads/DiskThreadsDiskIOModule.h \ + DiskIO/DiskThreads/DiskThreadsIOStrategy.cc \ + DiskIO/DiskThreads/DiskThreadsIOStrategy.h +@USE_AIOPS_WIN32_FALSE@am__objects_3 = \ +@USE_AIOPS_WIN32_FALSE@ DiskIO/DiskThreads/aiops.$(OBJEXT) +@USE_AIOPS_WIN32_TRUE@am__objects_3 = DiskIO/DiskThreads/aiops_win32.$(OBJEXT) +am_libDiskThreads_a_OBJECTS = $(am__objects_3) \ DiskIO/DiskThreads/async_io.$(OBJEXT) \ DiskIO/DiskThreads/DiskThreadsDiskFile.$(OBJEXT) \ DiskIO/DiskThreads/DiskThreadsIOStrategy.$(OBJEXT) @@ -256,9 +268,9 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \ typedefs.h unlinkd.cc url.cc URL.h URLScheme.cc URLScheme.h \ urn.cc useragent.cc wais.cc wccp.cc wccp2.cc whois.cc \ wordlist.cc wordlist.h win32.cc -am__objects_3 = ACLARP.$(OBJEXT) -@ENABLE_ARP_ACL_TRUE@am__objects_4 = $(am__objects_3) -am__objects_5 = $(am__objects_4) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \ +am__objects_4 = ACLARP.$(OBJEXT) +@ENABLE_ARP_ACL_TRUE@am__objects_5 = $(am__objects_4) +am__objects_6 = $(am__objects_5) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \ ACLDestinationDomain.$(OBJEXT) ACLDestinationIP.$(OBJEXT) \ ACLDomainData.$(OBJEXT) ACLExtUser.$(OBJEXT) \ ACLHTTPHeaderData.$(OBJEXT) ACLHTTPStatus.$(OBJEXT) \ @@ -275,57 +287,57 @@ am__objects_5 = $(am__objects_4) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \ ACLTime.$(OBJEXT) ACLTimeData.$(OBJEXT) ACLUrl.$(OBJEXT) \ ACLUrlPath.$(OBJEXT) ACLUrlPort.$(OBJEXT) \ ACLUserData.$(OBJEXT) -am__objects_6 = comm_select.$(OBJEXT) comm_select_win32.$(OBJEXT) \ +am__objects_7 = comm_select.$(OBJEXT) comm_select_win32.$(OBJEXT) \ comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) comm_kqueue.$(OBJEXT) -am__objects_7 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \ +am__objects_8 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \ DelayBucket.$(OBJEXT) DelayConfig.$(OBJEXT) \ DelayPool.$(OBJEXT) DelaySpec.$(OBJEXT) DelayTagged.$(OBJEXT) \ DelayUser.$(OBJEXT) DelayVector.$(OBJEXT) \ NullDelayId.$(OBJEXT) -@USE_DELAY_POOLS_TRUE@am__objects_8 = $(am__objects_7) -am__objects_9 = DiskIO/DiskIOModule.$(OBJEXT) \ +@USE_DELAY_POOLS_TRUE@am__objects_9 = $(am__objects_8) +am__objects_10 = DiskIO/DiskIOModule.$(OBJEXT) \ DiskIO/ReadRequest.$(OBJEXT) DiskIO/WriteRequest.$(OBJEXT) -@USE_DNSSERVER_FALSE@am__objects_10 = dns_internal.$(OBJEXT) -@USE_DNSSERVER_TRUE@am__objects_10 = dns.$(OBJEXT) -am__objects_11 = ESI.$(OBJEXT) ESIAssign.$(OBJEXT) \ +@USE_DNSSERVER_FALSE@am__objects_11 = dns_internal.$(OBJEXT) +@USE_DNSSERVER_TRUE@am__objects_11 = dns.$(OBJEXT) +am__objects_12 = ESI.$(OBJEXT) ESIAssign.$(OBJEXT) \ ESIContext.$(OBJEXT) ESICustomParser.$(OBJEXT) \ ESIExpatParser.$(OBJEXT) ESIExpression.$(OBJEXT) \ ESIInclude.$(OBJEXT) ESILibxml2Parser.$(OBJEXT) \ ESIParser.$(OBJEXT) ESISegment.$(OBJEXT) ESISequence.$(OBJEXT) \ ESIVarState.$(OBJEXT) -@USE_ESI_TRUE@am__objects_12 = $(am__objects_11) -@ENABLE_HTCP_TRUE@am__objects_13 = htcp.$(OBJEXT) -am__objects_14 = ACLIdent.$(OBJEXT) ident.$(OBJEXT) -@ENABLE_IDENT_TRUE@am__objects_15 = $(am__objects_14) -@USE_IPC_WIN32_FALSE@am__objects_16 = ipc.$(OBJEXT) -@USE_IPC_WIN32_TRUE@am__objects_16 = ipc_win32.$(OBJEXT) -@MAKE_LEAKFINDER_TRUE@am__objects_17 = LeakFinder.$(OBJEXT) -@ENABLE_XPROF_STATS_TRUE@am__objects_18 = ProfStats.$(OBJEXT) -am__objects_19 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT) -@USE_SNMP_TRUE@am__objects_20 = $(am__objects_19) -am__objects_21 = ACLCertificateData.$(OBJEXT) ACLCertificate.$(OBJEXT) \ +@USE_ESI_TRUE@am__objects_13 = $(am__objects_12) +@ENABLE_HTCP_TRUE@am__objects_14 = htcp.$(OBJEXT) +am__objects_15 = ACLIdent.$(OBJEXT) ident.$(OBJEXT) +@ENABLE_IDENT_TRUE@am__objects_16 = $(am__objects_15) +@USE_IPC_WIN32_FALSE@am__objects_17 = ipc.$(OBJEXT) +@USE_IPC_WIN32_TRUE@am__objects_17 = ipc_win32.$(OBJEXT) +@MAKE_LEAKFINDER_TRUE@am__objects_18 = LeakFinder.$(OBJEXT) +@ENABLE_XPROF_STATS_TRUE@am__objects_19 = ProfStats.$(OBJEXT) +am__objects_20 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT) +@USE_SNMP_TRUE@am__objects_21 = $(am__objects_20) +am__objects_22 = ACLCertificateData.$(OBJEXT) ACLCertificate.$(OBJEXT) \ ssl_support.$(OBJEXT) -@ENABLE_SSL_TRUE@am__objects_22 = $(am__objects_21) -@ENABLE_UNLINKD_TRUE@am__objects_23 = unlinkd.$(OBJEXT) -am__objects_24 = win32.$(OBJEXT) -@ENABLE_WIN32SPECIFIC_TRUE@am__objects_25 = $(am__objects_24) +@ENABLE_SSL_TRUE@am__objects_23 = $(am__objects_22) +@ENABLE_UNLINKD_TRUE@am__objects_24 = unlinkd.$(OBJEXT) +am__objects_25 = win32.$(OBJEXT) +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_26 = $(am__objects_25) am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ - acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) $(am__objects_5) \ + acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) $(am__objects_6) \ asn.$(OBJEXT) AsyncEngine.$(OBJEXT) authenticate.$(OBJEXT) \ cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \ cache_manager.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ BodyReader.$(OBJEXT) clientStream.$(OBJEXT) \ - CompletionDispatcher.$(OBJEXT) $(am__objects_6) \ + CompletionDispatcher.$(OBJEXT) $(am__objects_7) \ ConfigOption.$(OBJEXT) ConfigParser.$(OBJEXT) debug.$(OBJEXT) \ - $(am__objects_8) disk.$(OBJEXT) $(am__objects_9) \ - $(am__objects_10) errorpage.$(OBJEXT) $(am__objects_12) \ + $(am__objects_9) disk.$(OBJEXT) $(am__objects_10) \ + $(am__objects_11) errorpage.$(OBJEXT) $(am__objects_13) \ ETag.$(OBJEXT) event.$(OBJEXT) EventLoop.$(OBJEXT) \ external_acl.$(OBJEXT) ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) \ fde.$(OBJEXT) filemap.$(OBJEXT) forward.$(OBJEXT) \ fqdncache.$(OBJEXT) ftp.$(OBJEXT) gopher.$(OBJEXT) \ - helper.$(OBJEXT) $(am__objects_13) http.$(OBJEXT) \ + helper.$(OBJEXT) $(am__objects_14) http.$(OBJEXT) \ HttpStatusLine.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrRange.$(OBJEXT) HttpHdrSc.$(OBJEXT) \ HttpHdrScTarget.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \ @@ -333,17 +345,17 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \ HttpRequest.$(OBJEXT) HttpRequestMethod.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) int.$(OBJEXT) internal.$(OBJEXT) \ - $(am__objects_16) ipcache.$(OBJEXT) $(am__objects_17) \ + $(am__objects_16) int.$(OBJEXT) internal.$(OBJEXT) \ + $(am__objects_17) ipcache.$(OBJEXT) $(am__objects_18) \ list.$(OBJEXT) logfile.$(OBJEXT) main.$(OBJEXT) mem.$(OBJEXT) \ mem_node.$(OBJEXT) MemBuf.$(OBJEXT) MemObject.$(OBJEXT) \ mime.$(OBJEXT) multicast.$(OBJEXT) neighbors.$(OBJEXT) \ net_db.$(OBJEXT) Packer.$(OBJEXT) Parsing.$(OBJEXT) \ - $(am__objects_18) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ + $(am__objects_19) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \ refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) \ - send-announce.$(OBJEXT) $(am__objects_20) SquidNew.$(OBJEXT) \ - $(am__objects_22) stat.$(OBJEXT) StatHist.$(OBJEXT) \ + send-announce.$(OBJEXT) $(am__objects_21) SquidNew.$(OBJEXT) \ + $(am__objects_23) stat.$(OBJEXT) StatHist.$(OBJEXT) \ String.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \ StoreFileSystem.$(OBJEXT) store_io.$(OBJEXT) \ StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \ @@ -356,14 +368,14 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \ StoreSwapLogData.$(OBJEXT) Server.$(OBJEXT) SwapDir.$(OBJEXT) \ time.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \ - $(am__objects_23) url.$(OBJEXT) URLScheme.$(OBJEXT) \ + $(am__objects_24) url.$(OBJEXT) URLScheme.$(OBJEXT) \ urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \ wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \ - wordlist.$(OBJEXT) $(am__objects_25) + wordlist.$(OBJEXT) $(am__objects_26) nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS) -am__objects_29 = ../test-suite/test_tools.$(OBJEXT) globals.$(OBJEXT) +am__objects_30 = ../test-suite/test_tools.$(OBJEXT) globals.$(OBJEXT) am_tests_testACLMaxUserIP_OBJECTS = acl.$(OBJEXT) \ ACLChecklist.$(OBJEXT) ACLMaxUserIP.$(OBJEXT) \ ACLProxyAuth.$(OBJEXT) ACLRegexData.$(OBJEXT) \ @@ -378,10 +390,10 @@ am_tests_testACLMaxUserIP_OBJECTS = acl.$(OBJEXT) \ tests/stub_MemObject.$(OBJEXT) tests/stub_store.$(OBJEXT) \ tests/testACLMaxUserIP.$(OBJEXT) tests/testMain.$(OBJEXT) \ time.$(OBJEXT) mem.$(OBJEXT) MemBuf.$(OBJEXT) \ - wordlist.$(OBJEXT) $(am__objects_29) + wordlist.$(OBJEXT) $(am__objects_30) tests_testACLMaxUserIP_OBJECTS = $(am_tests_testACLMaxUserIP_OBJECTS) am_tests_testAuth_OBJECTS = tests/testAuth.$(OBJEXT) \ - tests/testMain.$(OBJEXT) $(am__objects_29) \ + tests/testMain.$(OBJEXT) $(am__objects_30) \ authenticate.$(OBJEXT) ConfigParser.$(OBJEXT) \ tests/stub_acl.$(OBJEXT) tests/stub_cache_cf.$(OBJEXT) \ tests/stub_helper.$(OBJEXT) cbdata.$(OBJEXT) String.$(OBJEXT) \ @@ -403,7 +415,7 @@ am_tests_testAuth_OBJECTS = tests/testAuth.$(OBJEXT) \ URLScheme.$(OBJEXT) wordlist.$(OBJEXT) tests_testAuth_OBJECTS = $(am_tests_testAuth_OBJECTS) am_tests_testBoilerplate_OBJECTS = tests/testBoilerplate.$(OBJEXT) \ - tests/testMain.$(OBJEXT) $(am__objects_29) time.$(OBJEXT) + tests/testMain.$(OBJEXT) $(am__objects_30) time.$(OBJEXT) tests_testBoilerplate_OBJECTS = $(am_tests_testBoilerplate_OBJECTS) am__tests_testCacheManager_SOURCES_DIST = debug.cc globals.cc \ HttpRequest.cc HttpRequestMethod.cc mem.cc String.cc \ @@ -466,20 +478,20 @@ am_tests_testCacheManager_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \ CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - ConfigParser.$(OBJEXT) $(am__objects_8) disk.$(OBJEXT) \ - $(am__objects_10) event.$(OBJEXT) errorpage.$(OBJEXT) \ - $(am__objects_12) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + ConfigParser.$(OBJEXT) $(am__objects_9) disk.$(OBJEXT) \ + $(am__objects_11) event.$(OBJEXT) errorpage.$(OBJEXT) \ + $(am__objects_13) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \ forward.$(OBJEXT) fqdncache.$(OBJEXT) ftp.$(OBJEXT) \ - gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_13) \ + gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_14) \ http.$(OBJEXT) HttpBody.$(OBJEXT) HttpHeader.$(OBJEXT) \ HttpHeaderTools.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \ HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) \ HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) $(am__objects_16) ipcache.$(OBJEXT) \ + $(am__objects_16) $(am__objects_17) ipcache.$(OBJEXT) \ int.$(OBJEXT) internal.$(OBJEXT) list.$(OBJEXT) \ logfile.$(OBJEXT) multicast.$(OBJEXT) mem_node.$(OBJEXT) \ MemBuf.$(OBJEXT) MemObject.$(OBJEXT) mime.$(OBJEXT) \ @@ -487,7 +499,7 @@ am_tests_testCacheManager_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \ Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \ refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) \ - $(am__objects_20) $(am__objects_22) stat.$(OBJEXT) \ + $(am__objects_21) $(am__objects_23) stat.$(OBJEXT) \ StatHist.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \ store_client.$(OBJEXT) store_digest.$(OBJEXT) \ store_dir.$(OBJEXT) store_io.$(OBJEXT) store_key_md5.$(OBJEXT) \ @@ -541,7 +553,7 @@ am__tests_testCoss_SOURCES_DIST = tests/testCoss.cc tests/testMain.cc \ DiskIO/WriteRequest.h DiskIO/DiskFile.h \ DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \ DiskIO/DiskIOModule.h -am__objects_30 = $(am__objects_29) $(am__objects_8) \ +am__objects_31 = $(am__objects_30) $(am__objects_9) \ CacheDigest.$(OBJEXT) ConfigParser.$(OBJEXT) \ EventLoop.$(OBJEXT) event.$(OBJEXT) HttpMsg.$(OBJEXT) \ RemovalPolicy.$(OBJEXT) store_dir.$(OBJEXT) store.$(OBJEXT) \ @@ -567,7 +579,7 @@ am__objects_30 = $(am__objects_29) $(am__objects_8) \ tests/stub_store_client.$(OBJEXT) tests/stub_tools.$(OBJEXT) \ tests/testStoreSupport.$(OBJEXT) time.$(OBJEXT) \ URLScheme.$(OBJEXT) wordlist.$(OBJEXT) -am__objects_31 = tests/stub_store_rebuild.$(OBJEXT) \ +am__objects_32 = tests/stub_store_rebuild.$(OBJEXT) \ tests/stub_internal.$(OBJEXT) fd.$(OBJEXT) disk.$(OBJEXT) \ filemap.$(OBJEXT) HttpBody.$(OBJEXT) HttpReply.$(OBJEXT) \ HttpStatusLine.$(OBJEXT) int.$(OBJEXT) list.$(OBJEXT) \ @@ -577,10 +589,10 @@ am__objects_31 = tests/stub_store_rebuild.$(OBJEXT) \ StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \ StoreMetaVary.$(OBJEXT) StoreFileSystem.$(OBJEXT) \ store_io.$(OBJEXT) store_swapout.$(OBJEXT) \ - store_swapmeta.$(OBJEXT) unlinkd.$(OBJEXT) $(am__objects_30) \ - $(am__objects_9) + store_swapmeta.$(OBJEXT) unlinkd.$(OBJEXT) $(am__objects_31) \ + $(am__objects_10) am_tests_testCoss_OBJECTS = tests/testCoss.$(OBJEXT) \ - tests/testMain.$(OBJEXT) $(am__objects_31) + tests/testMain.$(OBJEXT) $(am__objects_32) tests_testCoss_OBJECTS = $(am_tests_testCoss_OBJECTS) am__DEPENDENCIES_1 = libsquid.la libauth.la \ DiskIO/Blocking/BlockingDiskIOModule.o \ @@ -647,28 +659,28 @@ am_tests_testEvent_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \ CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - ConfigParser.$(OBJEXT) $(am__objects_8) disk.$(OBJEXT) \ - $(am__objects_10) event.$(OBJEXT) errorpage.$(OBJEXT) \ - $(am__objects_12) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + ConfigParser.$(OBJEXT) $(am__objects_9) disk.$(OBJEXT) \ + $(am__objects_11) event.$(OBJEXT) errorpage.$(OBJEXT) \ + $(am__objects_13) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \ forward.$(OBJEXT) fqdncache.$(OBJEXT) ftp.$(OBJEXT) \ - gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_13) \ + gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_14) \ http.$(OBJEXT) HttpBody.$(OBJEXT) HttpHeader.$(OBJEXT) \ HttpHeaderTools.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \ HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) \ HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) $(am__objects_16) ipcache.$(OBJEXT) \ + $(am__objects_16) $(am__objects_17) ipcache.$(OBJEXT) \ int.$(OBJEXT) internal.$(OBJEXT) list.$(OBJEXT) \ logfile.$(OBJEXT) multicast.$(OBJEXT) mem_node.$(OBJEXT) \ MemBuf.$(OBJEXT) MemObject.$(OBJEXT) mime.$(OBJEXT) \ neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \ Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \ - refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_20) \ - $(am__objects_22) stat.$(OBJEXT) StatHist.$(OBJEXT) \ + refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_21) \ + $(am__objects_23) stat.$(OBJEXT) StatHist.$(OBJEXT) \ stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \ store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_io.$(OBJEXT) \ store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ @@ -748,28 +760,28 @@ am_tests_testEventLoop_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \ CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - ConfigParser.$(OBJEXT) $(am__objects_8) disk.$(OBJEXT) \ - $(am__objects_10) event.$(OBJEXT) errorpage.$(OBJEXT) \ - $(am__objects_12) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + ConfigParser.$(OBJEXT) $(am__objects_9) disk.$(OBJEXT) \ + $(am__objects_11) event.$(OBJEXT) errorpage.$(OBJEXT) \ + $(am__objects_13) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \ forward.$(OBJEXT) fqdncache.$(OBJEXT) ftp.$(OBJEXT) \ - gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_13) \ + gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_14) \ http.$(OBJEXT) HttpBody.$(OBJEXT) HttpHeader.$(OBJEXT) \ HttpHeaderTools.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \ HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) \ HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) $(am__objects_16) ipcache.$(OBJEXT) \ + $(am__objects_16) $(am__objects_17) ipcache.$(OBJEXT) \ int.$(OBJEXT) internal.$(OBJEXT) list.$(OBJEXT) \ logfile.$(OBJEXT) multicast.$(OBJEXT) mem_node.$(OBJEXT) \ MemBuf.$(OBJEXT) MemObject.$(OBJEXT) mime.$(OBJEXT) \ neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \ Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \ - refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_20) \ - $(am__objects_22) stat.$(OBJEXT) StatHist.$(OBJEXT) \ + refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_21) \ + $(am__objects_23) stat.$(OBJEXT) StatHist.$(OBJEXT) \ stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \ store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_io.$(OBJEXT) \ store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ @@ -787,7 +799,7 @@ nodist_tests_testEventLoop_OBJECTS = repl_modules.$(OBJEXT) \ string_arrays.$(OBJEXT) tests_testEventLoop_OBJECTS = $(am_tests_testEventLoop_OBJECTS) \ $(nodist_tests_testEventLoop_OBJECTS) -am__objects_32 = tests/testHeader_ACL.$(OBJEXT) \ +am__objects_33 = tests/testHeader_ACL.$(OBJEXT) \ tests/testHeader_AsyncEngine.$(OBJEXT) \ tests/testHeader_cbdata.$(OBJEXT) \ tests/testHeader_CompletionDispatcher.$(OBJEXT) \ @@ -810,7 +822,7 @@ am__objects_32 = tests/testHeader_ACL.$(OBJEXT) \ tests/testHeader_URLScheme.$(OBJEXT) \ tests/testHeader_wordlist.$(OBJEXT) am_tests_testHeaders_OBJECTS = tests/testMain.$(OBJEXT) \ - $(am__objects_32) + $(am__objects_33) tests_testHeaders_OBJECTS = $(am_tests_testHeaders_OBJECTS) am__tests_testHttpRequest_SOURCES_DIST = debug.cc globals.cc \ HttpRequest.cc HttpRequestMethod.cc mem.cc String.cc \ @@ -873,20 +885,20 @@ am_tests_testHttpRequest_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \ CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - ConfigParser.$(OBJEXT) $(am__objects_8) disk.$(OBJEXT) \ - $(am__objects_10) event.$(OBJEXT) errorpage.$(OBJEXT) \ - $(am__objects_12) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + ConfigParser.$(OBJEXT) $(am__objects_9) disk.$(OBJEXT) \ + $(am__objects_11) event.$(OBJEXT) errorpage.$(OBJEXT) \ + $(am__objects_13) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \ forward.$(OBJEXT) fqdncache.$(OBJEXT) ftp.$(OBJEXT) \ - gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_13) \ + gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_14) \ http.$(OBJEXT) HttpBody.$(OBJEXT) HttpHeader.$(OBJEXT) \ HttpHeaderTools.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \ HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) \ HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) $(am__objects_16) ipcache.$(OBJEXT) \ + $(am__objects_16) $(am__objects_17) ipcache.$(OBJEXT) \ int.$(OBJEXT) internal.$(OBJEXT) list.$(OBJEXT) \ logfile.$(OBJEXT) multicast.$(OBJEXT) mem_node.$(OBJEXT) \ MemBuf.$(OBJEXT) MemObject.$(OBJEXT) mime.$(OBJEXT) \ @@ -894,7 +906,7 @@ am_tests_testHttpRequest_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \ Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \ refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) \ - $(am__objects_20) $(am__objects_22) stat.$(OBJEXT) \ + $(am__objects_21) $(am__objects_23) stat.$(OBJEXT) \ StatHist.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \ store_client.$(OBJEXT) store_digest.$(OBJEXT) \ store_dir.$(OBJEXT) store_io.$(OBJEXT) store_key_md5.$(OBJEXT) \ @@ -949,7 +961,7 @@ am__tests_testNull_SOURCES_DIST = tests/testNull.cc tests/testMain.cc \ DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \ DiskIO/DiskIOModule.h am_tests_testNull_OBJECTS = tests/testNull.$(OBJEXT) \ - tests/testMain.$(OBJEXT) $(am__objects_31) + tests/testMain.$(OBJEXT) $(am__objects_32) tests_testNull_OBJECTS = $(am_tests_testNull_OBJECTS) am__tests_testStore_SOURCES_DIST = tests/stub_store_swapout.cc \ tests/testMain.cc tests/stub_MemObject.cc tests/testStore.cc \ @@ -986,11 +998,11 @@ am_tests_testStore_OBJECTS = tests/stub_store_swapout.$(OBJEXT) \ tests/testStoreController.$(OBJEXT) \ tests/testStoreHashIndex.$(OBJEXT) tests/TestSwapDir.$(OBJEXT) \ tests/stub_fd.$(OBJEXT) tests/stub_HttpReply.$(OBJEXT) \ - $(am__objects_30) + $(am__objects_31) tests_testStore_OBJECTS = $(am_tests_testStore_OBJECTS) am_tests_testString_OBJECTS = mem.$(OBJEXT) String.$(OBJEXT) \ tests/testMain.$(OBJEXT) tests/testString.$(OBJEXT) \ - $(am__objects_29) time.$(OBJEXT) + $(am__objects_30) time.$(OBJEXT) tests_testString_OBJECTS = $(am_tests_testString_OBJECTS) am__tests_testURL_SOURCES_DIST = debug.cc url.cc URLScheme.cc \ globals.cc HttpRequest.cc HttpRequestMethod.cc mem.cc \ @@ -1054,28 +1066,28 @@ am_tests_testURL_OBJECTS = debug.$(OBJEXT) url.$(OBJEXT) \ CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - ConfigParser.$(OBJEXT) $(am__objects_8) disk.$(OBJEXT) \ - $(am__objects_10) event.$(OBJEXT) errorpage.$(OBJEXT) \ - $(am__objects_12) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + ConfigParser.$(OBJEXT) $(am__objects_9) disk.$(OBJEXT) \ + $(am__objects_11) event.$(OBJEXT) errorpage.$(OBJEXT) \ + $(am__objects_13) ETag.$(OBJEXT) external_acl.$(OBJEXT) \ ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \ forward.$(OBJEXT) fqdncache.$(OBJEXT) ftp.$(OBJEXT) \ - gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_13) \ + gopher.$(OBJEXT) helper.$(OBJEXT) $(am__objects_14) \ http.$(OBJEXT) HttpBody.$(OBJEXT) HttpHeader.$(OBJEXT) \ HttpHeaderTools.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \ HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) \ HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) $(am__objects_16) ipcache.$(OBJEXT) \ + $(am__objects_16) $(am__objects_17) ipcache.$(OBJEXT) \ int.$(OBJEXT) internal.$(OBJEXT) list.$(OBJEXT) \ logfile.$(OBJEXT) multicast.$(OBJEXT) mem_node.$(OBJEXT) \ MemBuf.$(OBJEXT) MemObject.$(OBJEXT) mime.$(OBJEXT) \ neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \ Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \ peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \ - refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_20) \ - $(am__objects_22) stat.$(OBJEXT) StatHist.$(OBJEXT) \ + refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_21) \ + $(am__objects_23) stat.$(OBJEXT) StatHist.$(OBJEXT) \ stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \ store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_io.$(OBJEXT) \ store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ @@ -1129,7 +1141,7 @@ am__tests_testUfs_SOURCES_DIST = tests/testUfs.cc tests/testMain.cc \ DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \ DiskIO/DiskIOModule.h am_tests_testUfs_OBJECTS = tests/testUfs.$(OBJEXT) \ - tests/testMain.$(OBJEXT) $(am__objects_31) + tests/testMain.$(OBJEXT) $(am__objects_32) tests_testUfs_OBJECTS = $(am_tests_testUfs_OBJECTS) am__tests_test_http_range_SOURCES_DIST = tests/test_http_range.cc \ access_log.cc acl.cc acl_noncore.cc ACLChecklist.cc \ @@ -1187,14 +1199,14 @@ am_tests_test_http_range_OBJECTS = tests/test_http_range.$(OBJEXT) \ cache_manager.$(OBJEXT) CacheDigest.$(OBJEXT) carp.$(OBJEXT) \ cbdata.$(OBJEXT) client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - ConfigParser.$(OBJEXT) debug.$(OBJEXT) $(am__objects_8) \ - disk.$(OBJEXT) $(am__objects_10) event.$(OBJEXT) \ - errorpage.$(OBJEXT) $(am__objects_12) ETag.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + ConfigParser.$(OBJEXT) debug.$(OBJEXT) $(am__objects_9) \ + disk.$(OBJEXT) $(am__objects_11) event.$(OBJEXT) \ + errorpage.$(OBJEXT) $(am__objects_13) ETag.$(OBJEXT) \ external_acl.$(OBJEXT) ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) \ fde.$(OBJEXT) forward.$(OBJEXT) fqdncache.$(OBJEXT) \ ftp.$(OBJEXT) globals.$(OBJEXT) gopher.$(OBJEXT) \ - helper.$(OBJEXT) $(am__objects_13) http.$(OBJEXT) \ + helper.$(OBJEXT) $(am__objects_14) http.$(OBJEXT) \ HttpBody.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \ HttpHdrSc.$(OBJEXT) HttpHdrScTarget.$(OBJEXT) \ @@ -1202,15 +1214,15 @@ am_tests_test_http_range_OBJECTS = tests/test_http_range.$(OBJEXT) \ HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) HttpRequest.$(OBJEXT) \ HttpRequestMethod.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) int.$(OBJEXT) internal.$(OBJEXT) \ - $(am__objects_16) ipcache.$(OBJEXT) list.$(OBJEXT) \ + $(am__objects_16) int.$(OBJEXT) internal.$(OBJEXT) \ + $(am__objects_17) ipcache.$(OBJEXT) list.$(OBJEXT) \ logfile.$(OBJEXT) mem.$(OBJEXT) mem_node.$(OBJEXT) \ MemObject.$(OBJEXT) mime.$(OBJEXT) multicast.$(OBJEXT) \ neighbors.$(OBJEXT) net_db.$(OBJEXT) Parsing.$(OBJEXT) \ peer_digest.$(OBJEXT) peer_select.$(OBJEXT) pconn.$(OBJEXT) \ redirect.$(OBJEXT) referer.$(OBJEXT) refresh.$(OBJEXT) \ - RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) $(am__objects_20) \ - $(am__objects_22) stat.$(OBJEXT) StatHist.$(OBJEXT) \ + RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) $(am__objects_21) \ + $(am__objects_23) stat.$(OBJEXT) StatHist.$(OBJEXT) \ stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \ store_digest.$(OBJEXT) store_dir.$(OBJEXT) \ store_key_md5.$(OBJEXT) store_io.$(OBJEXT) store_log.$(OBJEXT) \ @@ -1297,29 +1309,29 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \ CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ - clientStream.$(OBJEXT) $(am__objects_6) ConfigOption.$(OBJEXT) \ - $(am__objects_8) disk.$(OBJEXT) $(am__objects_10) \ - errorpage.$(OBJEXT) $(am__objects_12) ETag.$(OBJEXT) \ + clientStream.$(OBJEXT) $(am__objects_7) ConfigOption.$(OBJEXT) \ + $(am__objects_9) disk.$(OBJEXT) $(am__objects_11) \ + errorpage.$(OBJEXT) $(am__objects_13) ETag.$(OBJEXT) \ event.$(OBJEXT) external_acl.$(OBJEXT) \ ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \ filemap.$(OBJEXT) forward.$(OBJEXT) fqdncache.$(OBJEXT) \ ftp.$(OBJEXT) gopher.$(OBJEXT) helper.$(OBJEXT) \ - $(am__objects_13) http.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ + $(am__objects_14) http.$(OBJEXT) HttpStatusLine.$(OBJEXT) \ HttpHdrCc.$(OBJEXT) HttpHdrRange.$(OBJEXT) HttpHdrSc.$(OBJEXT) \ HttpHdrScTarget.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \ HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \ HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \ HttpRequest.$(OBJEXT) HttpRequestMethod.$(OBJEXT) \ icmp.$(OBJEXT) icp_v2.$(OBJEXT) icp_v3.$(OBJEXT) \ - $(am__objects_15) internal.$(OBJEXT) $(am__objects_16) \ - ipcache.$(OBJEXT) $(am__objects_17) list.$(OBJEXT) \ + $(am__objects_16) internal.$(OBJEXT) $(am__objects_17) \ + ipcache.$(OBJEXT) $(am__objects_18) list.$(OBJEXT) \ logfile.$(OBJEXT) mem_node.$(OBJEXT) MemBuf.$(OBJEXT) \ MemObject.$(OBJEXT) mime.$(OBJEXT) multicast.$(OBJEXT) \ neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \ - Parsing.$(OBJEXT) $(am__objects_18) pconn.$(OBJEXT) \ + Parsing.$(OBJEXT) $(am__objects_19) pconn.$(OBJEXT) \ peer_digest.$(OBJEXT) peer_select.$(OBJEXT) redirect.$(OBJEXT) \ referer.$(OBJEXT) refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) \ - send-announce.$(OBJEXT) $(am__objects_20) $(am__objects_22) \ + send-announce.$(OBJEXT) $(am__objects_21) $(am__objects_23) \ tunnel.$(OBJEXT) Server.$(OBJEXT) SquidNew.$(OBJEXT) \ stat.$(OBJEXT) StatHist.$(OBJEXT) stmem.$(OBJEXT) \ store_io.$(OBJEXT) StoreIOState.$(OBJEXT) \ @@ -1327,10 +1339,10 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \ store_dir.$(OBJEXT) store_log.$(OBJEXT) \ store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \ store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \ - SwapDir.$(OBJEXT) tools.$(OBJEXT) $(am__objects_23) \ + SwapDir.$(OBJEXT) tools.$(OBJEXT) $(am__objects_24) \ URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \ wais.$(OBJEXT) wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \ - wordlist.$(OBJEXT) $(am__objects_25) + wordlist.$(OBJEXT) $(am__objects_26) nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS) @@ -1384,7 +1396,7 @@ SOURCES = $(ICAP_libicap_a_SOURCES) $(libAIO_a_SOURCES) \ $(nodist_ufsdump_SOURCES) $(unlinkd_SOURCES) DIST_SOURCES = $(ICAP_libicap_a_SOURCES) $(am__libAIO_a_SOURCES_DIST) \ $(libBlocking_a_SOURCES) $(libDiskDaemon_a_SOURCES) \ - $(libDiskThreads_a_SOURCES) $(libauth_la_SOURCES) \ + $(am__libDiskThreads_a_SOURCES_DIST) $(libauth_la_SOURCES) \ $(libsquid_la_SOURCES) $(DiskIO_DiskDaemon_diskd_SOURCES) \ $(cf_gen_SOURCES) $(dnsserver_SOURCES) $(pinger_SOURCES) \ $(recv_announce_SOURCES) $(am__squid_SOURCES_DIST) \ @@ -1558,6 +1570,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ @@ -1727,6 +1741,8 @@ AIO_WIN32_ALL_SOURCES = \ @USE_AIO_WIN32_FALSE@AIO_WIN32_SOURCES = @USE_AIO_WIN32_TRUE@AIO_WIN32_SOURCES = $(AIO_WIN32_ALL_SOURCES) +@USE_AIOPS_WIN32_FALSE@AIOPS_SOURCE = DiskIO/DiskThreads/aiops.cc +@USE_AIOPS_WIN32_TRUE@AIOPS_SOURCE = DiskIO/DiskThreads/aiops_win32.cc IDENT_ALL_SOURCE = ACLIdent.cc ACLIdent.h ident.cc @ENABLE_IDENT_FALSE@IDENT_SOURCE = @ENABLE_IDENT_TRUE@IDENT_SOURCE = $(IDENT_ALL_SOURCE) @@ -1802,7 +1818,9 @@ EXTRA_squid_SOURCES = \ $(SNMP_ALL_SOURCE) \ unlinkd.cc \ $(SSL_ALL_SOURCE) \ - $(WIN32_ALL_SOURCE) + $(WIN32_ALL_SOURCE) \ + DiskIO/DiskThreads/aiops.cc \ + DiskIO/DiskThreads/aiops_win32.cc squid_ACLSOURCES = \ $(ARP_ACL_SOURCE) \ @@ -2449,14 +2467,14 @@ libDiskDaemon_a_SOURCES = \ DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h libDiskThreads_a_SOURCES = \ - DiskIO/DiskThreads/aiops.cc \ - DiskIO/DiskThreads/async_io.cc \ - DiskIO/DiskThreads/DiskThreads.h \ - DiskIO/DiskThreads/DiskThreadsDiskFile.cc \ - DiskIO/DiskThreads/DiskThreadsDiskFile.h \ - DiskIO/DiskThreads/DiskThreadsDiskIOModule.h \ - DiskIO/DiskThreads/DiskThreadsIOStrategy.cc \ - DiskIO/DiskThreads/DiskThreadsIOStrategy.h + $(AIOPS_SOURCE) \ + DiskIO/DiskThreads/async_io.cc \ + DiskIO/DiskThreads/DiskThreads.h \ + DiskIO/DiskThreads/DiskThreadsDiskFile.cc \ + DiskIO/DiskThreads/DiskThreadsDiskFile.h \ + DiskIO/DiskThreads/DiskThreadsDiskIOModule.h \ + DiskIO/DiskThreads/DiskThreadsIOStrategy.cc \ + DiskIO/DiskThreads/DiskThreadsIOStrategy.h DiskIO_DiskDaemon_diskd_SOURCES = DiskIO/DiskDaemon/diskd.cc DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@ @@ -3849,6 +3867,9 @@ DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp): DiskIO/DiskThreads/aiops.$(OBJEXT): \ DiskIO/DiskThreads/$(am__dirstamp) \ DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp) +DiskIO/DiskThreads/aiops_win32.$(OBJEXT): \ + DiskIO/DiskThreads/$(am__dirstamp) \ + DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp) DiskIO/DiskThreads/async_io.$(OBJEXT): \ DiskIO/DiskThreads/$(am__dirstamp) \ DiskIO/DiskThreads/$(DEPDIR)/$(am__dirstamp) @@ -4302,6 +4323,7 @@ mostlyclean-compile: -rm -f DiskIO/DiskThreads/DiskThreadsDiskIOModule.$(OBJEXT) -rm -f DiskIO/DiskThreads/DiskThreadsIOStrategy.$(OBJEXT) -rm -f DiskIO/DiskThreads/aiops.$(OBJEXT) + -rm -f DiskIO/DiskThreads/aiops_win32.$(OBJEXT) -rm -f DiskIO/DiskThreads/async_io.$(OBJEXT) -rm -f DiskIO/ReadRequest.$(OBJEXT) -rm -f DiskIO/WriteRequest.$(OBJEXT) @@ -4626,6 +4648,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/DiskThreadsDiskIOModule.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/DiskThreadsIOStrategy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/aiops.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/aiops_win32.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/async_io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/ChunkedCodingParser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/ICAPClient.Po@am__quote@ diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index cb4790fbcb..1994273fa4 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -228,6 +228,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ @@ -294,7 +296,7 @@ target_alias = @target_alias@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.71 2006/09/04 20:17:19 serassio Exp $ +# $Id: Makefile.in,v 1.72 2006/09/06 19:38:27 serassio Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index 24f1b6f68f..04dcc2b2c1 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.76 2006/09/04 20:17:19 serassio Exp $ +# $Id: Makefile.in,v 1.77 2006/09/06 19:38:27 serassio Exp $ # srcdir = @srcdir@ @@ -230,6 +230,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in index cdfd8db071..4fffbb3de0 100644 --- a/src/repl/Makefile.in +++ b/src/repl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.70 2006/09/04 20:17:20 serassio Exp $ +# $Id: Makefile.in,v 1.71 2006/09/06 19:38:28 serassio Exp $ # srcdir = @srcdir@ @@ -223,6 +223,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in index 10a2996b7f..b592134056 100644 --- a/test-suite/Makefile.in +++ b/test-suite/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.66 2006/09/04 20:17:20 serassio Exp $ +# $Id: Makefile.in,v 1.67 2006/09/06 19:38:29 serassio Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -296,6 +296,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ diff --git a/tools/Makefile.in b/tools/Makefile.in index f7e04027ad..e11cac50f7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.6 2006/09/04 20:17:20 serassio Exp $ +# $Id: Makefile.in,v 1.7 2006/09/06 19:38:29 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -229,6 +229,8 @@ STORE_OBJS = @STORE_OBJS@ STORE_TESTS = @STORE_TESTS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@ USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@