X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=a9b37f531f6bbcdbb24959724c60ff5c3f377762;hb=d342461725b41f73f2d742addcf958bda9bc58fc;hp=0b9241673a999cdbdda5009a06f45545ad55cc57;hpb=762ca4af538f1d566e396a1b52e84a6bc6b919f3;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index 0b9241673a..a9b37f531f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,14 +5,31 @@
 # 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
+if [ stepmake/autogen.sh -nt autogen.sh ]; then
+    echo "stepmake/autogen.sh is newer. Copying file." 
+    cp -f stepmake/autogen.sh autogen.sh
+    exec ./autogen.sh
+fi
+
+# 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-2.13 autoconf2.13 autoconf  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
@@ -29,7 +46,7 @@ do
   (
       cd $dr
       echo "Running autoconf ..."
-      autoconf
+      $autoconf
   )
 done