X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=2fd8bebd5a533bcaf7e9b932c0b0bf4fd6e5919d;hb=0a6566275d948a00fa03a42e5d60db0106328e2b;hp=4cc98ffdf74c0916988e4b13f8d33c5c52ade96e;hpb=38655bc28e73a0b218ba1582bdb84bab0fdfec4b;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index 4cc98ffdf7..2fd8bebd5a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,53 +1,69 @@
 #!/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`
 
-# Be paranoid: check for autoconf == 2.13
-# Some setups have both autoconf 2.13 and 2.50 available through
+case $1 in
+    --noconf*) NOCONFIGURE=true;;
+esac
+
+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.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 autoconf2.13 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
 
-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
+    cat <<EOF
+    Warning: about to run \`configure' without arguments.
+    arguments on the \`$0' command line
+    will be passed to \`configure'.
+
+    Invoke with --noconfigure to skip configure step.
+EOF
+fi
+
+echo Running $srcdir/configure $conf_flags "$@" ...
+$srcdir/configure $conf_flags "$@"