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

diff --git a/ChangeLog b/ChangeLog
index 0a88dd6163578194ac74d84deb3c95706a6e75ae..298bc5e79ff34afa3a8efc518631822dd9162829 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a88dd6163578194ac74d84deb3c95706a6e75ae..298bc5e79ff34afa3a8efc518631822dd9162829 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+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,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a88dd6163578194ac74d84deb3c95706a6e75ae..298bc5e79ff34afa3a8efc518631822dd9162829 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+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,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a88dd6163578194ac74d84deb3c95706a6e75ae..298bc5e79ff34afa3a8efc518631822dd9162829 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+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,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a88dd6163578194ac74d84deb3c95706a6e75ae..298bc5e79ff34afa3a8efc518631822dd9162829 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+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,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a88dd6163578194ac74d84deb3c95706a6e75ae..298bc5e79ff34afa3a8efc518631822dd9162829 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+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,

diff --git a/autogen.sh b/autogen.sh
index 3614e96fccad2a54a1502b31d727f6bba1f4a954..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,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