Fixes for autoconf-refactor bugs.

Thanks to Andrew Beverley for spotting some of them.

diff --git a/configure.in b/configure.in
index 32bb9f82d5812996a2ab4c50fce39835b7b18003..591c7f7a73814009f9b9a41a5c8d0ab90a0116b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -293,7 +293,6 @@ fi
 SQUID_CXXFLAGS="$SQUID_CXXFLAGS $squid_cv_cc_arg_pipe"
 SQUID_CFLAGS="$SQUID_CFLAGS $squid_cv_cc_arg_pipe"
 
-enable_inline="yes"
 AC_ARG_ENABLE(optimizations,
   AS_HELP_STRING([--disable-optimizations],
                  [Do not compile Squid with compiler optimizations enabled.
@@ -325,7 +324,7 @@ AC_ARG_ENABLE(inline,
 SQUID_YESNO([$enableval],
   [Unrecognized argument to --disable-inline: $enableval])
 ])
-AC_MSG_NOTICE([inlining optimizations enabled: $enable_inline])
+AC_MSG_NOTICE([inlining optimizations enabled: ${enable_inline:=yes}])
 SQUID_DEFINE_BOOL(_USE_INLINE_,$enable_inline,
   [Include inline methods into header file])
 # to be used by sub-commands
@@ -1341,7 +1340,7 @@ else
   CXXFLAGS="`getconf ${buildmodel}_CFLAGS` $CXXFLAGS"
   LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
   LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
-  if "$squid_host_os" = "solaris" ; then
+  if test "x$squid_host_os" = "xsolaris" ; then
 
 # On Solaris getconf returns for CFLAGS -xarch=generic64, -Xa and -Usun options, and
 # for LDFLAGS -xarch=generic64, but:

diff --git a/src/Makefile.am b/src/Makefile.am
index a1956c758ef6cbf60923b851b78ff0c75c77d721..36bba933f4924df96d14b629fc0005209d4f51e8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -726,8 +726,8 @@ nodist_DiskIO_DiskDaemon_diskd_SOURCES = time.cc
 DiskIO_DiskDaemon_diskd_LDADD = $(COMPAT_LIB) $(XTRA_LIBS)
 
 
-DEFAULT_HTTP_PORT      = $(CACHE_HTTP_PORT)
-DEFAULT_ICP_PORT       = $(CACHE_ICP_PORT)
+DEFAULT_HTTP_PORT      = 3128
+DEFAULT_ICP_PORT       = 3130
 DEFAULT_PREFIX         = $(prefix)
 DEFAULT_CONFIG_DIR     = $(sysconfdir)
 DEFAULT_CONFIG_FILE     = $(DEFAULT_CONFIG_DIR)/squid.conf