From: Will Thompson <will.thompson@collabora.co.uk>
Date: Wed, 8 Sep 2010 18:20:18 +0000 (+0100)
Subject: Use Automake 1.11, if available, for silent rules
X-Git-Tag: dbus-1.4.1~34^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=340d114cd0e6b065c7cc4b93b66c989e8108876e;p=thirdparty%2Fdbus.git

Use Automake 1.11, if available, for silent rules

Automake 1.11 adds support for silent rules, which are conditionally
enabled in configure.in if available.

Also, previously it was impossible to override the version chosen by
this script; this patch makes that possible.
---

diff --git a/autogen.sh b/autogen.sh
index bf53b2770..7c2ae0624 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,8 +27,12 @@ fi
 	DIE=1
 }
 
-AUTOMAKE=automake-1.9
-ACLOCAL=aclocal-1.9
+# If the user hasn't explicitly chosen an Automake version, use 1.11. This is
+# the earliest version that gives us silent rules.
+if test -z "$AUTOMAKE"; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+fi
 
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
         AUTOMAKE=automake