configure.ac

[lyx.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index b6df1b3cdabe74bd1b681e0d7f6e7123269bb180..54f57ae3d2656cbc8129d07ffa24365d5103b5cd 100755 (executable)
--- 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[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
@@ -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-578])
+    *' '2.6[5-9])
        ;;
     *)
        echo "This autoconf version is not supported by LyX."
-       echo "LyX only supports autoconf 2.59c-2.65, 2.67 and 2.68."
+       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