diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:51:33 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:51:33 +0100 |
commit | 4cd65645628c1b3a16cc84225833b67e9876e8ed (patch) | |
tree | 9fd492374e4b546b8307fd3296517a9072546732 /autogen.sh | |
parent | 33f1636f3ea64375cb1db0a13ddfbbdbcfd64222 (diff) | |
download | telepathy-salut-4cd65645628c1b3a16cc84225833b67e9876e8ed.tar.gz |
Enable optional quiet build
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -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 |