[Telepathy-commits] [telepathy-salut/master] Require automake 1.9 (same rationale as telepathy-glib, Gabble)

[Simon McVittie]

---
 autogen.sh   |   12 ++++++------
 configure.ac |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index e2af44d..7f08e9b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,13 +3,13 @@ set -e
 
 if test -n "$AUTOMAKE"; then
     : # don't override an explicit user request
-elif automake-1.8 --version >/dev/null 2>/dev/null && \
-     aclocal-1.8 --version >/dev/null 2>/dev/null; then
-    # If we have automake-1.8, use it. This helps to ensure that our build
-    # system doesn't accidentally grow automake-1.9 dependencies.
-    AUTOMAKE=automake-1.8
+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
     export AUTOMAKE
-    ACLOCAL=aclocal-1.8
+    ACLOCAL=aclocal-1.9
     export ACLOCAL
 fi
 
diff --git a/configure.ac b/configure.ac
index 10b1a6e..ff5266a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_INIT([Telepathy Salut], [salut_version],
 
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.8 -Wno-portability])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability])
 AM_PROG_LIBTOOL
 AM_CONFIG_HEADER(config.h)
 
-- 
1.5.6.5