X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=2cacc5c4133fbd5f2491eb8c1dba207e586a04f7;hb=4f865d0f4d870032451dc3578b547abc158a7e42;hp=da8b6aa655b94b22d1c2771e692ec4bf36c9b023;hpb=b6ba2c03a729aa44f93ea4c748b26319ce5d39e5;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index da8b6aa655..2cacc5c413 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.8"
+    echo "LyX requires automake >= 1.14"
     exit 1
 }
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[01]*)
+    *' '1.1[45]*)
 	;;
     *)
-
 	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.14 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.65"
     exit 1
 }
 
-
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-5])
+    *' '2.6[5-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.65."
+	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