X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=52ca5ca39b7ec581c64103cb17fc4f355047b6f7;hb=dfbf4c483992682db23ca3b9ba7edd6cf05e1185;hp=4350394d2a24c399d69135c142844dd770214f0a;hpb=14d00c9d248ac1e3c4d32fa6d63eca0dcea70c6a;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 4350394d2a..52ca5ca39b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 
 ACLOCAL="aclocal -I m4 -I config"
 AUTOHEADER="autoheader"
-AUTOMAKE="automake --add-missing --copy --foreign"
+AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
 AUTOCONF="autoconf"
 
 # Discover what version of automake we are using.
@@ -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.5"
+    echo "LyX requires automake >= 1.14"
     exit 1
 }
 
 case $automake_version in
-    *' '1.[5-9]*|*' '1.10*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.5 to 1.10."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
@@ -32,16 +31,18 @@ autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 test "$autoversion" != "" && {
     echo "Using $autoversion"
 } || {
-    echo "LyX requires autoconf >= 2.52"
+    echo "LyX requires autoconf >= 2.65"
     exit 1
 }
 
 case $autoversion in
-    *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-2])
+    *' '2.6[5-9])
+	;;
+    *' '2.71)
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.52-2.61."
+	echo "LyX only supports autoconf 2.65-2.69, 2.71."
 	exit 1
 	;;
 esac
@@ -84,8 +85,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