From 0a2c9d67da311d8e276dd3835db56c59d8be2cab Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 28 Jun 2010 17:16:44 -0400 Subject: [PATCH] [autogen.sh] Support NOCONFIGURE (from gnome-common) gnome-common's autogen.sh uses NOCONFIGURE to skip running configure. Support that in addition to the current AUTOGEN_SUBDIR_MODE. --- autogen.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 358371ba2..238cb0dfc 100755 --- a/autogen.sh +++ b/autogen.sh @@ -76,7 +76,12 @@ test $TEST_TYPE $FILE || { exit 1 } -if test -z "$AUTOGEN_SUBDIR_MODE"; then +# NOCONFIGURE is used by gnome-common; support both +if ! test -z "$AUTOGEN_SUBDIR_MODE"; then + NOCONFIGURE=1 +fi + +if test -z "$NOCONFIGURE"; then if test -z "$*"; then echo "I am going to run ./configure with no arguments - if you wish " echo "to pass any to it, please specify them on the $0 command line." @@ -101,7 +106,7 @@ $AUTOMAKE --add-missing || exit $? autoconf || exit $? cd $ORIGDIR || exit $? -if test -z "$AUTOGEN_SUBDIR_MODE"; then +if test -z "$NOCONFIGURE"; then $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? echo