From 83c44f937c995ac8503a250ac65f52a0d476d3ec Mon Sep 17 00:00:00 2001
From: robertc <>
Date: Tue, 21 Dec 2004 21:55:20 +0000
Subject: [PATCH] Autoconf and bootstrap cleanups from hno

---
 bootstrap.sh                    | 10 +++-------
 lib/cppunit-1.10.0/bootstrap.sh |  5 +----
 lib/libTrie/configure.in        |  1 +
 src/tunnel.cc                   |  2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index e914c2bc03..0c4691cee6 100755
--- 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 221fc02e1f..55c38d22a3 100755
--- 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 11ea7176bd..7861a54a14 100644
--- 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 ecb3019c17..be1c1e43ad 100644
--- 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
-- 
2.47.3