diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-10-15 16:18:03 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-10-23 15:41:08 +0100 |
commit | 01db0fe5ce6874560f1d5cee0b2d54f5321cfa08 (patch) | |
tree | 3d9d79c989b3b3577d0b8a8be065147f4a5912e9 | |
parent | 8bb34311e60598cfea2489cc0aafffb4ac95263b (diff) | |
download | telepathy-salut-01db0fe5ce6874560f1d5cee0b2d54f5321cfa08.tar.gz |
Require automake 1.9 (same rationale as telepathy-glib, Gabble)
-rwxr-xr-x | autogen.sh | 12 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 7 insertions, 7 deletions
@@ -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 10b1a6e8..ff5266a9 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) |