X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autogen.sh;h=6db6ec12e21470bacff2e0ec09d4d312f9e3e217;hb=7ad5c55bcb4f13327853e4c62af63eb6ab61d45b;hp=55560b9d937caf6bfa0045f2289270078e9992c7;hpb=04ae3a59a98ccdfa95db5664c88223a5805dc3db;p=lilypond.git

diff --git a/autogen.sh b/autogen.sh
index 55560b9d93..6db6ec12e2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,21 @@
 #!/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
 
 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
@@ -50,16 +50,21 @@ do
 done
 
 #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+#conf_flags="--with-ncsb-dir=/usr/share/fonts/default/Type1/"
+
 if test -n "$NOCONFIGURE"; then
     echo Skipping configure process.
     exit 0
 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 "$@" ...