summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-01-06 19:20:02 +0000
committerRodney Dawes <dobey@src.gnome.org>2003-01-06 19:20:02 +0000
commitd13c9727cced25c29ebd5095a5495c918a4bf861 (patch)
tree91d5f9110e00b66b06a18a14a05ba51ff3662cb9
parentedd2b3b42b52f2b210bf31ded1b427387dbca557 (diff)
downloadgnome-common-gal-evolution-1-2-branch.tar.gz
Fall back to automake/aclocal if no -1.4 version existsgal-evolution-1-2-branch
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=2699
-rw-r--r--macros/autogen.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/macros/autogen.sh b/macros/autogen.sh
index cb19b72..2d344e2 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -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; }