From 2f2d507ffccee6d605c7fa98b5a874c157a70512 Mon Sep 17 00:00:00 2001 From: wessels <> Date: Tue, 22 Nov 2005 06:55:04 +0000 Subject: [PATCH] bootstrapped --- Makefile.in | 4 +- configure | 139 ++++++++++++++---- contrib/Makefile.in | 2 + doc/Makefile.in | 4 +- errors/Makefile.in | 4 +- helpers/Makefile.in | 2 + helpers/basic_auth/LDAP/Makefile.in | 4 +- helpers/basic_auth/MSNT/Makefile.in | 4 +- helpers/basic_auth/Makefile.in | 4 +- helpers/basic_auth/NCSA/Makefile.in | 4 +- helpers/basic_auth/PAM/Makefile.in | 4 +- helpers/basic_auth/SASL/Makefile.in | 4 +- helpers/basic_auth/SMB/Makefile.in | 4 +- helpers/basic_auth/YP/Makefile.in | 4 +- helpers/basic_auth/getpwnam/Makefile.in | 4 +- helpers/basic_auth/mswin_sspi/Makefile.in | 5 +- .../basic_auth/multi-domain-NTLM/Makefile.in | 4 +- helpers/digest_auth/Makefile.in | 4 +- helpers/digest_auth/password/Makefile.in | 4 +- helpers/external_acl/Makefile.in | 4 +- helpers/external_acl/ip_user/Makefile.in | 4 +- helpers/external_acl/ldap_group/Makefile.in | 4 +- .../external_acl/mswin_lm_group/Makefile.in | 4 +- helpers/external_acl/unix_group/Makefile.in | 4 +- helpers/external_acl/wbinfo_group/Makefile.in | 4 +- helpers/negotiate_auth/Makefile.in | 5 +- helpers/negotiate_auth/mswin_sspi/Makefile.in | 5 +- helpers/ntlm_auth/Makefile.in | 4 +- helpers/ntlm_auth/SMB/Makefile.in | 4 +- helpers/ntlm_auth/SMB/smbval/Makefile.in | 2 + helpers/ntlm_auth/fakeauth/Makefile.in | 4 +- helpers/ntlm_auth/mswin_sspi/Makefile.in | 5 +- helpers/ntlm_auth/no_check/Makefile.in | 4 +- icons/Makefile.in | 4 +- include/autoconf.h.in | 3 + lib/Makefile.in | 4 +- lib/cppunit-1.10.0/src/cppunit/Makefile.in | 2 +- lib/libTrie/Makefile.in | 2 +- scripts/Makefile.in | 2 + snmplib/Makefile.in | 2 + src/ICAP/Makefile.in | 57 +++---- src/Makefile.in | 15 +- src/auth/Makefile.in | 4 +- src/fs/Makefile.in | 4 +- src/repl/Makefile.in | 4 +- test-suite/Makefile.in | 4 +- 46 files changed, 272 insertions(+), 100 deletions(-) diff --git a/Makefile.in b/Makefile.in index 46f51eeb96..53d785c1a8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.79 2005/11/06 01:10:58 hno Exp $ +# $Id: Makefile.in,v 1.80 2005/11/21 23:55:04 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -212,6 +212,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/configure b/configure index fad3bde82e..5c39677abc 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.391 . +# From configure.in Revision: 1.392 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -467,7 +467,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 MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS 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_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 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 EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_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 MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS 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 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 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 EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1095,6 +1095,7 @@ Optional Features: DO NOT use this in a squid configured as a web proxy, ONLY use it in a squid configured for webserver acceleration. + --enable-icap-client Enable the ICAP client. --enable-useragent-log Enable logging of User-Agent header --enable-referer-log Enable logging of Referer header --disable-wccp Disable Web Cache Coordination Protocol @@ -4464,7 +4465,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4467 "configure"' > conftest.$ac_ext + echo '#line 4468 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5579,7 +5580,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5582:" \ +echo "$as_me:5583:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6677,11 +6678,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6680: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6681: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6684: \$? = $ac_status" >&5 + echo "$as_me:6685: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6939,11 +6940,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6942: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6943: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6946: \$? = $ac_status" >&5 + echo "$as_me:6947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7001,11 +7002,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7004: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7005: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7008: \$? = $ac_status" >&5 + echo "$as_me:7009: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9249,7 +9250,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11606: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11609: \$? = $ac_status" >&5 + echo "$as_me:11610: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11664,11 +11665,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11667: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11668: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11671: \$? = $ac_status" >&5 + echo "$as_me:11672: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13041,7 +13042,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:14028: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14031: \$? = $ac_status" >&5 + echo "$as_me:14032: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14086,11 +14087,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14089: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14090: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14093: \$? = $ac_status" >&5 + echo "$as_me:14094: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16216,11 +16217,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16219: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16220: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16223: \$? = $ac_status" >&5 + echo "$as_me:16224: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16478,11 +16479,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16481: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16482: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16485: \$? = $ac_status" >&5 + echo "$as_me:16486: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16540,11 +16541,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16544: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16547: \$? = $ac_status" >&5 + echo "$as_me:16548: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18788,7 +18789,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo $ECHO_N "checking whether to enable the ICAP client... $ECHO_C" >&6 +if test "${ac_cv_use_icap_client+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_use_icap_client=no +fi +echo "$as_me:$LINENO: result: $ac_cv_use_icap_client" >&5 +echo "${ECHO_T}$ac_cv_use_icap_client" >&6 +if test "$ac_cv_use_icap_client" = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define ICAP_CLIENT 1 +_ACEOF + + + +if true; then + USE_ICAP_CLIENT_TRUE= + USE_ICAP_CLIENT_FALSE='#' +else + USE_ICAP_CLIENT_TRUE='#' + USE_ICAP_CLIENT_FALSE= +fi + +else + +cat >>confdefs.h <<\_ACEOF +#define ICAP_CLIENT 0 +_ACEOF + +fi + + # Check whether --enable-useragent-log or --disable-useragent-log was given. if test "${enable_useragent_log+set}" = set; then enableval="$enable_useragent_log" @@ -36211,7 +36262,7 @@ fi rm -f core - ac_config_files="$ac_config_files Makefile lib/Makefile scripts/Makefile scripts/RunCache scripts/RunAccel src/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile contrib/Makefile snmplib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/mswin_sspi/Makefile helpers/basic_auth/YP/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/multi-domain-NTLM/Makefile helpers/basic_auth/SASL/Makefile helpers/digest_auth/Makefile helpers/digest_auth/password/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fakeauth/Makefile helpers/ntlm_auth/no_check/Makefile helpers/ntlm_auth/SMB/Makefile helpers/ntlm_auth/SMB/smbval/Makefile helpers/ntlm_auth/mswin_sspi/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/mswin_sspi/Makefile helpers/external_acl/Makefile helpers/external_acl/ip_user/Makefile helpers/external_acl/ldap_group/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/mswin_lm_group/Makefile" + ac_config_files="$ac_config_files Makefile lib/Makefile scripts/Makefile scripts/RunCache scripts/RunAccel src/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile src/ICAP/Makefile contrib/Makefile snmplib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/mswin_sspi/Makefile helpers/basic_auth/YP/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/multi-domain-NTLM/Makefile helpers/basic_auth/SASL/Makefile helpers/digest_auth/Makefile helpers/digest_auth/password/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fakeauth/Makefile helpers/ntlm_auth/no_check/Makefile helpers/ntlm_auth/SMB/Makefile helpers/ntlm_auth/SMB/smbval/Makefile helpers/ntlm_auth/mswin_sspi/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/mswin_sspi/Makefile helpers/external_acl/Makefile helpers/external_acl/ip_user/Makefile helpers/external_acl/ldap_group/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/mswin_lm_group/Makefile" @@ -36405,6 +36456,20 @@ echo "$as_me: error: conditional \"USE_ESI\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_ICAP_CLIENT_TRUE}" && test -z "${USE_ICAP_CLIENT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_ICAP_CLIENT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_ICAP_CLIENT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${USE_ICAP_CLIENT_TRUE}" && test -z "${USE_ICAP_CLIENT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_ICAP_CLIENT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_ICAP_CLIENT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -37012,6 +37077,7 @@ do "src/fs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/fs/Makefile" ;; "src/repl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/repl/Makefile" ;; "src/auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/auth/Makefile" ;; + "src/ICAP/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ICAP/Makefile" ;; "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; "snmplib/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmplib/Makefile" ;; "icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;; @@ -37228,6 +37294,8 @@ s,@USE_DELAY_POOLS_TRUE@,$USE_DELAY_POOLS_TRUE,;t t s,@USE_DELAY_POOLS_FALSE@,$USE_DELAY_POOLS_FALSE,;t t s,@USE_ESI_TRUE@,$USE_ESI_TRUE,;t t s,@USE_ESI_FALSE@,$USE_ESI_FALSE,;t t +s,@USE_ICAP_CLIENT_TRUE@,$USE_ICAP_CLIENT_TRUE,;t t +s,@USE_ICAP_CLIENT_FALSE@,$USE_ICAP_CLIENT_FALSE,;t t s,@USE_SNMP_TRUE@,$USE_SNMP_TRUE,;t t s,@USE_SNMP_FALSE@,$USE_SNMP_FALSE,;t t s,@SNMPLIB@,$SNMPLIB,;t t @@ -38013,6 +38081,15 @@ if test "$no_recursion" != yes; then # Remove --cache-file and --srcdir arguments so they do not pile up. ac_sub_configure_args= # Add --quiet option if used + test "$silent" = yes && + ac_sub_configure_args="$ac_sub_configure_args --quiet" + # Add --quiet option if used + test "$silent" = yes && + ac_sub_configure_args="$ac_sub_configure_args --quiet" + # Add --quiet option if used + test "$silent" = yes && + ac_sub_configure_args="$ac_sub_configure_args --quiet" + # Add --quiet option if used test "$silent" = yes && ac_sub_configure_args="$ac_sub_configure_args --quiet" ac_prev= diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 24e49f0672..47b64e9684 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -188,6 +188,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/doc/Makefile.in b/doc/Makefile.in index d23adbb4df..bcdf72968b 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.54 2005/11/06 01:10:59 hno Exp $ +# $Id: Makefile.in,v 1.55 2005/11/21 23:55:06 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -195,6 +195,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/errors/Makefile.in b/errors/Makefile.in index 580dbf0b75..73745f68ef 100644 --- a/errors/Makefile.in +++ b/errors/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.70 2005/11/06 01:10:59 hno Exp $ +# $Id: Makefile.in,v 1.71 2005/11/21 23:55:06 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -187,6 +187,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/Makefile.in b/helpers/Makefile.in index 85f1f11624..ea3052be84 100644 --- a/helpers/Makefile.in +++ b/helpers/Makefile.in @@ -192,6 +192,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in index 6c2dd51a3d..661ac8f47f 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.61 2005/11/06 01:11:00 hno Exp $ +# $Id: Makefile.in,v 1.62 2005/11/21 23:55:07 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -218,6 +218,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in index 45c37f56d7..a137cf305c 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.64 2005/11/06 01:11:01 hno Exp $ +# $Id: Makefile.in,v 1.65 2005/11/21 23:55:07 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -227,6 +227,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in index 7f5a48a66a..80808f98f6 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.59 2005/11/06 01:11:00 hno Exp $ +# $Id: Makefile.in,v 1.60 2005/11/21 23:55:07 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -196,6 +196,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in index f20b861c75..79938e726f 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.61 2005/11/06 01:11:01 hno Exp $ +# $Id: Makefile.in,v 1.62 2005/11/21 23:55:08 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in index ed34f804d7..aa8dfb6592 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.62 2005/11/06 01:11:02 hno Exp $ +# $Id: Makefile.in,v 1.63 2005/11/21 23:55:08 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -217,6 +217,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in index d22bd1a2a3..c69050444a 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.58 2005/11/06 01:11:03 hno Exp $ +# $Id: Makefile.in,v 1.59 2005/11/21 23:55:10 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -214,6 +214,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in index 7ef42a9bdf..47de02267e 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.60 2005/11/06 01:11:04 hno Exp $ +# $Id: Makefile.in,v 1.61 2005/11/21 23:55:10 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -223,6 +223,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in index 03e057e5a0..42d4baf04c 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.61 2005/11/06 01:11:04 hno Exp $ +# $Id: Makefile.in,v 1.62 2005/11/21 23:55:12 wessels Exp $ # # @@ -213,6 +213,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in index 97da86ea90..e6a35a74d4 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.59 2005/11/06 01:11:13 hno Exp $ +# $Id: Makefile.in,v 1.60 2005/11/21 23:55:12 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/mswin_sspi/Makefile.in b/helpers/basic_auth/mswin_sspi/Makefile.in index da7976d88f..f2b3e3caa6 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.2 2005/11/03 20:06:29 serassio Exp $ +# $Id: Makefile.in,v 1.3 2005/11/21 23:55:12 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -168,6 +168,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LEAKFINDER_FALSE = @MAKE_LEAKFINDER_FALSE@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ +MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MV = @MV@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -213,6 +214,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in index cacd373439..e37000f792 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.57 2005/11/06 01:11:18 hno Exp $ +# $Id: Makefile.in,v 1.58 2005/11/21 23:55:12 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -195,6 +195,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index f5138ab960..316028d282 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.56 2005/11/06 01:11:18 hno Exp $ +# $Id: Makefile.in,v 1.57 2005/11/21 23:55:12 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -196,6 +196,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index 3bf9da67db..d3ea4f559f 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.60 2005/11/06 01:11:23 hno Exp $ +# $Id: Makefile.in,v 1.61 2005/11/21 23:55:14 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -217,6 +217,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in index e894272359..a753abe264 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.47 2005/11/06 01:11:23 hno Exp $ +# $Id: Makefile.in,v 1.48 2005/11/21 23:55:14 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -196,6 +196,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in index 2df312d89b..d9e4e715e6 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.47 2005/11/06 01:11:25 hno Exp $ +# $Id: Makefile.in,v 1.48 2005/11/21 23:55:15 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -214,6 +214,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in index 728bd3dd1b..5394ee14bf 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.49 2005/11/06 01:11:26 hno Exp $ +# $Id: Makefile.in,v 1.50 2005/11/21 23:55:17 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -219,6 +219,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/external_acl/mswin_lm_group/Makefile.in b/helpers/external_acl/mswin_lm_group/Makefile.in index d88c2f27fe..568fb7d7c2 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.3 2005/11/06 01:11:26 hno Exp $ +# $Id: Makefile.in,v 1.4 2005/11/21 23:55:17 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -214,6 +214,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in index 3a74566120..2bab9a4864 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.47 2005/11/06 01:11:31 hno Exp $ +# $Id: Makefile.in,v 1.48 2005/11/21 23:55:17 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -216,6 +216,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in index 801fdcfc66..e4f344f273 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.45 2005/11/06 01:11:31 hno Exp $ +# $Id: Makefile.in,v 1.46 2005/11/21 23:55:17 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -195,6 +195,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/negotiate_auth/Makefile.in b/helpers/negotiate_auth/Makefile.in index 04d86b328c..cbe4c3c1a7 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.2 2005/11/03 20:06:30 serassio Exp $ +# $Id: Makefile.in,v 1.3 2005/11/21 23:55:17 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -150,6 +150,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LEAKFINDER_FALSE = @MAKE_LEAKFINDER_FALSE@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ +MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MV = @MV@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -195,6 +196,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/negotiate_auth/mswin_sspi/Makefile.in b/helpers/negotiate_auth/mswin_sspi/Makefile.in index aceeff4547..2d5b0e25d1 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.2 2005/11/03 20:06:30 serassio Exp $ +# $Id: Makefile.in,v 1.3 2005/11/21 23:55:17 wessels Exp $ # srcdir = @srcdir@ @@ -167,6 +167,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LEAKFINDER_FALSE = @MAKE_LEAKFINDER_FALSE@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ +MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MV = @MV@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -212,6 +213,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in index 809cec1437..3a8a1f3843 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.59 2005/11/06 01:11:32 hno Exp $ +# $Id: Makefile.in,v 1.60 2005/11/21 23:55:17 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -196,6 +196,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in index 45daade515..57bea048c8 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.59 2005/11/06 01:11:32 hno Exp $ +# $Id: Makefile.in,v 1.60 2005/11/21 23:55:18 wessels Exp $ # srcdir = @srcdir@ @@ -220,6 +220,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in index cc4b914a93..e3bb31ae91 100644 --- a/helpers/ntlm_auth/SMB/smbval/Makefile.in +++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in @@ -208,6 +208,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in index c2f7c6da15..d73faf9bb4 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.56 2005/11/06 01:11:34 hno Exp $ +# $Id: Makefile.in,v 1.57 2005/11/21 23:55:20 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -215,6 +215,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.in b/helpers/ntlm_auth/mswin_sspi/Makefile.in index 1b010afa13..93dfdb4130 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.2 2005/11/03 20:06:31 serassio Exp $ +# $Id: Makefile.in,v 1.3 2005/11/21 23:55:20 wessels Exp $ # srcdir = @srcdir@ @@ -166,6 +166,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LEAKFINDER_FALSE = @MAKE_LEAKFINDER_FALSE@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ +MINGW_LIBS = @MINGW_LIBS@ MKDIR = @MKDIR@ MV = @MV@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -211,6 +212,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in index 6ee45325a2..19c6f99a33 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.58 2005/11/06 01:11:34 hno Exp $ +# $Id: Makefile.in,v 1.59 2005/11/21 23:55:21 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -195,6 +195,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 6b23690c11..e1a0bd806e 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.72 2005/11/06 01:11:36 hno Exp $ +# $Id: Makefile.in,v 1.73 2005/11/21 23:55:22 wessels Exp $ # srcdir = @srcdir@ @@ -196,6 +196,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/include/autoconf.h.in b/include/autoconf.h.in index 82fa549052..2b59f076cc 100644 --- a/include/autoconf.h.in +++ b/include/autoconf.h.in @@ -691,6 +691,9 @@ behaviour. Setting this to '0' will disable such code. */ #undef HTTP_VIOLATIONS +/* Enable ICAP client features in Squid */ +#undef ICAP_CLIENT + /* Enable support for Transparent Proxy on systems using IP-Filter address redirection. This provides "masquerading" support for non Linux system. */ #undef IPF_TRANSPARENT diff --git a/lib/Makefile.in b/lib/Makefile.in index 38d323065b..59e4665115 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.110 2005/11/06 01:11:36 hno Exp $ +# $Id: Makefile.in,v 1.111 2005/11/21 23:55:24 wessels Exp $ # srcdir = @srcdir@ @@ -267,6 +267,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/lib/cppunit-1.10.0/src/cppunit/Makefile.in b/lib/cppunit-1.10.0/src/cppunit/Makefile.in index 664067eba9..c8ecfce0ff 100644 --- a/lib/cppunit-1.10.0/src/cppunit/Makefile.in +++ b/lib/cppunit-1.10.0/src/cppunit/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.10 2005/08/16 00:11:46 hno Exp $ +# $Id: Makefile.in,v 1.11 2005/11/21 23:55:24 wessels Exp $ # srcdir = @srcdir@ diff --git a/lib/libTrie/Makefile.in b/lib/libTrie/Makefile.in index 9bfea7be0c..fe91a111d5 100644 --- a/lib/libTrie/Makefile.in +++ b/lib/libTrie/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.18 2005/08/16 00:11:46 hno Exp $ +# $Id: Makefile.in,v 1.19 2005/11/21 23:55:24 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 90da9ff857..7cec78aec0 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -193,6 +193,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in index b7893863b9..73fd064a49 100644 --- a/snmplib/Makefile.in +++ b/snmplib/Makefile.in @@ -206,6 +206,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = 3.4 diff --git a/src/ICAP/Makefile.in b/src/ICAP/Makefile.in index 666113e999..1ade7f084c 100644 --- a/src/ICAP/Makefile.in +++ b/src/ICAP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.1 2005/11/21 23:32:59 wessels Exp $ +# $Id: Makefile.in,v 1.2 2005/11/21 23:55:25 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,28 +44,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = src/icapclient +subdir = src/ICAP DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru -libicapclient_a_AR = $(AR) $(ARFLAGS) -libicapclient_a_LIBADD = -am_libicapclient_a_OBJECTS = ChunkedCodingParser.$(OBJEXT) \ - ICAPAnchor.$(OBJEXT) ICAPClientSideHook.$(OBJEXT) \ - ICAPClient.$(OBJEXT) ICAPElements.$(OBJEXT) \ - ICAPXaction.$(OBJEXT) ICAPOptXact.$(OBJEXT) \ - ICAPModXact.$(OBJEXT) ICAPServiceRep.$(OBJEXT) \ - ICAPConfig.$(OBJEXT) ICAPOptions.$(OBJEXT) \ - TextException.$(OBJEXT) MsgPipe.$(OBJEXT) -libicapclient_a_OBJECTS = $(am_libicapclient_a_OBJECTS) +libicap_a_AR = $(AR) $(ARFLAGS) +libicap_a_LIBADD = +am_libicap_a_OBJECTS = ChunkedCodingParser.$(OBJEXT) \ + ICAPClientRespmodPrecache.$(OBJEXT) \ + ICAPClientReqmodPrecache.$(OBJEXT) ICAPClient.$(OBJEXT) \ + ICAPElements.$(OBJEXT) ICAPXaction.$(OBJEXT) \ + ICAPOptXact.$(OBJEXT) ICAPModXact.$(OBJEXT) \ + ICAPServiceRep.$(OBJEXT) ICAPConfig.$(OBJEXT) \ + ICAPOptions.$(OBJEXT) TextException.$(OBJEXT) \ + MsgPipe.$(OBJEXT) +libicap_a_OBJECTS = $(am_libicap_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @@ -77,8 +78,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libicapclient_a_SOURCES) -DIST_SOURCES = $(libicapclient_a_SOURCES) +SOURCES = $(libicap_a_SOURCES) +DIST_SOURCES = $(libicap_a_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -281,15 +282,15 @@ AM_CFLAGS = @SQUID_CFLAGS@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ SUBDIRS = EXTRA_LIBRARIES = \ - libicapclient.a + libicap.a noinst_LIBRARIES = \ - libicapclient.a + libicap.a -libicapclient_a_SOURCES = \ +libicap_a_SOURCES = \ ChunkedCodingParser.cc \ - ICAPAnchor.cc \ - ICAPClientSideHook.cc \ + ICAPClientRespmodPrecache.cc \ + ICAPClientReqmodPrecache.cc \ ICAPClient.cc \ ICAPElements.cc \ ICAPXaction.cc \ @@ -315,9 +316,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/icapclient/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ICAP/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/icapclient/Makefile + $(AUTOMAKE) --foreign src/ICAP/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -338,10 +339,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libicapclient.a: $(libicapclient_a_OBJECTS) $(libicapclient_a_DEPENDENCIES) - -rm -f libicapclient.a - $(libicapclient_a_AR) libicapclient.a $(libicapclient_a_OBJECTS) $(libicapclient_a_LIBADD) - $(RANLIB) libicapclient.a +libicap.a: $(libicap_a_OBJECTS) $(libicap_a_DEPENDENCIES) + -rm -f libicap.a + $(libicap_a_AR) libicap.a $(libicap_a_OBJECTS) $(libicap_a_LIBADD) + $(RANLIB) libicap.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -350,9 +351,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChunkedCodingParser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPAnchor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPClient.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPClientSideHook.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPClientReqmodPrecache.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPClientRespmodPrecache.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPConfig.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPElements.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICAPModXact.Po@am__quote@ diff --git a/src/Makefile.in b/src/Makefile.in index d164e417fb..f60c7b1579 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.354 2005/11/21 22:41:45 wessels Exp $ +# $Id: Makefile.in,v 1.355 2005/11/21 23:55:25 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -50,6 +50,7 @@ host_triplet = @host@ check_PROGRAMS = tests/testAuth$(EXEEXT) tests/testStore$(EXEEXT) \ tests/testUfs$(EXEEXT) tests/testCoss$(EXEEXT) \ tests/testNull$(EXEEXT) +@USE_ICAP_CLIENT_TRUE@am__append_1 = ICAP EXTRA_PROGRAMS = DiskIO/DiskDaemon/diskd$(EXEEXT) unlinkd$(EXEEXT) \ pinger$(EXEEXT) dnsserver$(EXEEXT) recv-announce$(EXEEXT) \ ufsdump$(EXEEXT) @@ -313,6 +314,7 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS) +@USE_ICAP_CLIENT_TRUE@am__DEPENDENCIES_1 = ICAP/libicap.a am_squidclient_OBJECTS = client.$(OBJEXT) squidclient_OBJECTS = $(am_squidclient_OBJECTS) squidclient_LDADD = $(LDADD) @@ -371,7 +373,7 @@ am__objects_25 = tests/stub_store_rebuild.$(OBJEXT) \ am_tests_testCoss_OBJECTS = tests/testCoss.$(OBJEXT) \ tests/testMain.$(OBJEXT) $(am__objects_25) tests_testCoss_OBJECTS = $(am_tests_testCoss_OBJECTS) -am__DEPENDENCIES_1 = DiskIO/Blocking/BlockingDiskIOModule.o \ +am__DEPENDENCIES_2 = DiskIO/Blocking/BlockingDiskIOModule.o \ repl/lru/store_repl_lru.o am_tests_testNull_OBJECTS = tests/testNull.$(OBJEXT) \ tests/testMain.$(OBJEXT) $(am__objects_25) @@ -554,7 +556,7 @@ DATA = $(data_DATA) $(sysconf_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = fs repl auth ICAP DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -691,6 +693,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ @@ -750,6 +754,7 @@ AUTOMAKE_OPTIONS = subdir-objects @USE_SNMP_FALSE@SNMPSOURCE = @USE_SNMP_TRUE@SNMPSOURCE = snmp_core.cc snmp_agent.cc TESTS = $(check_PROGRAMS) +SUBDIRS = fs repl auth $(am__append_1) DELAY_POOL_ALL_SOURCE = \ CommonPool.h \ CompositePoolNode.h \ @@ -811,6 +816,8 @@ ESI_ALL_SOURCE = \ @USE_ESI_FALSE@ESI_SOURCE = @USE_ESI_TRUE@ESI_SOURCE = $(ESI_ALL_SOURCE) +@USE_ICAP_CLIENT_FALSE@ICAP_LIBS = +@USE_ICAP_CLIENT_TRUE@ICAP_LIBS = ICAP/libicap.a @ENABLE_XPROF_STATS_FALSE@XPROF_STATS_SOURCE = @ENABLE_XPROF_STATS_TRUE@XPROF_STATS_SOURCE = ProfStats.cc @ENABLE_HTCP_TRUE@HTCPSOURCE = htcp.cc htcp.h @@ -842,7 +849,6 @@ ARP_ACL_ALL_SOURCE = ACLARP.cc ACLARP.h @ENABLE_ARP_ACL_TRUE@ARP_ACL_SOURCE = $(ARP_ACL_ALL_SOURCE) AM_CFLAGS = @SQUID_CFLAGS@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ -SUBDIRS = fs repl auth EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a noinst_LIBRARIES = @DISK_LIBS@ INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include \ @@ -1206,6 +1212,7 @@ squid_LDADD = \ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ + ${ICAP_LIBS} \ @LIB_MALLOC@ \ @SSLLIB@ \ -lmiscutil \ diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 4fb9f369db..b142fcb4d6 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -227,6 +227,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ @@ -281,7 +283,7 @@ target_alias = @target_alias@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.59 2005/11/06 01:11:40 hno Exp $ +# $Id: Makefile.in,v 1.60 2005/11/21 23:55:25 wessels Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index 73addfa28c..ce8b967ecc 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.64 2005/11/06 01:11:40 hno Exp $ +# $Id: Makefile.in,v 1.65 2005/11/21 23:55:25 wessels Exp $ # srcdir = @srcdir@ @@ -229,6 +229,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in index 7b3a67621d..17b1a2a327 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.58 2005/11/06 01:11:40 hno Exp $ +# $Id: Makefile.in,v 1.59 2005/11/21 23:55:26 wessels Exp $ # srcdir = @srcdir@ @@ -222,6 +222,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in index 0661626e02..8c2c654082 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.53 2005/11/06 01:11:41 hno Exp $ +# $Id: Makefile.in,v 1.54 2005/11/21 23:55:26 wessels Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -293,6 +293,8 @@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@ USE_ESI_FALSE = @USE_ESI_FALSE@ USE_ESI_TRUE = @USE_ESI_TRUE@ +USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@ +USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ -- 2.47.3