From adf68f977cd41748b35b1aca88367d3d5cb459da Mon Sep 17 00:00:00 2001 From: Nuno Araujo Date: Tue, 15 Jan 2013 18:30:48 +0100 Subject: [PATCH] Enable support for automake 1.13 in autogen.sh https://bugzilla.gnome.org/show_bug.cgi?id=692099 --- autogen.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 06238dca02..e5880284ae 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,7 +48,10 @@ fi DIE=1 } -if automake-1.12 --version < /dev/null > /dev/null 2>&1 ; then +if automake-1.13 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake-1.13 + ACLOCAL=aclocal-1.13 +else 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 @@ -62,7 +65,8 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then ACLOCAL=aclocal-1.7 else echo - echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT." + echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x or 1.13.x" + echo "installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" DIE=1 @@ -70,6 +74,7 @@ fi fi fi fi +fi if test "$DIE" -eq 1; then exit 1