Update to accept automake 1.16

(cherry picked from commit 61db4af82dfd8c24bb3099160274bf6c6d4e7cce)

diff --git a/INSTALL b/INSTALL
index 592c542c1fdf47916bf0bf07c56b9bc567a70e74..c18d140074295829eee0950dbbf1783e40cfe5ea 100644 (file)
--- 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 2cacc5c4133fbd5f2491eb8c1dba207e586a04f7..54f57ae3d2656cbc8129d07ffa24365d5103b5cd 100755 (executable)
--- 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 eb02564dc69d607bddae90b79ef7140b41cdf12d..d1728d60afaeaf61c71ffab08a03354c882781ad 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -95,3 +95,5 @@ What's new
 
 
 * BUILD/INSTALLATION
+
+- Add support for automake 1.16.