diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-28 16:35:34 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-28 16:35:34 +0100 |
commit | f32dca970eba0ebf539fc7a5165020501e0df152 (patch) | |
tree | 70a8da86cda0e6791f26cb9f89af637c79992a50 | |
parent | ec000bc222755226991d3310de499c14a8c17671 (diff) |
Prefer automake 1.11, so we get silent-rules support in tarballstelepathy-glib-0.9.0
-rwxr-xr-x | autogen.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh index 79a566fbe..939aa7d8e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,13 +5,14 @@ gtkdocize 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 |