automake 1.4

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

diff --git a/autogen.sh b/autogen.sh
index 9da7a60..b631479 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) 
                ;;
@@ -88,12 +88,12 @@ case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-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