X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=edc6c40fa21e0008b5b6d4eae292ed30404c4d6b;hb=8033cd9a9ae95343aaaeb6b24bbd21ca9b1664b6;hp=291865840c4b5bf929520207ee55926f71114e67;hpb=7d4b69d2dcd608e4dba95c5e391bdccfa6187d49;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 291865840c..edc6c40fa2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,47 +2,45 @@
 
 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
-}
+fi
 
 case $automake_version in
-    *' '1.[5-9]*|*' '1.10*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.5 to 1.10."
+	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-3])
+    *' '2.6[5-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.63."
+	echo "LyX only supports autoconf 2.65-2.69."
 	exit 1
 	;;
 esac
@@ -68,9 +66,6 @@ else
 	exit 1
 fi
 
-echo "Building lib/doc/Makefile.depend..."
-python lib/doc/depend.py > lib/doc/Makefile.depend
-
 echo "Building Makefile templates..."
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
 	$AUTOMAKE
@@ -88,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