Add '-dcrop' option to ps and svg backends

[lilypond.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index bc99b2d1afcb7715290a3ced31dc642e0cfebaa5..46dd22f98b86f9f1dc2895212a72c635d5928a81 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,60 +3,39 @@
 
 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." 
-    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.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.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 $srcdir/configure.in #`find $srcdir -name configure.in -print`
+for i in $srcdir/configure.ac #`find $srcdir -name configure.ac -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 "$@"