From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 3 Mar 2015 09:59:11 +0000 (+0100)
Subject: Allow automake 1.15.
X-Git-Tag: 2.2.0alpha1~1248
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d33f4c91f24ed9bb8baf09d23525ff045e2055ea;p=features.git

Allow automake 1.15.
---

diff --git a/INSTALL b/INSTALL
index 4d5c0e88e4..a3d4914b29 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,7 +36,7 @@ Note for Git checkouts
 -----------------------------
 
 If you have checked this out from Git, you need to have:
-* automake (supported versions are 1.8--1.14)
+* automake (supported versions are 1.8--1.15)
 * autoconf (supported versions are 2.60--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 750d7a7bc5..64be9af984 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,12 +16,12 @@ test "$automake_version" != "" && {
 }
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[01234]*)
+    *' '1.[8-9]*|*' '1.1[012345]*)
 	;;
     *)
 
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.8 to 1.14."
+	echo "LyX only supports automake 1.8 to 1.15."
 	exit 1
 	;;
 esac