X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=f851875cab1db911e683eb93339d0d4b3a9240a0;hb=377bdb36c4f09fb20a1c55b0358cc5d0714eb85e;hp=c9128e998d645348b257b95eed49182364f62fc0;hpb=35f48f6592df5dabe2b2c4633953eb1547fc6607;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index c9128e998d..f851875cab 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,20 +1,29 @@
 #!/bin/sh
-# WARNING WARNING WARNING
-# do not edit! this is autogen.sh, generated from stepmake/autogen.sh
-#!/bin/sh
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`
 
+
+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.50
-# Some setups have both autoconf 2.13 and 2.50 available through
+# Some setups have both autoconf 2.13 and 2.5x available through
 # a wrapper script: /usr/bin/autoconf.
-# This wrapper may correctly autoselect autoconf 2.50, but it
+# 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=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}'`
+#   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
@@ -26,28 +35,29 @@ if test -z "$autoconf"; then
     exit 1
 fi
 
-if test -z "$*"; then
-  echo "WARNING: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-for coin in `find $srcdir -name configure.in -print`
+for i in $srcdir/configure.in #`find $srcdir -name configure.in -print`
 do 
-  dr=`dirname $coin`
-  echo processing $dr
+  dir=`dirname $i`
+  echo processing $dir
   (
-      cd $dr
+      cd $dir
       echo "Running autoconf ..."
       $autoconf
   )
 done
 
 #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-if test -z "$NOCONFIGURE"; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@"
-else
-  echo Skipping configure process.
+if test -n "$NOCONFIGURE"; then
+    echo Skipping configure process.
+    exit 0
+fi
+
+if test -z "$*"; then
+    echo "warning: about to run \`./configure' without arguments."
+    echo "arguments on the \`$0\'"
+    echo "command line will be passed to \`./configure'."
+    echo
 fi
+
+echo Running $srcdir/configure $conf_flags "$@" ...
+$srcdir/configure $conf_flags "$@"