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 14b21f2..fe05456 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -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) 
@@ -72,18 +72,15 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
         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
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode "$@"
+        $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
 
         echo 
         echo "Now type 'make' to compile $PROJECT."
-fi
\ No newline at end of file
+fi