Bug 622294 - More annotations for GVariant

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

diff --git a/autogen.sh b/autogen.sh
index 9669bb0..238cb0d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,10 @@ DIE=0
 
 have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-       libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+       libtool_version=`libtoolize --version |
+                        head -1 |
+                        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*)
                have_libtool=true
@@ -73,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."
@@ -87,23 +95,6 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-if [ ! -d build ]; then
-  if [ -x "`which svn`" ]; then
-    echo
-    echo "=============================================================="
-    echo "  your checkout doesn't contain build/."
-    echo "      fetching it from http://svn.gnome.org/svn/build/trunk/"
-    echo "=============================================================="
-    echo
-
-    svn checkout http://svn.gnome.org/svn/build/trunk/ build
-  else
-    echo
-    echo 'warning: build/ directory is missing and no "svn" to fetch it!'
-    echo
-  fi
-fi
-
 $ACLOCAL $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
@@ -115,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