diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rwxr-xr-x | autogen.sh | 6 |
7 files changed, 51 insertions, 3 deletions
@@ -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" + Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com> Some fixes from #90267 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4267bc44..7a6a2dac 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -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" + Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com> Some fixes from #90267 diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 4267bc44..7a6a2dac 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -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" + Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com> Some fixes from #90267 diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 4267bc44..7a6a2dac 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -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" + Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com> Some fixes from #90267 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 4267bc44..7a6a2dac 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -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" + Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com> Some fixes from #90267 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 4267bc44..7a6a2dac 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -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" + Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com> Some fixes from #90267 @@ -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) @@ -72,12 +72,12 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then fi fi -aclocal $ACLOCAL_FLAGS +aclocal-1.4 $ACLOCAL_FLAGS # optionally run autoheader (autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader -automake -a $am_opt +automake-1.4 -a $am_opt autoconf cd $ORIGDIR |