X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=52ca5ca39b7ec581c64103cb17fc4f355047b6f7;hb=8b7c1d7800c73c4c7b897d2b81a0f3f720c8d06d;hp=a12f744542194c460b55f49b9930e71a5c2210fd;hpb=1d08d5232d0ab6093267678a1f3cfae23913c9b5;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index a12f744542..52ca5ca39b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,17 +11,16 @@ automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
 test "$automake_version" != "" && {
     echo "Using $automake_version"
 } || {
-    echo "LyX requires automake >= 1.8"
+    echo "LyX requires automake >= 1.14"
     exit 1
 }
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[0123]*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.8 to 1.13."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
@@ -32,17 +31,18 @@ autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 test "$autoversion" != "" && {
     echo "Using $autoversion"
 } || {
-    echo "LyX requires autoconf >= 2.60"
+    echo "LyX requires autoconf >= 2.65"
     exit 1
 }
 
-
 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
@@ -85,7 +85,9 @@ else
 fi
 
 echo "Building po/POTFILES.in..."
-if (! make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+if ( make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+    :
+else
 	echo "Building po/POTFILES.in failed -- aborting"
 	exit 1
 fi