X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=b03318f9a63b3d665302a1eac12dd84ade35906b;hb=ad42e885e684cc440493b510e4ee786ab6b01fd2;hp=b6df1b3cdabe74bd1b681e0d7f6e7123269bb180;hpb=8a5cde8fbf4dbe120b709bca7bbd3974bcbfbbe2;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index b6df1b3cda..b03318f9a6 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.
@@ -16,12 +16,12 @@ test "$automake_version" != "" && {
 }
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[01]*)
+    *' '1.[8-9]*|*' '1.1[012]*)
 	;;
     *)
 
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.8 to 1.11."
+	echo "LyX only supports automake 1.8 to 1.12."
 	exit 1
 	;;
 esac
@@ -38,11 +38,11 @@ test "$autoversion" != "" && {
 
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-578])
+    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.65, 2.67 and 2.68."
+	echo "LyX only supports autoconf 2.59c-2.69."
 	exit 1
 	;;
 esac
@@ -85,8 +85,11 @@ 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
+	echo "Building po/POTFILES.in failed -- aborting"
+	exit 1
+fi
 
 echo
-echo 'run "./configure ; make"'
+echo 'run "./configure && make"'
 echo