[Telepathy-commits] [telepathy-qt4/master] We depend on automake >= 1.9, reflect that in the ./autogen.sh automake chooser check
Olli Salli
olli.salli at collabora.co.uk
Mon Sep 22 09:19:47 PDT 2008
---
autogen.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index e2af44d..7f08e9b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,13 +3,13 @@ set -e
if test -n "$AUTOMAKE"; then
: # don't override an explicit user request
-elif automake-1.8 --version >/dev/null 2>/dev/null && \
- aclocal-1.8 --version >/dev/null 2>/dev/null; then
- # If we have automake-1.8, use it. This helps to ensure that our build
- # system doesn't accidentally grow automake-1.9 dependencies.
- AUTOMAKE=automake-1.8
+elif automake-1.9 --version >/dev/null 2>/dev/null && \
+ aclocal-1.9 --version >/dev/null 2>/dev/null; then
+ # If we have automake-1.9, use it. This helps to ensure that our build
+ # system doesn't accidentally grow automake-1.10 dependencies.
+ AUTOMAKE=automake-1.9
export AUTOMAKE
- ACLOCAL=aclocal-1.8
+ ACLOCAL=aclocal-1.9
export ACLOCAL
fi
--
1.5.6.5
More information about the Telepathy-commits
mailing list