From 0e69a6414f2fcc850c5213fbc14ecea45c366ce9 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Mon, 6 Aug 2012 11:29:58 +0200
Subject: [PATCH] Support building with automake 1.12.x

https://bugzilla.gnome.org/show_bug.cgi?id=681285

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit e5b5c5017487cec6426c93c364ff853831bc2080)
---
 autogen.sh | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 09d66afcc..9219f85e5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,17 +20,22 @@ test $TEST_TYPE $FILE || {
 # https://bugzilla.gnome.org/show_bug.cgi?id=661128
 touch -t 200001010000 po/cogl.pot
 
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-    export AUTOMAKE ACLOCAL
-else
-        echo
-        echo "You must have automake 1.11.x installed to compile $PROJECT
-ECT."
-        echo "Install the appropriate package for your distribution,"
-        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-        exit 1
+AUTOMAKE_VERSIONS="1.12 1.11"
+for version in $AUTOMAKE_VERSIONS; do
+	if automake-$version --version < /dev/null > /dev/null 2>&1 ; then
+		AUTOMAKE=automake-$version
+		ACLOCAL=aclocal-$version
+		export AUTOMAKE ACLOCAL
+		break
+	fi
+done
+
+if test -z "$AUTOMAKE"; then
+	echo
+	echo "You must have one of automake $AUTOMAKE_VERSIONS to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+	exit 1
 fi
 
 (gtkdocize --version) < /dev/null > /dev/null 2>&1 || {