X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=a12f744542194c460b55f49b9930e71a5c2210fd;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=5fc3d1bd57379b11c9d4525bc5620d0907fa5d76;hpb=ae872178fb90a9561582a61ee1fe036f7aa5aa93;p=lyx.git diff --git a/autogen.sh b/autogen.sh index 5fc3d1bd57..a12f744542 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,12 +16,12 @@ test "$automake_version" != "" && { } case $automake_version in - *' '1.[8-9]*|*' '1.1[01]*) + *' '1.[8-9]*|*' '1.1[0123]*) ;; *) 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.8 to 1.13." 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-8]) + *' '2.60[ab]|*' '2.6[0-9]) ;; *) echo "This autoconf version is not supported by LyX." - echo "LyX only supports autoconf 2.59c-2.68." + echo "LyX only supports autoconf 2.60-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