(srcdir): urg. Touch install-sh.

[lilypond.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 6abd4cd4aa94913c51970bece0684d463b71a4b7..4bf7e17d10b1d7fa28a6023c9839a9ca19593ca7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,20 @@
 #!/bin/sh
-# WARNING WARNING WARNING
-# do not edit! this is autogen.sh, generated from /home/hanwen/usr/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
 
+touch stepmake/bin/install-sh
 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 "$@"
 fi
@@ -34,7 +35,7 @@ for i in autoconf2.50 autoconf-2.50 autoconf  false; do
 done
 
 if test -z "$autoconf"; then
-    echo "ERROR: Please install autoconf 2.50 or newer"
+i    echo "ERROR: Please install autoconf 2.50 or newer"
     exit 1
 fi
 
@@ -56,10 +57,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 "$@" ...