Bootstrapped

diff --git a/Makefile.in b/Makefile.in
index 181aa3d5366ed052b416b5695c456b33b89c2873..4888cd94e62e68eafc287a383bf5834b294337f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.76 2005/08/22 00:10:51 hno Exp $
+# $Id: Makefile.in,v 1.77 2005/10/17 00:10:51 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -93,6 +93,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/configure b/configure
index 0055d73ee99dd3acbb8fee18dd1546d2da9af1d5..abd993fbc8e7554d8bd2bc37ac9c043dd08ded8f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.386 .
+# From configure.in Revision: 1.387 .
 # 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 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 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 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 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.
@@ -20802,6 +20802,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
 cat >>confdefs.h <<_ACEOF
 #define CACHE_ICP_PORT $CACHE_ICP_PORT
 _ACEOF
@@ -37159,6 +37160,8 @@ s,@CGIEXT@,$CGIEXT,;t t
 s,@ENABLE_WIN32SPECIFIC_TRUE@,$ENABLE_WIN32SPECIFIC_TRUE,;t t
 s,@ENABLE_WIN32SPECIFIC_FALSE@,$ENABLE_WIN32SPECIFIC_FALSE,;t t
 s,@WIN32_PSAPI@,$WIN32_PSAPI,;t t
+s,@CACHE_HTTP_PORT@,$CACHE_HTTP_PORT,;t t
+s,@CACHE_ICP_PORT@,$CACHE_ICP_PORT,;t t
 s,@SQUID_CFLAGS@,$SQUID_CFLAGS,;t t
 s,@SQUID_CXXFLAGS@,$SQUID_CXXFLAGS,;t t
 s,@LIBDLMALLOC@,$LIBDLMALLOC,;t t

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index c087d1524ef7d9ab048ccd26b2b09ff07cd20df9..31c664157731cc883b4d3bc8ba3549c2d00f555c 100644 (file)
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -69,6 +69,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 833c9830aff11c8d603f5f8787600dedc8e63a8f..e2ae09bb1ed02b3eec2fe26bb84103c6a403e9ff 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.51 2005/08/16 00:11:09 hno Exp $
+#  $Id: Makefile.in,v 1.52 2005/10/17 00:10:52 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -76,6 +76,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/errors/Makefile.in b/errors/Makefile.in
index e65a8fa37302762c09a001fd73991447a5c71c2c..073496a871c88abaafe6ee1c65d759b1815e64cc 100644 (file)
--- a/errors/Makefile.in
+++ b/errors/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.67 2005/09/14 00:10:54 hno Exp $
+# $Id: Makefile.in,v 1.68 2005/10/17 00:10:53 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -68,6 +68,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/Makefile.in b/helpers/Makefile.in
index 9f054a4eff9c871077ffd1a2946f4999ebfe570e..c2a580ce7ac941d2cb80001b9593fb26879c6eb5 100644 (file)
--- a/helpers/Makefile.in
+++ b/helpers/Makefile.in
@@ -73,6 +73,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in
index ee484bd0555add61ec73d9c309e197b7a67c3817..8d67bf726e8dfac8d2dbc0578adc6d469cbecb30 100644 (file)
--- 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.58 2005/08/16 00:11:13 hno Exp $
+#  $Id: Makefile.in,v 1.59 2005/10/17 00:10:53 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -99,6 +99,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in
index 3cc531f75a0296e3ea58008cf79a38609c27742c..09c0faa6803dc16ea9d4ece075faa756f86108cb 100644 (file)
--- 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.61 2005/08/16 00:11:13 hno Exp $
+#  $Id: Makefile.in,v 1.62 2005/10/17 00:10:54 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -108,6 +108,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in
index 9271d0a5d455dd9f251d0c36746e5f37925db093..7ad5721d7015415a2211c4e01436be9bfd2e777c 100644 (file)
--- 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.56 2005/08/16 00:11:12 hno Exp $
+#  $Id: Makefile.in,v 1.57 2005/10/17 00:10:53 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -77,6 +77,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in
index 5341620821c82961bb17ad0b96bc7584227ae62a..06d61f5ba4ab87567909112c919cd408f21e1adc 100644 (file)
--- 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.58 2005/08/16 00:11:14 hno Exp $
+#  $Id: Makefile.in,v 1.59 2005/10/17 00:10:54 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -96,6 +96,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in
index 907a16fa97db6e04f48063d73912346b53b87fe7..56d6133269071bd0c77741b2364bb6a02fd9d95a 100644 (file)
--- 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.59 2005/08/16 00:11:14 hno Exp $
+#  $Id: Makefile.in,v 1.60 2005/10/17 00:10:54 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -98,6 +98,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in
index 83f9a184adcc13d2c5e26aaff13ec067ff661e36..28af740f8222adb4d4c1d60ef87c4ff72c345c1e 100644 (file)
--- 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.55 2005/08/16 00:11:14 hno Exp $
+#  $Id: Makefile.in,v 1.56 2005/10/17 00:10:54 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -95,6 +95,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in
index 75f2e22853b9ca33c20e8870a289a19e840ddec1..de2643d39b363566802f558eba91ac6e7dda3b1f 100644 (file)
--- 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.57 2005/08/16 00:11:17 hno Exp $
+#  $Id: Makefile.in,v 1.58 2005/10/17 00:10:55 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -104,6 +104,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in
index 9510b9ebed606f64223508a3fd075dfc96a9d194..e64a7e81d93c191ce442c3816347052fcdd633f1 100644 (file)
--- 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.58 2005/08/16 00:11:18 hno Exp $
+#  $Id: Makefile.in,v 1.59 2005/10/17 00:10:55 hno Exp $
 #
 #
 
@@ -94,6 +94,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in
index a2cb1552dfea0b7206d8771d736ceee08ccb133b..5efe2e4780f3e0bf65d86c97c0c6e4c94612bfcf 100644 (file)
--- 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.56 2005/08/16 00:11:18 hno Exp $
+#  $Id: Makefile.in,v 1.57 2005/10/17 00:10:55 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -96,6 +96,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in
index d1ea134fde7e14aa8ce29a2d13e915b3c321796b..61e4ffe0eae1b9e9b5f0a757befe48561da4b7b5 100644 (file)
--- 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.54 2005/08/16 00:11:19 hno Exp $
+#  $Id: Makefile.in,v 1.55 2005/10/17 00:11:09 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -76,6 +76,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in
index 4d9daa7b4d9fcbacaa8ff199e1de90c0177c686a..9c142347ea471d775dba3b660395b805d1b4932a 100644 (file)
--- 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.53 2005/08/16 00:11:19 hno Exp $
+#  $Id: Makefile.in,v 1.54 2005/10/17 00:11:09 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -77,6 +77,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in
index ff5f361beb168bf1ca8079d8e0ed2cd451503713..0f91ab9dbaf84001148eb975028c844f052f575d 100644 (file)
--- 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.57 2005/08/16 00:11:20 hno Exp $
+#  $Id: Makefile.in,v 1.58 2005/10/17 00:11:09 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -98,6 +98,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in
index 77c99dd791c58ca4e6f161b7f3b65726e60b1ad1..b85f375667e48641a58878ab1978b041e09f238c 100644 (file)
--- 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.43 2005/08/16 00:11:20 hno Exp $
+#  $Id: Makefile.in,v 1.44 2005/10/17 00:11:20 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -77,6 +77,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in
index 7ddba356af666ccc227c14a909b8d763c0afc685..921741a9be5126780987859670d9076ec8760704 100644 (file)
--- 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.44 2005/08/16 00:11:21 hno Exp $
+#  $Id: Makefile.in,v 1.45 2005/10/17 00:11:20 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -95,6 +95,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in
index c28268143df2d27b2053b6d03e44576716969b87..cfed8cd2dfcd22b4f0eaec146255d0c756d0c19e 100644 (file)
--- 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.46 2005/08/16 00:11:21 hno Exp $
+#  $Id: Makefile.in,v 1.47 2005/10/17 00:11:26 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -100,6 +100,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in
index 50f5822649dac31023f1293da685a3a5aa500f19..64f372425f70fb01ce1adc066469273125c4a0a7 100644 (file)
--- 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.44 2005/08/16 00:11:23 hno Exp $
+#  $Id: Makefile.in,v 1.45 2005/10/17 00:11:26 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -97,6 +97,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in
index e911227d6904c1eb57b537770365e9d8a7f3dd88..6662a51983b5eec2a7702ee7f9cd81c7b96ab572 100644 (file)
--- 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.42 2005/08/16 00:11:24 hno Exp $
+#  $Id: Makefile.in,v 1.43 2005/10/17 00:11:27 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -76,6 +76,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in
index d5425b5c4871fb8bbe7989ae4060901f2005b9df..cd96945b364c4607cc116522a0b9362d07fc9377 100644 (file)
--- 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.56 2005/08/16 00:11:25 hno Exp $
+#  $Id: Makefile.in,v 1.57 2005/10/17 00:11:27 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -77,6 +77,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in
index 37daa3cff4caecbdd2b289a11b404451ab371b80..28ebd2a20d1387ad8125dbdb180d980ef4063cab 100644 (file)
--- 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.56 2005/08/16 00:11:25 hno Exp $
+#  $Id: Makefile.in,v 1.57 2005/10/17 00:11:28 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -101,6 +101,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in
index 5e4860c7cd653b2d812b2e7932e8f6e1c7973807..b583c4527bc5d78318c0f01b0c409417d719d9dd 100644 (file)
--- a/helpers/ntlm_auth/SMB/smbval/Makefile.in
+++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in
@@ -89,6 +89,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in
index 0666230423aaff1aae81f18e2fa2f023eb364b76..b80205cdb75f76cbc667778526b566551a52c9ac 100644 (file)
--- 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.53 2005/08/16 00:11:26 hno Exp $
+#  $Id: Makefile.in,v 1.54 2005/10/17 00:11:28 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -96,6 +96,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in
index afe6a50325b3b269f5b0cce009ef11949e9eb0a0..529c83aecf25a7ceb4a66aef569300e35dc02e45 100644 (file)
--- 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.55 2005/08/16 00:11:26 hno Exp $
+#  $Id: Makefile.in,v 1.56 2005/10/17 00:11:29 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -76,6 +76,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/icons/Makefile.in b/icons/Makefile.in
index c95f142b008729d6d61b5f1a5da5d4c9a0644444..157afea4be135a87bba71d7cdeedec6492a50613 100644 (file)
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.69 2005/08/16 00:11:26 hno Exp $
+# $Id: Makefile.in,v 1.70 2005/10/17 00:11:30 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -77,6 +77,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1922e017dce04275ff8733a007e5debb66c34a6e..4868d021988424c3532be8d284fe95b46177af50 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-#  $Id: Makefile.in,v 1.107 2005/08/16 00:11:26 hno Exp $
+#  $Id: Makefile.in,v 1.108 2005/10/17 00:11:30 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -142,6 +142,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 041d7fdd60f4f664cfe331703d03d0a211393688..910dccf7b802ad0230104eca92c975d6323eda4f 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -74,6 +74,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in
index 762fbdd618f2cac5fc712b9170c6af89831d0855..4bcf13d9677d62e02a544b99c0d3e1f10a299e70 100644 (file)
--- a/snmplib/Makefile.in
+++ b/snmplib/Makefile.in
@@ -87,6 +87,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/src/Makefile.in b/src/Makefile.in
index 92b6448ffe6bb3c5f5cd7522dbad3a685df50980..1e9f7275f418a87d54b99fdc926835a0656e7f5a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.348 2005/09/26 00:10:46 hno Exp $
+#  $Id: Makefile.in,v 1.349 2005/10/17 00:11:34 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -570,6 +570,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -1459,6 +1461,8 @@ libDiskThreads_a_SOURCES = \
 
 DiskIO_DiskDaemon_diskd_SOURCES = DiskIO/DiskDaemon/diskd.cc 
 DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
+DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
+DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
 DEFAULT_PREFIX = $(prefix)
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
@@ -2902,6 +2906,8 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
 
 cf.data: cf.data.pre Makefile
        sed "\
+       s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
+       s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
        s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
        s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
        s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 059e5a428e24ca3d2dfa8dbcb2f5835c013cb280..1ed3c0fc18649dd060a47ca9a781bcb32577eb01 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -103,6 +103,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -272,7 +274,7 @@ target_alias = @target_alias@
 
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.55 2005/08/21 00:10:40 hno Exp $
+#  $Id: Makefile.in,v 1.56 2005/10/17 00:11:35 hno Exp $
 #
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@

diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in
index ae8ab6472a0930a432a7fa64b9eeebd434399825..bc19bdf50a7a66fefeea9e80cb549fa2332ca7ac 100644 (file)
--- 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.61 2005/08/21 00:10:40 hno Exp $
+#  $Id: Makefile.in,v 1.62 2005/10/17 00:11:35 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -110,6 +110,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in
index a40963c9818a2b047b7f5db3caa76830fd6fde4c..f23eb6fe87f6bafe296fc87014f0f1fb795cd7bc 100644 (file)
--- 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.55 2005/08/21 00:10:40 hno Exp $
+#  $Id: Makefile.in,v 1.56 2005/10/17 00:11:35 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -103,6 +103,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@

diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in
index d1833ea3b878c300f565d6acf5bb4d4539f17617..a9b9ad8daa3b388e162429562d139791439ac4ff 100644 (file)
--- 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.50 2005/08/16 00:11:54 hno Exp $
+#  $Id: Makefile.in,v 1.51 2005/10/17 00:11:36 hno Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -174,6 +174,8 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@