File 0001-build-support-automake-1.16.patch of Package gtk2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-build-support-automake-1.16.patch of Package gtk2 (Revision dd1d3f9e5a89a0efc3ecb797cb206979)

Currently displaying revision dd1d3f9e5a89a0efc3ecb797cb206979 , Show latest

From 2dbf31c0ea4f17a817b931c731f8de14c278300d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 27 Mar 2018 16:24:02 +0200
Subject: [PATCH] build: support automake 1.16

---
 autogen.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 078f483f5a..63e2d5c495 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,7 +48,10 @@ fi
 	DIE=1
 }
 
-if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.16
+    ACLOCAL=aclocal-1.16
+else if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.15
     ACLOCAL=aclocal-1.15
 else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then
@@ -71,8 +74,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, 1.11.x, 1.12.x, 1.13.x, 1.14.x"
-	echo "or 1.15.x installed to compile $PROJECT."
+	echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x,"
+	echo "1.15.x or 1.16.x 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
@@ -83,6 +86,7 @@ fi
 fi
 fi
 fi
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1
-- 
2.16.2

Places

File 0001-build-support-automake-1.16.patch of Package gtk2 (Revision dd1d3f9e5a89a0efc3ecb797cb206979)

Places