Bug #1403: Defining CACHE_HTTP_PORT does not set the default http_port

Forward port of 2.5 patch.

diff --git a/configure.in b/configure.in
index 8594aa4e48fd9c918da77cab2b22bfeb46305979..14603031cdfd5bfb780c0f271d36c38e09a82c0d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.386 2005/09/12 14:20:02 serassio Exp $
+dnl  $Id: configure.in,v 1.387 2005/10/16 19:57:40 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.386 $)dnl
+AC_REVISION($Revision: 1.387 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -88,7 +88,9 @@ fi
 dnl Substitutions
 AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT,
 [What default TCP port to use for HTTP listening?])
+AC_SUBST(CACHE_HTTP_PORT)
 AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT,
+AC_SUBST(CACHE_ICP_PORT)
 [What default UDP port to use for ICP listening?])
 
 AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host",[Host type from configure])

diff --git a/src/Makefile.am b/src/Makefile.am
index 8bb8438634a17593e169c3da562660a7edc203bf..7cfff8eac678742732e0029f8ccf81c228982c3a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.111 2005/09/25 20:58:23 hno Exp $
+#  $Id: Makefile.am,v 1.112 2005/10/16 19:57:40 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -826,6 +826,8 @@ 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
@@ -880,6 +882,8 @@ cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
 ## depend on the Makefile. 
 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/cf.data.pre b/src/cf.data.pre
index dcaadc5005b16bb408539e99b088fa982e012421..fa6c35f1802999b316e728da6d97668875c1a442 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.399 2005/09/27 15:16:13 wessels Exp $
+# $Id: cf.data.pre,v 1.400 2005/10/16 19:57:41 serassio Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -121,7 +121,7 @@ DOC_START
        visible on the internal address.
 NOCOMMENT_START
 # Squid normally listens to port 3128
-http_port 3128
+http_port @DEFAULT_HTTP_PORT@
 NOCOMMENT_END
 DOC_END
 
@@ -345,7 +345,7 @@ DOC_START
        and from neighbor caches.  The standard UDP port for ICP is 3130.
        Default is disabled (0).
 NOCOMMENT_START
-icp_port 3130
+icp_port @DEFAULT_ICP_PORT@
 NOCOMMENT_END
 DOC_END