X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=0365a10165f105d4c6198c1508c90f7f5e162709;hb=db1a443a70eb6d7c30371f2cc9242634ec2fe951;hp=b58c27bf8ef1bdae130a7004f22a04454f41cc71;hpb=4bb8725c69aae575633a1374a847ba9973c11915;p=features.git

diff --git a/autogen.sh b/autogen.sh
index b58c27bf8e..0365a10165 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,41 +6,43 @@ AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
 AUTOCONF="autoconf"
 
 # Discover what version of automake we are using.
-automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+automake_version=$($AUTOMAKE --version 2>/dev/null | head -n 1)
 
-test "$automake_version" != "" && {
+if test "$automake_version" != ""; then
     echo "Using $automake_version"
-} || {
-    echo "LyX requires automake >= 1.8"
+else
+    echo "LyX requires automake >= 1.14"
     exit 1
-}
+fi
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[012345]*)
+    *' '1.1[456]*)
 	;;
     *)
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.8 to 1.15."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
 
 # Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
+autoversion=$($AUTOCONF --version 2>/dev/null | head -n 1)
 
-test "$autoversion" != "" && {
+if test "$autoversion" != ""; then
     echo "Using $autoversion"
-} || {
-    echo "LyX requires autoconf >= 2.60"
+else
+    echo "LyX requires autoconf >= 2.65"
     exit 1
-}
+fi
 
 case $autoversion in
-    *' '2.60[ab]|*' '2.6[0-9])
+    *' '2.6[5-9])
+	;;
+    *' '2.71)
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.60-2.69."
+	echo "LyX only supports autoconf 2.65-2.69, 2.71."
 	exit 1
 	;;
 esac