summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-10-29 12:35:39 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-10-29 12:35:39 +0100
commitd8b09e8fb3846d7c02a8e8dc4dd9b9f7aebfe8a7 (patch)
tree7117f5d9a9945378601c7f1561b67c9abcf68c86
parent46bdd911fafe82a0c5da418da318707ef8cae9f6 (diff)
configure: use automake 1.11
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 7 deletions
diff --git a/autogen.sh b/autogen.sh
index 7f08e9b..7bb241e 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.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 helps to ensure that our build
+ # system doesn't accidentally grow other dependencies.
+ 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 490045d..591bf91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT([telepathy-yell], [tp_yell_version],
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 -Wall -Wno-portability foreign])
+AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability foreign])
AM_CONFIG_HEADER(config.h)
AM_SILENT_RULES