Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

[lilypond.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 55560b9d937caf6bfa0045f2289270078e9992c7..d5033d9ec7cf87471371e4230a4f1df7641ad86a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,24 @@
 #!/bin/sh
 # WARNING WARNING WARNING
-# do not edit! this is autogen.sh, generated from /home/hanwen/usr/src/lilypond/stepmake/autogen.sh
+# do not edit! this is autogen.sh, generated from /home/lilydev/src/lilypond/stepmake/autogen.sh
 #!/bin/sh
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`
 
+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." 
+    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." 
+    echo "stepmake/autogen.sh is newer.  Copying file." 
     cp -f stepmake/autogen.sh autogen.sh
-    exec ./autogen.sh
+    exec ./autogen.sh "$@"
 fi
 
 # Be paranoid: check for autoconf >= 2.50
@@ -56,10 +59,13 @@ if test -n "$NOCONFIGURE"; then
 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
+    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 "$@" ...