X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=b58c27bf8ef1bdae130a7004f22a04454f41cc71;hb=43dd383073fc61cfe5f24b87294c4e8698a1827a;hp=8eb194ed6db70bc0ac59ec17a63133b18758fd85;hpb=b9d5328daeebd072d32197bd2abf5387fbff1464;p=lyx.git diff --git a/autogen.sh b/autogen.sh index 8eb194ed6d..b58c27bf8e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,12 +16,11 @@ test "$automake_version" != "" && { } case $automake_version in - *' '1.[8-9]*|*' '1.1[0123]*) + *' '1.[8-9]*|*' '1.1[012345]*) ;; *) - echo "This automake version is not supported by LyX." - echo "LyX only supports automake 1.8 to 1.13." + echo "LyX only supports automake 1.8 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.60" exit 1 } - case $autoversion in - *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9]) + *' '2.60[ab]|*' '2.6[0-9]) ;; *) echo "This autoconf version is not supported by LyX." - echo "LyX only supports autoconf 2.59c-2.69." + echo "LyX only supports autoconf 2.60-2.69." exit 1 ;; esac @@ -85,7 +83,9 @@ else fi echo "Building po/POTFILES.in..." -if (! make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then +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