release commit

[lilypond.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index c9128e998d645348b257b95eed49182364f62fc0..ea9bb388ceae2fdc44d3d81689c4858317c228d4 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,28 @@
 #!/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 [ stepmake/aclocal.m4 -nt aclocal.m4 ]; then
+    echo "stepmake/aclocal.m4 is newer. Copying file." 
+    cp -f stepmake/aclocal.m4 aclocal.m4
+fi
+
+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.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
+#   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}'`
   if test "0$version" -ge 250; then
     autoconf=$i