Ported the autotools version checks from 2.5, both to allow bootstrapping

until the code is updated, and to allow easier use by developers who
may have other default versions.

diff --git a/bootstrap.sh b/bootstrap.sh
index 979a9650f2e24c2b7cf64f82753e08d041531a6d..e9020266fdb9289f2ed2b0d95eb9200ee704e8e8 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,9 +1,12 @@
-#! /bin/sh
+#!/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 required
+acver="2.13"
+amver="1.5"
 
 bootstrap() {
   if "$@"; then
@@ -19,10 +22,20 @@ bootstrap() {
 # Make sure cfgaux exists
 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
+acver=`echo $acver | sed -e 's/\.//'`
+amver=`echo $amver | sed -e 's/\.//'`
+
 # Bootstrap the autotool subsystems
-bootstrap aclocal
-bootstrap autoheader
-bootstrap automake --foreign --add-missing
-bootstrap autoconf
+bootstrap aclocal$amver
+bootstrap autoheader$acver
+bootstrap automake$amver --foreign --add-missing
+bootstrap autoconf$acver
 
 echo "Autotool bootstrapping complete."