From: Joel A. Kulesza <jkulesza@gmail.com>
Date: Sun, 18 Mar 2018 23:43:25 +0000 (-0600)
Subject: Update to accept automake 1.16
X-Git-Tag: 2.3.1~152
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3abfd72b2720c21eba51bb2338f0b8b835dae720;p=features.git

Update to accept automake 1.16

(cherry picked from commit 61db4af82dfd8c24bb3099160274bf6c6d4e7cce)
---

diff --git a/INSTALL b/INSTALL
index 592c542c1f..c18d140074 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,7 +37,7 @@ Note for Git checkouts
 -----------------------------
 
 If you have checked this out from Git, you need to have:
-* automake (supported versions are 1.14--1.15)
+* automake (supported versions are 1.14--1.16)
 * autoconf (supported versions are 2.65--2.69)
 Then type "./autogen.sh" to build the needed configuration
 files and proceed as stated above/below.
diff --git a/autogen.sh b/autogen.sh
index 2cacc5c413..54f57ae3d2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,11 +16,11 @@ test "$automake_version" != "" && {
 }
 
 case $automake_version in
-    *' '1.1[45]*)
+    *' '1.1[456]*)
 	;;
     *)
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.14 to 1.15."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
diff --git a/status.23x b/status.23x
index eb02564dc6..d1728d60af 100644
--- a/status.23x
+++ b/status.23x
@@ -95,3 +95,5 @@ What's new
 
 
 * BUILD/INSTALLATION
+
+- Add support for automake 1.16.