increment version to 1.1.0, in view of the fact that we've branched for

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

diff --git a/autogen.sh b/autogen.sh
index ed1958c..fe05456 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ DIE=0
 
 have_libtool=false
 if libtool --version < /dev/null > /dev/null 2>&1 ; then
-       libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.]\+\).*/\1/'`
+       libtool_version=`libtoolize --version |  libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
        case $libtool_version in
            1.4*)
                have_libtool=true
@@ -38,7 +38,7 @@ fi
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
        automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
        case $automake_version in
           1.2*|1.3*|1.4) 
@@ -65,21 +65,22 @@ test $TEST_TYPE $FILE || {
        exit 1
 }
 
-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."
+if test -z "$AUTOGEN_SUBDIR_MODE"; 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."
+        fi
 fi
 
-aclocal $ACLOCAL_FLAGS
+aclocal-1.4 $ACLOCAL_FLAGS
 
-# optionally run autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-
-automake -a $am_opt
+automake-1.4 -a $am_opt
 autoconf
 cd $ORIGDIR
 
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
 
-echo 
-echo "Now type 'make' to compile $PROJECT."
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi