fixup bootstrapping

diff --git a/bootstrap.sh b/bootstrap.sh
index 95d6d1527c7d16496f0ad74a8f42ae51b0d919d7..e914c2bc03707699f5c5d8df5d132d2ce97bbd65 100755 (executable)
--- 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 1f33ea837ac398e52cd315d890fe4b6959264724..221fc02e1fb62c1b0db0955af7f8f62708bf9679 100755 (executable)
--- 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()
 {