configure.ac | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit d881f59b08fd990b019c024645112e8652449b96
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Tue Apr 18 14:50:02 2017 +0200
Check if npm is installed and detect buggy version
shrinkpack won't work with npm versions between <3.9.0, 3.10.3>,
for details, see https://github.com/JamieMason/shrinkpack/issues/45
Change-Id: I65e1413f2ba24cc81736c12924afb20ca50004be
Reviewed-on: https://gerrit.libreoffice.org/36640
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit 6416fe9d1bae43b47426dc0e6ca714e440581249)
Reviewed-on: https://gerrit.libreoffice.org/36693
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/configure.ac b/configure.ac
index e9548b75..84a6128c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,6 +281,16 @@ int main(int argc, char **argv)
[AC_MSG_RESULT([Yes])
LIBS="$LIBS -lpcre"])
+AC_PATH_PROG(NPM, npm, no)
+if test "$NPM" = "no"; then
+ 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])
+ fi
+fi
+
test "$prefix" = NONE && prefix=$ac_default_prefix
LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
while :; do
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
