configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f46d5e98451b03ff9fe7bc4eb29de92c7a24c75e
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Apr 1 13:13:44 2019 +0200
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Mon Apr 1 13:37:35 2019 +0200
NPM: require at least v5.0.0
This is necessary after 338563ab451fcb02eaf70b1bbc460d299371f2b4
Change-Id: I026dba613349931a95fd71b126e72605d1546140
Reviewed-on: https://gerrit.libreoffice.org/70054
Reviewed-by: Alexandru Vlăduţu <alexandru.vlad...@1and1.ro>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 91a90e984..bb583b2d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,8 +633,8 @@ AS_IF([test `uname -s` = "Linux"],
AC_MSG_ERROR([npm required to build loleaflet, but not installed])
else
NPM_VER=`npm -v | awk -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
- if test "$NPM_VER" -ge 30900 -a "$NPM_VER" -lt 31004; then
- AC_MSG_ERROR([This npm version is buggy, either upgrade to >=
3.10.4 or downgrade to < 3.9.0])
+ if test "$NPM_VER" -lt 50000; then
+ AC_MSG_ERROR([This npm version is too old, upgrade to >= 5.0.0])
fi
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
