automake 1.4

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

	* autogen.sh: automake 1.4
This commit is contained in:
Havoc Pennington 2002-09-06 19:28:28 +00:00 committed by Havoc Pennington
parent 4acacec101
commit 3afc93f1aa
8 changed files with 32 additions and 4 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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