get automake-1.4 changes from -2-0 branch

2002-09-05  jacob berkman  <jacob@ximian.com>

	* autogen.sh: get automake-1.4 changes from -2-0 branch

ChangeLog

+2002-09-05  jacob berkman  <jacob@ximian.com>
+
+	* autogen.sh: get automake-1.4 changes from -2-0 branch
+
 2002-09-05  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,

ChangeLog.pre-2-10

+2002-09-05  jacob berkman  <jacob@ximian.com>
+
+	* autogen.sh: get automake-1.4 changes from -2-0 branch
+
 2002-09-05  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,

ChangeLog.pre-2-2

+2002-09-05  jacob berkman  <jacob@ximian.com>
+
+	* autogen.sh: get automake-1.4 changes from -2-0 branch
+
 2002-09-05  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,

ChangeLog.pre-2-4

+2002-09-05  jacob berkman  <jacob@ximian.com>
+
+	* autogen.sh: get automake-1.4 changes from -2-0 branch
+
 2002-09-05  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,

ChangeLog.pre-2-6

+2002-09-05  jacob berkman  <jacob@ximian.com>
+
+	* autogen.sh: get automake-1.4 changes from -2-0 branch
+
 2002-09-05  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,

ChangeLog.pre-2-8

+2002-09-05  jacob berkman  <jacob@ximian.com>
+
+	* autogen.sh: get automake-1.4 changes from -2-0 branch
+
 2002-09-05  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,

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,12 +95,12 @@ 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