And fix libtool bootsatrapping of cppunit as well

diff --git a/lib/cppunit-1.10.0/bootstrap.sh b/lib/cppunit-1.10.0/bootstrap.sh
index 956977e59efbe80b718f77aab27440a066c8c79c..cbe25cc7a4646dde83686b7a495d96f321c8ea3b 100755 (executable)
--- a/lib/cppunit-1.10.0/bootstrap.sh
+++ b/lib/cppunit-1.10.0/bootstrap.sh
@@ -9,6 +9,7 @@
 # the command line like "env acver=.. amver=... ./bootstrap.sh"
 acversions="${acver:-2.59 2.57 2.53 2.52}"
 amversions="${amver:-1.9 1.7 1.6 1.5}"
+ltversions="${ltver:-1.5 1.4}"
 
 check_version()
 {
@@ -54,6 +55,7 @@ bootstrap() {
 # Adjust paths of required autool packages
 amver=`find_version automake ${amversions}`
 acver=`find_version autoconf ${acversions}`
+ltver=`find_version libtool ${ltversions}`
 
 # Set environment variable to tell automake which autoconf to use.
 AUTOCONF="autoconf${acver}" ; export AUTOCONF
@@ -66,6 +68,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 --force --copy
+bootstrap libtoolize$ltver --automake --force --copy
 bootstrap automake$amver --add-missing -f --copy
 bootstrap autoconf$acver