X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=bc99b2d1afcb7715290a3ced31dc642e0cfebaa5;hb=2246ad52dd3535de56cf07ea5dbc7c51ad8cfc68;hp=e3ee7da81dc8fb8d90715a11a5858d0a6945eaf2;hpb=71cc3b4a5adf79c361d2af39f1a361a36a03f273;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index e3ee7da81d..bc99b2d1af 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,29 +3,35 @@
 
 srcdir=`dirname $0`
 
-if [ stepmake/autogen.sh -nt autogen.sh ]; then
+
+if [ ! -f aclocal.m4 -o stepmake/aclocal.m4 -nt aclocal.m4 ]; then
+    echo "stepmake/aclocal.m4 is newer. Copying file." 
+    cp -f stepmake/aclocal.m4 aclocal.m4
+fi
+
+if [ ! -f autogen.sh -o 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
+# Be paranoid: check for autoconf >= 2.50
+# Some setups have both autoconf 2.13 and 2.5x 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=autoconf2.50 ./autogen.sh
+for i in autoconf2.50 autoconf-2.50 autoconf  false; do
+  version=`$i --version 2>/dev/null | head -n 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.13"
+    echo "ERROR: Please install autoconf 2.50 or newer"
     exit 1
 fi
 
@@ -36,7 +42,7 @@ if test -z "$*"; then
   echo
 fi
 
-for coin in `find $srcdir -name configure.in -print`
+for coin in $srcdir/configure.in #`find $srcdir -name configure.in -print`
 do 
   dr=`dirname $coin`
   echo processing $dr