X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=8afd4bfd78d64e45ff433d7af07d6342b511fe64;hb=067fbe49cdc29e1d62cd5379f215b9bcb412bff0;hp=8b4896024b64028a248752c78c19b6452e65362d;hpb=366b21d4d30e2d24fab763ff8bbd004218e98e33;p=lyx.git diff --git a/autogen.sh b/autogen.sh index 8b4896024b..8afd4bfd78 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[0123]*) ;; *) 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.13." exit 1 ;; esac @@ -38,11 +38,11 @@ test "$autoversion" != "" && { case $autoversion in - *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9]) + *' '2.59d|*' '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.59d-2.69." exit 1 ;; esac @@ -85,8 +85,11 @@ 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"' +echo 'run "./configure && make"' echo