diff options
| author | Rodney Dawes <dobey@ximian.com> | 2003-01-06 19:08:30 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2003-01-06 19:08:30 +0000 |
| commit | edd2b3b42b52f2b210bf31ded1b427387dbca557 (patch) | |
| tree | 9e422d3397baeaca3fb2a72bd8e3b7393227ea46 | |
| parent | 9167512360ea95e2a5fefa4d80344b2bfd162bbc (diff) | |
| download | gnome-common-edd2b3b42b52f2b210bf31ded1b427387dbca557.tar.gz | |
Fall back to automake/aclocal if no -1.4 version exists
2003-01-06 Rodney Dawes <dobey@ximian.com>
* autogen.sh: Fall back to automake/aclocal if no -1.4 version exists
svn path=/branches/gal-evolution-1-2-branch/; revision=2698
| -rw-r--r-- | macros/ChangeLog | 4 | ||||
| -rw-r--r-- | macros/autogen.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 7c0ed0b..af84a7b 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,7 @@ +2003-01-06 Rodney Dawes <dobey@ximian.com> + + * autogen.sh: Fall back to automake/aclocal if no -1.4 version exists + 2002-09-20 JP Rosevear <jpr@ximian.com> * gnome-pilot.m4: fix problem where -lpisync was not linked in if diff --git a/macros/autogen.sh b/macros/autogen.sh index 4f57a71..cb19b72 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -69,7 +69,7 @@ fi # } #} -(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || { +(automake-1.4 --version || automake --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-1.4 --version) < /dev/null > /dev/null 2>&1 || { +test -n "$NO_AUTOMAKE" || (aclocal-1.4 --version || aclocal --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: Missing \`aclocal'. The version of \`automake'" echo "installed doesn't appear recent enough." |