Autoconf and bootstrap cleanups from hno

diff --git a/bootstrap.sh b/bootstrap.sh
index e914c2bc03707699f5c5d8df5d132d2ce97bbd65..0c4691cee6eb706029a108b0b68b84ca4b356c0b 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -51,9 +51,6 @@ bootstrap() {
   fi
 }
 
-# Make sure cfgaux exists
-mkdir -p cfgaux
-
 # Adjust paths of required autool packages
 amver=`find_version automake ${amversions}`
 acver=`find_version autoconf ${acversions}`
@@ -74,12 +71,11 @@ do
        if [ -n "$dir" ] && [ -f bootstrap.sh ]; then
            ./bootstrap.sh
        else
+           # Make sure cfgaux exists
+           mkdir -p cfgaux
+
            # Bootstrap the autotool subsystems
            bootstrap aclocal$amver
-           #workaround for Automake 1.5
-           if grep m4_regex aclocal.m4 >/dev/null; then
-               perl -i.bak -p -e 's/m4_patsubst/m4_bpatsubst/g; s/m4_regexp/m4_bregexp/g;' aclocal.m4
-           fi
            bootstrap autoheader$acver
            bootstrap libtoolize --force --copy --automake
            bootstrap automake$amver --foreign --add-missing

diff --git a/lib/cppunit-1.10.0/bootstrap.sh b/lib/cppunit-1.10.0/bootstrap.sh
index 221fc02e1fb62c1b0db0955af7f8f62708bf9679..55c38d22a371d7abd8858962275a2e551c185f7e 100755 (executable)
--- a/lib/cppunit-1.10.0/bootstrap.sh
+++ b/lib/cppunit-1.10.0/bootstrap.sh
@@ -51,9 +51,6 @@ bootstrap() {
   fi
 }
 
-# Make sure cfgaux exists
-mkdir -p cfgaux
-
 # Adjust paths of required autool packages
 amver=`find_version automake ${amversions}`
 acver=`find_version autoconf ${acversions}`
@@ -69,6 +66,6 @@ if grep m4_regex aclocal.m4 >/dev/null; then
     perl -i.bak -p -e 's/m4_patsubst/m4_bpatsubst/g; s/m4_regexp/m4_bregexp/g;' aclocal.m4
 fi
 bootstrap autoheader$acver
-#bootstrap libtoolize --automake
+bootstrap libtoolize --automake --force --copy
 bootstrap automake$amver --add-missing
 bootstrap autoconf$acver

diff --git a/lib/libTrie/configure.in b/lib/libTrie/configure.in
index 11ea7176bdf8d7e877b37d17761fe7f5a8ccb62a..7861a54a14f1cb20be62b307dafe832efc7e7004 100644 (file)
--- a/lib/libTrie/configure.in
+++ b/lib/libTrie/configure.in
@@ -2,6 +2,7 @@
 AC_INIT(libTrie, 0.1, rbtcollins@squid-cache.org)
 AC_CONFIG_SRCDIR([src/Trie.cc])
 AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(cfgaux)
 
 SquidInline="yes"
 AC_ARG_ENABLE(inline,

diff --git a/src/tunnel.cc b/src/tunnel.cc
index ecb3019c171b51ad3120c05c507c6e579d561bc1..be1c1e43adebed718d2d325d3c98aff3542e6f2a 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.147 2004/12/20 20:15:27 hno Exp $
+ * $Id: tunnel.cc,v 1.148 2004/12/21 14:55:21 robertc Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels