Remove unneeded bits of AM_GTK_GNU_TEXT macros.

[~andy/gtk] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index bdaf6699c9384040c3f3ad3378d410ea32045ea5..bb3e10d58b281e71255cb3daa96fd8aa94612e68 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,8 +38,8 @@ fi
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-       automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
+       automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
        case $automake_version in
           1.2*|1.3*|1.4) 
                ;;
@@ -78,7 +78,7 @@ esac
 
 if test -z "$ACLOCAL_FLAGS"; then
 
-       acdir=`aclocal --print-ac-dir`
+       acdir=`aclocal-1.4 --print-ac-dir`
         m4list="glib-2.0.m4 glib-gettext.m4"
 
        for file in $m4list
@@ -95,17 +95,17 @@ if test -z "$ACLOCAL_FLAGS"; then
        done
 fi
 
-aclocal $ACLOCAL_FLAGS
+aclocal-1.4 $ACLOCAL_FLAGS
 
 # optionally feature 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."