[Telepathy-commits] [telepathy-haze/master] Use automake 1.9 (as in Gabble and telepathy-glib)

[Simon McVittie]

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

diff --git a/autogen.sh b/autogen.sh
index ee10f48..7f08e9b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,19 @@
 #!/bin/sh
 set -e
 
-if test -z "$MAKE"
-then
-	MAKE=make
+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
+    export AUTOMAKE
+    ACLOCAL=aclocal-1.9
+    export ACLOCAL
 fi
 
-autoreconf -i
+autoreconf -i -f
 
 run_configure=true
 for arg in $*; do
diff --git a/configure.ac b/configure.ac
index 56c4dcf..713ab86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_INIT([telepathy-haze], [haze_version],
 
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability])
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
-- 
1.5.6.5