From 4cd65645628c1b3a16cc84225833b67e9876e8ed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 20 May 2010 11:51:33 +0100 Subject: Enable optional quiet build --- autogen.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 7f08e9b6..5b32d48b 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 -- cgit v1.2.1