From dfedf436ce7ffaedc7731974c4c9e8843fade5d7 Mon Sep 17 00:00:00 2001 From: Alban Browaeys Date: Tue, 8 Oct 2013 09:28:56 +0200 Subject: [PATCH] build: configure.ac requires automake >= 1.12, sync autogen.sh autogen.sh uses automake 1.11 if available but configure.ac then fails as too old an automake for it since commit a81174c5 . --- autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index 58ee191..f6cb319 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,14 +6,14 @@ gtkdocize || exit 1 if test -n "$AUTOMAKE"; then : # don't override an explicit user request -elif automake-1.11 --version >/dev/null 2>/dev/null && \ - aclocal-1.11 --version >/dev/null 2>/dev/null; then +elif automake-1.12 --version >/dev/null 2>/dev/null && \ + aclocal-1.12 --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 + AUTOMAKE=automake-1.12 export AUTOMAKE - ACLOCAL=aclocal-1.11 + ACLOCAL=aclocal-1.12 export ACLOCAL fi -- 1.8.4