* GNUmakefile.in (short-examples):

(long-examples): Bugfix for --srcdir build.

* stepmake/bin/config.sub:
* stepmake/bin/config.guess: Update from latest autotools.

* aclocal.m4:
* autogen.sh: Regenerate.

* configure.in:
* stepmake/configure.in:
* stepmake/aclocal.m4: Run autoupdate.  Creating ./configure now
requires autoconf >= 2.50.

* stepmake/autogen.sh: Check for autoconf >= 2.50.

1 files changed, 20 insertions, 8 deletions

diff --git a/autogen.sh b/autogen.sh
index 0b9241673a..20119e8831 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,14 +5,26 @@
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`
-DIE=0
 
-# autoconf > 2.50 is not very common yet,
-# and disappointingly incompatible with the widely available 2.13
-version=`autoconf --version 2>/dev/null | awk '{print $3}'`
-if test "$version" != "2.13"; then
-  echo "ERROR: Please install autoconf 2.13"
-  exit 1
+# Be paranoid: check for autoconf >= 2.50
+# Some setups have both autoconf 2.13 and 2.50 available through
+# a wrapper script: /usr/bin/autoconf.
+# This wrapper may correctly autoselect autoconf 2.50, but it
+# advertises itself as autoconf 2.13.
+# If you have such a setup, invoke this script as:
+#   autoconf=autoconf ./autogen.sh
+set -x
+for i in in autoconf autoconf2.50 false; do
+  version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
+  if test "0$version" -ge 250; then
+    autoconf=$i
+    break
+  fi
+done
+
+if test -z "$autoconf"; then
+    echo "ERROR: Please install autoconf 2.50 or newer"
+    exit 1
 fi
 
 if test -z "$*"; then
@@ -29,7 +41,7 @@ do
   (
       cd $dr
       echo "Running autoconf ..."
-      autoconf
+      $autoconf
   )
 done