X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=54f57ae3d2656cbc8129d07ffa24365d5103b5cd;hb=fcc5140b63aff0bcdab812bc7b148848915f7362;hp=8b4896024b64028a248752c78c19b6452e65362d;hpb=366b21d4d30e2d24fab763ff8bbd004218e98e33;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 8b4896024b..54f57ae3d2 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[012]*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.8 to 1.12."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
@@ -32,17 +31,16 @@ autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 test "$autoversion" != "" && {
     echo "Using $autoversion"
 } || {
-    echo "LyX requires autoconf >= 2.59c"
+    echo "LyX requires autoconf >= 2.65"
     exit 1
 }
 
-
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9])
+    *' '2.6[5-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.69."
+	echo "LyX only supports autoconf 2.65-2.69."
 	exit 1
 	;;
 esac
@@ -85,8 +83,13 @@ else
 fi
 
 echo "Building po/POTFILES.in..."
-make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in
+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
 
 echo
-echo 'run "./configure ; make"'
+echo 'run "./configure && make"'
 echo