X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=0365a10165f105d4c6198c1508c90f7f5e162709;hb=3c88f7ef10207427ca00918b9e2369a37e6ddb45;hp=cd3fc31b0073842f92eba533bedd286ee29ba502;hpb=cac2559d7febee8d89f561b742eab009ad9fe1a5;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index cd3fc31b00..0365a10165 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,47 +2,47 @@
 
 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.
-automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+automake_version=$($AUTOMAKE --version 2>/dev/null | head -n 1)
 
-test "$automake_version" != "" && {
+if test "$automake_version" != ""; then
     echo "Using $automake_version"
-} || {
-    echo "LyX requires automake >= 1.8"
+else
+    echo "LyX requires automake >= 1.14"
     exit 1
-}
+fi
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[01]*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	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 through 1.16."
 	exit 1
 	;;
 esac
 
 # Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
+autoversion=$($AUTOCONF --version 2>/dev/null | head -n 1)
 
-test "$autoversion" != "" && {
+if test "$autoversion" != ""; then
     echo "Using $autoversion"
-} || {
-    echo "LyX requires autoconf >= 2.59c"
+else
+    echo "LyX requires autoconf >= 2.65"
     exit 1
-}
-
+fi
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-578])
+    *' '2.6[5-9])
+	;;
+    *' '2.71)
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.65, 2.67 and 2.58."
+	echo "LyX only supports autoconf 2.65-2.69, 2.71."
 	exit 1
 	;;
 esac
@@ -85,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