X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=4cc98ffdf74c0916988e4b13f8d33c5c52ade96e;hb=38655bc28e73a0b218ba1582bdb84bab0fdfec4b;hp=99c803624014337eb1c75b7a3af2986c2427fb01;hpb=ee27cb933b5794e5c8ae96d86237d3dae56690e8;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index 99c8036240..4cc98ffdf7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,12 +5,25 @@
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`
-DIE=0
 
-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.13
+# Some setups have both autoconf 2.13 and 2.50 available through
+# a wrapper script: /usr/bin/autoconf.
+# This wrapper may incorrectly autoselect autoconf 2.50, but it
+# advertises itself as autoconf 2.13.
+# If you have such a setup, invoke this script as:
+#   autoconf=autoconf2.13 ./autogen.sh
+for i in autoconf autoconf2.13 false; do
+  version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
+  if test "0$version" -eq 213; then
+    autoconf=$i
+    break
+  fi
+done
+
+if test -z "$autoconf"; then
+    echo "ERROR: Please install autoconf 2.13"
+    exit 1
 fi
 
 if test -z "$*"; then
@@ -27,7 +40,7 @@ do
   (
       cd $dr
       echo "Running autoconf ..."
-      autoconf
+      $autoconf
   )
 done