hardcode aclocal-1.4/automake-1.4 so that users with both automake 1.6 and

2002-08-18  Havoc Pennington  <hp@pobox.com>

	* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
	both automake 1.6 and 1.4 installed get the right automake. Means
	compilation from CVS will now require the latest automake 1.4
	release, or manually creating symlinks called "automake-1.4" and
	"aclocal-1.4"
This commit is contained in:
Havoc Pennington 2002-08-18 22:21:40 +00:00 committed by Havoc Pennington
parent 9e033ba9aa
commit 878a5f498d
8 changed files with 59 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -1,3 +1,11 @@
2002-08-18 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
both automake 1.6 and 1.4 installed get the right automake. Means
compilation from CVS will now require the latest automake 1.4
release, or manually creating symlinks called "automake-1.4" and
"aclocal-1.4"
2002-08-10 Gustavo Noronha Silva <kov@debian.org>
* configure.in: added pt_BR to ALL_LINGUAS

View File

@ -38,7 +38,7 @@ fi
}
have_automake=false
if automake --version < /dev/null > /dev/null 2>&1 ; then
if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then
automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
case $automake_version in
1.2*|1.3*|1.4)
@ -76,12 +76,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