automake 1.4

2002-09-06  Havoc Pennington  <hp@redhat.com>

	* autogen.sh: automake 1.4

diff --git a/ChangeLog b/ChangeLog
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6d76009..61d89b3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-09-06  Havoc Pennington  <hp@redhat.com>
+
+       * autogen.sh: automake 1.4
+
 2002-09-01  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * docs/reference/glib/tmpl/datalist.sgml, glib/gmain.c:

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