[libsecret] Support building with automake 1.12.x



commit 6becc33e8c9893c68fa16d84d8d9fa7956cdf8a9
Author: Stef Walter <stefw gnome org>
Date:   Mon Jul 30 16:53:08 2012 +0200

    Support building with automake 1.12.x
    
    https://bugzilla.gnome.org/show_bug.cgi?id=680839

 autogen.sh |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 1826300..7c6b56d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -43,20 +43,22 @@ fi
 	DIE=1
 }
 
-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
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
-else
+AUTOMAKE_VERSIONS="1.12 1.11 1.10"
+for version in $AUTOMAKE_VERSIONS; do
+	if automake-$version --version < /dev/null > /dev/null 2>&1 ; then
+		AUTOMAKE=automake-$version
+		ACLOCAL=aclocal-$version
+		break
+	fi
+done
+
+if test -z "$AUTOMAKE"; then
 	echo
-	echo "You must have automake 1.10.x or 1.11.x installed to compile $PROJECT."
+	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/";
 	DIE=1
 fi
-fi
 
 if test "$DIE" -eq 1; then
 	exit 1



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]