From 1d07ef714dfe4ce872a7eaa1e66c65cb31af99b8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 1 Aug 2012 08:47:31 +0200 Subject: [PATCH] Allow building with automake 1.12 --- autogen.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 43d0ef8a7..06238dca0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,7 +48,10 @@ fi DIE=1 } -if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then +if automake-1.12 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake-1.12 + ACLOCAL=aclocal-1.12 +else if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then @@ -66,6 +69,7 @@ else fi fi fi +fi if test "$DIE" -eq 1; then exit 1