Fix bootstrap script again, and include lib/cppunit-1.10.0 in the

bootstrapping process if needed

diff --git a/bootstrap.sh b/bootstrap.sh
index e8114d347f5e97158314cfafbdc4543e9068308a..9924d74650584a980587aa87ea41fff0e5bf46ff 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -65,8 +65,9 @@ AUTOCONF="autoconf${acver}" ; export AUTOCONF
 for dir in \
        "" \
        lib/libTrie
+       lib/cppunit-1.10.0
 do
-    if (
+    if [ -z "$dir" ] || [ -d $dir ] && [ ! -f $dir/configure ]; then
        echo "Bootstrapping $dir"
        cd ./$dir
        # Bootstrap the autotool subsystems
@@ -86,9 +87,3 @@ do
 done
 
 echo "Autotool bootstrapping complete."
-
-#echo "bootstrapping sub projects."
-if [ -d lib/libTrie ] && [ ! -f lib/libTrie/configure ]; then
-       cd lib/libTrie && ./bootstrap.sh
-fi
-