X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=autogen.sh;h=bb3e10d58b281e71255cb3daa96fd8aa94612e68;hb=d0cac482039125a7118fa06d07dd24ae76d2ccaf;hp=5a2e43be64ed40e0e0f371cbc0ad8fd6b14859a4;hpb=87403457fabc951ad6dd0ab390e3ef76cfbbbf27;p=~andy%2Fgtk

diff --git a/autogen.sh b/autogen.sh
index 5a2e43be6..bb3e10d58 100755
--- 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) 
 		;;
@@ -65,9 +65,11 @@ 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
 
 case $CC in
@@ -76,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
@@ -93,16 +95,18 @@ 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
 
-$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
\ No newline at end of file