Resurrected the autotool version checks

diff --git a/bootstrap.sh b/bootstrap.sh
index cc6d9c27ddc39ba539dd3b207a897f71a96a204f..62ffde511a6c2d09ce0a37bf8e8c0f65e0f9167e 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,9 +4,11 @@
 # configure has not been run, or if a Makefile.am in a non-configured directory
 # has been updated
 
-# Autotool versions required
-acver=""
-amver=""
+# Autotool versions required. 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"
+acver="${acver:-2.53}"
+amver="${amver:-1.5}"
 
 bootstrap() {
   if "$@"; then
@@ -23,14 +25,14 @@ bootstrap() {
 mkdir -p cfgaux
 
 # Adjust paths of required autool packages
-#if autoconf --version | grep -q $acver; then
-#  acver=""
-#fi
-#if automake --version | grep -q $amver; then
-#  amver=""
-#fi
+if autoconf --version | grep -q "$acver"; then
+  acver=""
+fi
+if automake --version | grep -q "$amver"; then
+  amver=""
+fi
 acver=`echo $acver | sed -e 's/\.//'`
-#amver=`echo $amver | sed -e 's/\.//'`
+amver=`echo $amver | sed -e 's/\.//'`
 
 # Bootstrap the autotool subsystems
 bootstrap aclocal$amver