Switch to automake 1.11 to make gtk-doc happy

2 files changed, 8 insertions, 7 deletions

diff --git a/autogen.sh b/autogen.sh
index 822ebf8..c39444c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,13 +5,14 @@ gtkdocize --copy
 
 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
 
diff --git a/configure.ac b/configure.ac
index cd9c38b..aebb256 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_INIT([Telepathy-Farstream], [tp_farstream_version],
 
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 -Wno-portability])
 AM_CONFIG_HEADER(config.h)
 
 dnl use pretty build output with automake >= 1.11