Using italics here actually introduces more visual clutter than anything

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 1c04f8d76d8c6763f2b0b81a6d4125d93a56aaf5..2b7c0e7987ddeeb5d6aa0254b0a02ccb69397061 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
                         sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
                             -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
        case $libtool_version in
-           2.2*)
+           2.*)
                have_libtool=true
                ;;
        esac
@@ -72,7 +72,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."
@@ -105,16 +110,19 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-libtoolize --force || exit $?
 gtkdocize || exit $?
 
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
+
+libtoolize --force || exit $?
+
 autoheader || exit $?
 
 $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