X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=34c022e0825ff602da60fd86aa9ac3f0ba951ce5;hb=d000ba690e920b568ec8272d12de46f92aa20f68;hp=0b9241673a999cdbdda5009a06f45545ad55cc57;hpb=762ca4af538f1d566e396a1b52e84a6bc6b919f3;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index 0b9241673a..34c022e082 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,42 +1,52 @@
 #!/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`
-DIE=0
-
-# autoconf > 2.50 is not very common yet,
-# and disappointingly incompatible with the widely available 2.13
-version=`autoconf --version 2>/dev/null | awk '{print $3}'`
-if test "$version" != "2.13"; then
-  echo "ERROR: Please install autoconf 2.13"
-  exit 1
+
+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 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
+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
 
-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
+      autoconf || exit 1
   )
+  # Autoconf automatically checks its own minimum required
+  # version, and it aborts when the check fails.
+  test "$?" -eq 1 && exit 1
 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 "$@"