diff options
| author | Rodney Dawes <dobey@ximian.com> | 2003-01-07 18:11:21 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2003-01-07 18:11:21 +0000 |
| commit | acda0289321a0f657a1879527530c520bfad7a45 (patch) | |
| tree | 354579a7f1d5ce15289589c8bafb156123418b59 | |
| parent | dfbbc2627f90c6bc27338ab179fc3a545e3f02bb (diff) | |
| download | gnome-common-gtkhtml-evolution-1-2-branch.tar.gz | |
Fall back to automake/aclocal if no -1.4 version existsgtkhtml-evolution-1-2-branch
2003-01-07 Rodney Dawes <dobey@ximian.com>
* autogen.sh: Fall back to automake/aclocal if no -1.4 version exists
svn path=/branches/gtkhtml-evolution-1-2-branch/; revision=2702
| -rw-r--r-- | macros/ChangeLog | 4 | ||||
| -rw-r--r-- | macros/autogen.sh | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 7c0ed0b..6ec4afd 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,7 @@ +2003-01-07 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..2d344e2 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." @@ -173,7 +173,7 @@ do fi fi echo "Running aclocal-1.4 $aclocalinclude ..." - aclocal-1.4 $aclocalinclude || { + aclocal-1.4 $aclocalinclude || aclocal $aclocalinclude || { echo 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" @@ -189,6 +189,7 @@ do fi echo "Running automake-1.4 --gnu $am_opt ..." automake-1.4 --add-missing --gnu $am_opt || + automake --add-missing --gnu $am_opt || { echo "**Error**: automake-1.4 failed."; exit 1; } echo "Running autoconf ..." autoconf || { echo "**Error**: autoconf failed."; exit 1; } |