diff options
| -rwxr-xr-x | autogen.sh | 13 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 8 insertions, 6 deletions
@@ -3,13 +3,14 @@ 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 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 0ef6ff9e..4a0f1c59 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,7 @@ AC_INIT([Telepathy Salut], [salut_version], AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.9 -Wno-portability tar-ustar]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AM_PROG_LIBTOOL AM_CONFIG_HEADER(config.h) |