configure.ac | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit c54790def5dc191c358ebcc463cc33e5b5813216
Author: Miklos Vajna <[email protected]>
Date: Wed Mar 7 13:45:27 2018 +0100
configure: require nodejs 6
Build will fail for nodejs 4 anyway, so fail early in configure.
Change-Id: I0be746454cd21401195f8bf72a4eb107a3433fd7
Reviewed-on: https://gerrit.libreoffice.org/50889
Reviewed-by: Andras Timar <[email protected]>
Tested-by: Andras Timar <[email protected]>
diff --git a/configure.ac b/configure.ac
index fee51a265..6f101a259 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,6 +425,16 @@ else
fi
fi
+AC_PATH_PROG(NODE, node, no)
+if test "$NODE" = "no"; then
+ AC_MSG_ERROR([node required to build loleaflet, but not installed])
+else
+ NODE_VER=`node --version | sed 's/^v//' | awk -F. '{ print (($1 * 100) +
$2) * 100 + $3;}'`
+ if test "$NODE_VER" -lt 60000; then
+ AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0])
+ fi
+fi
+
test "$prefix" = NONE && prefix=$ac_default_prefix
LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
while :; do
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
