X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=autogen.sh;h=750d7a7bc590057c1c66cc776786476cbc978982;hb=0c1a0b603819cbe7cda72a74e7313a215aeba913;hp=a00eebe085ea552311ad381812fff2995916e0c1;hpb=b5edeac1e861edddc92391fb381b928577f41f2c;p=lyx.git diff --git a/autogen.sh b/autogen.sh index a00eebe085..750d7a7bc5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,12 +16,12 @@ test "$automake_version" != "" && { } case $automake_version in - *' '1.[8-9]*|*' '1.1[012]*) + *' '1.[8-9]*|*' '1.1[01234]*) ;; *) echo "This automake version is not supported by LyX." - echo "LyX only supports automake 1.8 to 1.12." + echo "LyX only supports automake 1.8 to 1.14." exit 1 ;; esac @@ -32,17 +32,17 @@ 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 +85,10 @@ 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 + echo "Building po/POTFILES.in failed -- aborting" + exit 1 +fi echo echo 'run "./configure && make"'