Support hierarchy of bootstrap scripts again..

diff --git a/bootstrap.sh b/bootstrap.sh
index 00a0556c9346eacbce7e8777977784adc4c50d3b..fb3f8ad4163c794bba7c1599af8b1f8484941e0b 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -71,16 +71,20 @@ 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 libtoolize --automake
-       bootstrap automake$amver --foreign --add-missing
-       bootstrap autoconf$acver); then
+       if [ -f bootstrap.sh ]; then
+           ./bootstrap.sh
+       else
+           # 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 libtoolize --automake
+           bootstrap automake$amver --foreign --add-missing
+           bootstrap autoconf$acver
+       fi ); then
            : # OK
        else
            exit 1

diff --git a/lib/cppunit-1.10.0/bootstrap.sh b/lib/cppunit-1.10.0/bootstrap.sh
new file mode 100755 (executable)
index 0000000..1f33ea8
--- /dev/null
+++ b/lib/cppunit-1.10.0/bootstrap.sh
@@ -0,0 +1,74 @@
+#!/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
+
+# 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}"
+
+check_version()
+{
+  eval $2 --version 2>/dev/null | grep -i "$1.*$3" >/dev/null
+}
+
+find_version()
+{
+  tool=$1
+  found="NOT_FOUND"
+  shift
+  versions="$*"
+  for version in $versions; do
+    for variant in "" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do
+      if check_version $tool ${tool}${variant} $version; then
+       found="${variant}"
+       break
+      fi
+    done
+    if [ "x$found" != "xNOT_FOUND" ]; then
+      break
+    fi
+  done
+  if [ "x$found" = "xNOT_FOUND" ]; then
+    echo "WARNING: Cannot find $tool version $versions" >&2
+    echo "Trying `$tool --version | head -1`" >&2
+    found=""
+  fi
+  echo $found
+}
+
+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" 
+    sleep 10
+  fi
+}
+
+# Make sure cfgaux exists
+mkdir -p cfgaux
+
+# Adjust paths of required autool packages
+amver=`find_version automake ${amversions}`
+acver=`find_version autoconf ${acversions}`
+
+# Set environment variable to tell automake which autoconf to use.
+AUTOCONF="autoconf${acver}" ; export AUTOCONF
+
+
+# Bootstrap the autotool subsystems
+bootstrap aclocal$amver -I config
+#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 libtoolize --automake
+bootstrap automake$amver --add-missing
+bootstrap autoconf$acver