X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fautogen.sh;h=bc99b2d1afcb7715290a3ced31dc642e0cfebaa5;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=36d6b4939ff9eb10f10577314e3449466910a05a;hpb=8438b824fb221159742957c2eeab761effe73be4;p=lilypond.git

diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh
index 36d6b4939f..bc99b2d1af 100755
--- a/stepmake/autogen.sh
+++ b/stepmake/autogen.sh
@@ -3,7 +3,13 @@
 
 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
@@ -17,7 +23,7 @@ fi
 # If you have such a setup, invoke this script as:
 #   autoconf=autoconf2.50 ./autogen.sh
 for i in autoconf2.50 autoconf-2.50 autoconf  false; do
-  version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
+  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
@@ -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