X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=8e8942af3b1515b2222fd6ed13d6c0e32b2982ff;hb=b4db3ea13710afc38054005a4d88cb4e36659d88;hp=5b1fcbfc1f640dcd257179bcd47a0e0841def238;hpb=96d9324f4d66230a8f931d9bbec460a156b30f0d;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 5b1fcbfc1f..8e8942af3b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,49 +2,28 @@
 
 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.5"
+else
+    echo "LyX requires automake >= 1.14"
     exit 1
-}
-
-case $automake_version in
-    *' '1.[5-9]*|*' '1.10*)
-	;;
-    *)
-
-	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.5 to 1.10."
-	exit 1
-	;;
-esac
+fi
 
 # 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.52"
+else
+    echo "LyX requires autoconf >= 2.65"
     exit 1
-}
-
-case $autoversion in
-    *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-2])
-	;;
-    *)
-	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.52-2.61."
-	exit 1
-	;;
-esac
+fi
 
 # Delete old cache directories.
 # automake will stop if their contents was created by an earlier version.
@@ -84,8 +63,13 @@ else
 fi
 
 echo "Building po/POTFILES.in..."
-make -s -f po/Rules-lyx srcdir=po top_srcdir=.
+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