X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=b58c27bf8ef1bdae130a7004f22a04454f41cc71;hb=e4842c77d6e210919d00c103e1d33f973ac96033;hp=c2582165294412fe132a0f706556f357eb441c19;hpb=c1fa134b90d2cea8b5f99719a5c202e2467decce;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index c258216529..b58c27bf8e 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.8"
     exit 1
 }
 
 case $automake_version in
-    *' '1.[5-9]*|*' '1.1[01]*)
+    *' '1.[8-9]*|*' '1.1[012345]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.5 to 1.11."
+	echo "LyX only supports automake 1.8 to 1.15."
 	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.60"
     exit 1
 }
 
-
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-4])
+    *' '2.60[ab]|*' '2.6[0-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.64."
+	echo "LyX only supports autoconf 2.60-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