From: robertc <>
Date: Tue, 21 Dec 2004 00:20:29 +0000 (+0000)
Subject: fixup bootstrapping
X-Git-Tag: SQUID_3_0_PRE4~977
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd6d8fb737d8cb3dbf967188c9a599edcc9e706c;p=thirdparty%2Fsquid.git

fixup bootstrapping
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 95d6d1527c..e914c2bc03 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -67,7 +67,7 @@ for dir in \
 	lib/libTrie \
 	lib/cppunit-1.10.0
 do
-    if [ -z "$dir" ] || [ -d $dir ] && [ ! -f $dir/configure ]; then
+    if [ -z "$dir" ] || [ -d $dir ]; then
 	if (
 	echo "Bootstrapping $dir"
 	cd ./$dir
@@ -81,7 +81,7 @@ do
 		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 --automake
+	    bootstrap libtoolize --force --copy --automake
 	    bootstrap automake$amver --foreign --add-missing
 	    bootstrap autoconf$acver
 	fi ); then
diff --git a/lib/cppunit-1.10.0/bootstrap.sh b/lib/cppunit-1.10.0/bootstrap.sh
index 1f33ea837a..221fc02e1f 100755
--- a/lib/cppunit-1.10.0/bootstrap.sh
+++ b/lib/cppunit-1.10.0/bootstrap.sh
@@ -7,8 +7,8 @@
 # Autotool versions preferred. To override either edit the script
 # to match the versions you want to use, or set the variables on
 # the command line like "env acver=.. amver=... ./bootstrap.sh"
-acversions="${acver:-2.57 2.53 2.52}"
-amversions="${amver:-1.7 1.6 1.5}"
+acversions="${acver:-2.59 2.57 2.53 2.52}"
+amversions="${amver:-1.9 1.7 1.6 1.5}"
 
 check_version()
 {