Updates

[platform/upstream/glib.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 358371b..1730e57 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,14 +19,14 @@ 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
-           1.4*|1.5*|2.2*)
+           2.2*|2.4*)
                have_libtool=true
                ;;
        esac
 fi
 if $have_libtool ; then : ; else
        echo
-       echo "You must have libtool 1.4 installed to compile $PROJECT."
+       echo "You must have libtool >= 2.2 installed to compile $PROJECT."
        echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
        DIE=1
@@ -54,18 +54,14 @@ if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
 else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.10
     ACLOCAL=aclocal-1.10
-else if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.9
-    ACLOCAL=aclocal-1.9
 else
        echo
-       echo "You must have automake 1.9.x, 1.10.x or 1.11.x installed to compile $PROJECT."
+       echo "You must have automake 1.10.x or 1.11.x installed to compile $PROJECT."
        echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
        DIE=1
 fi
 fi
-fi
 
 if test "$DIE" -eq 1; then
        exit 1
@@ -76,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."
@@ -101,7 +102,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