diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-09-08 20:06:00 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-09-08 20:06:00 +0000 |
| commit | 13dd2c198881ffa8e0e6dbc63656c0216951db86 (patch) | |
| tree | 0746905dede80921ca96c79d50be9a3d1812f384 | |
| parent | c6fb90580a37701293d5fbf05f8346367a4c62ab (diff) | |
| download | shared-mime-info-13dd2c198881ffa8e0e6dbc63656c0216951db86.tar.gz | |
hardcode automake-1.4
2002-09-08 Havoc Pennington <hp@pobox.com>
* autogen.sh: hardcode automake-1.4
svn path=/trunk/; revision=2572
| -rw-r--r-- | macros/ChangeLog | 4 | ||||
| -rw-r--r-- | macros/autogen.sh | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index c3796fe2..e12b9d9f 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,7 @@ +2002-09-08 Havoc Pennington <hp@pobox.com> + + * autogen.sh: hardcode automake-1.4 + 2002-05-15 JP Rosevear <jpr@ximian.com> * gnome-pilot.m4: Fix quoting for AC_MSG_* diff --git a/macros/autogen.sh b/macros/autogen.sh index 71f7dfcf..4f57a71a 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -69,7 +69,7 @@ fi # } #} -(automake --version) < /dev/null > /dev/null 2>&1 || { +(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`automake' installed to compile $PKG_NAME." echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" @@ -80,7 +80,7 @@ fi # if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { +test -n "$NO_AUTOMAKE" || (aclocal-1.4 --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: Missing \`aclocal'. The version of \`automake'" echo "installed doesn't appear recent enough." @@ -172,10 +172,10 @@ do libtoolize --force --copy fi fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude || { + echo "Running aclocal-1.4 $aclocalinclude ..." + aclocal-1.4 $aclocalinclude || { echo - echo "**Error**: aclocal failed. This may mean that you have not" + echo "**Error**: aclocal-1.4 failed. This may mean that you have not" echo "installed all of the packages you need, or you may need to" echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\"" echo "for the prefix where you installed the packages whose" @@ -187,9 +187,9 @@ do echo "Running autoheader..." autoheader || { echo "**Error**: autoheader failed."; exit 1; } fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt || - { echo "**Error**: automake failed."; exit 1; } + echo "Running automake-1.4 --gnu $am_opt ..." + automake-1.4 --add-missing --gnu $am_opt || + { echo "**Error**: automake-1.4 failed."; exit 1; } echo "Running autoconf ..." autoconf || { echo "**Error**: autoconf failed."; exit 1; } ) || exit 1 |