[telepathy-gabble/master] autogen.sh: prefer automake 1.11 if available, for silent rules
Simon McVittie
simon.mcvittie at collabora.co.uk
Thu Nov 26 06:50:36 PST 2009
This mirrors a similar change in telepathy-glib.
---
autogen.sh | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index bdcbefe..b6dff98 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,13 +3,14 @@ set -e
if test -n "$AUTOMAKE"; then
: # don't override an explicit user request
-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
+elif automake-1.11 --version >/dev/null 2>/dev/null && \
+ aclocal-1.11 --version >/dev/null 2>/dev/null; then
+ # If we have automake-1.11, use it. This is the oldest version (=> least
+ # likely to introduce undeclared dependencies) that will give us
+ # --enable-silent-rules support.
+ AUTOMAKE=automake-1.11
export AUTOMAKE
- ACLOCAL=aclocal-1.9
+ ACLOCAL=aclocal-1.11
export ACLOCAL
fi
--
1.5.6.5
More information about the telepathy-commits
mailing list