Unified the bootstrap.sh scripts to make sure there is no mismatches

in autotool versions between the main sources and libTrie. As it was
the version used in libTrie was very old and failed to find compatible
versions if not the system default..

diff --git a/bootstrap.sh b/bootstrap.sh
index 2643c4352cd4b24cac3bd00155ac8bab73388d17..a6ae18dbd73a1eea3ae62b06982f0e0cfa994289 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -58,17 +58,29 @@ mkdir -p cfgaux
 amver=`find_version automake ${amversions}`
 acver=`find_version autoconf ${acversions}`
 
-# 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 automake$amver --foreign --add-missing
-bootstrap autoconf$acver
+for dir in \
+       "" \
+       lib/libTrie
+do
+    if (
+       echo "Bootstrapping $dir"
+       cd ./$dir
+       # 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 automake$amver --foreign --add-missing
+       bootstrap autoconf$acver ); then
+           : # OK
+       else
+           exit 1
+       fi
+done
 
 echo "Autotool bootstrapping complete."
-echo "bootstrapping sub projects."
-cd lib/libTrie && ./bootstrap.sh
+#echo "bootstrapping sub projects."
+#cd lib/libTrie && ./bootstrap.sh
 

diff --git a/lib/libTrie/bootstrap.sh b/lib/libTrie/bootstrap.sh
deleted file mode 100755 (executable)
index c7d904c..0000000
--- a/lib/libTrie/bootstrap.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Used to setup the configure.in, autoheader and Makefile.in's if configure
-# has not been generated. This script is only needed for developers when
-# configure has not been run, or if a Makefile.am in a non-configured directory
-# has been updated
-
-
-bootstrap() {
-  if "$@"; then
-    true # Everything OK
-  else
-    echo "$1 failed"
-    echo "Autotool bootstrapping failed. You will need to investigate and correct" ;
-    echo "before you can develop on this source tree" 
-    exit 1
-  fi
-}
-
-# Make sure cfgaux exists
-mkdir -p cfgaux
-
-echo "Bootstrapping libTrie."
-# Bootstrap the autotool subsystems
-bootstrap aclocal
-bootstrap autoheader
-#bootstrap libtoolize --automake 
-bootstrap automake --add-missing
-bootstrap autoconf
-
-echo "Autotool bootstrapping complete."