X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fautogen.sh;h=52245ef464724e82d621f160adb31f94ec860b33;hb=36079063504b59027cdd84e36a1fc9e2bfc4fc76;hp=5048ce8b21290207478ee55f613320253a6cbaca;hpb=f72ce2054b73324ccc4f5c09640b044ce130988e;p=lilypond.git

diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh
index 5048ce8b21..52245ef464 100755
--- a/stepmake/autogen.sh
+++ b/stepmake/autogen.sh
@@ -2,14 +2,25 @@
 # 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
+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
@@ -26,7 +37,7 @@ do
   (
       cd $dr
       echo "Running autoconf ..."
-      autoconf
+      $autoconf
   )
 done