diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-08-18 22:21:32 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-08-18 22:21:32 +0000 |
| commit | df9642557a59b72ebe0525005b811d7d3e992393 (patch) | |
| tree | afc04b258b406d3302f2023849b824fcbc22243e | |
| parent | 6aa23b11d45a0ddb5fbb758c043069ad62592e26 (diff) | |
| download | atk-df9642557a59b72ebe0525005b811d7d3e992393.tar.gz | |
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"
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | autogen.sh | 6 |
2 files changed, 11 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" + 2002-08-16 Padraig O'Briain <padraig.obriain@sun.com> These changes improve the quality of the documentation by adding @@ -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,9 +72,9 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then fi fi -aclocal $ACLOCAL_FLAGS +aclocal-1.4 $ACLOCAL_FLAGS -automake -a $am_opt +automake-1.4 -a $am_opt autoconf cd $ORIGDIR |