Detect node-gyp at configure time and show version in javascript_version target

Examples/Makefile.in

@@ -604,6 +604,8 @@ JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
 JSSO =@JSSO@
 JSLDSHARED = @JSLDSHARED@
 JSCXXSHARED = @JSCXXSHARED@
+NODEJS = @NODEJS@
+NODEGYP = @NODEGYP@
 
 # ----------------------------------------------------------------
 # Creating and building Javascript wrappers
@@ -623,9 +625,8 @@ javascript_build_cpp:: $(SRCS)
 	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(JSINCLUDES)
 	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
-# TODO: make node-gyp configurable and detected via ./configure
 javascript_build_node: $(SRCS)
-	node-gyp --loglevel=silent configure build 1>>/dev/null
+	$(NODEGYP) --loglevel=silent configure build 1>>/dev/null
 
 # These targets are used by the test-suite:
 
@@ -649,42 +650,35 @@ javascript_custom_interpreter:
 javascript_run: javascript_custom_interpreter
 	$(ROOT_DIR)/Tools/javascript/javascript -$(JSENGINE) -L $(TARGET) runme.js
 
-# TODO: make node configurable and detected via ./configure
 javascript_run_node:
-	@NODEJS@ runme.js
+	$(NODEJS) runme.js
 
 # -----------------------------------------------------------------
 # Version display
 # -----------------------------------------------------------------
 
-ifeq (, $(ENGINE))
 javascript_version:
-	@ if [ "@NODEJS@" != "" ]; then \
+ifeq (, $(ENGINE))
-		echo "Node.js: `(@NODEJS@ --version)`"; \
+	@ if [ "$(NODEJS)" != "" ]; then \
+		echo "Node.js: `($(NODEJS) --version)`"; \
 	  else \
 	    echo "Version depends on the interpreter"; \
 	  fi
 endif
-
 ifeq (node, $(ENGINE))
-javascript_version:
+	$(NODEJS) --version
-	@NODEJS@ --version
 endif
-
 ifeq (jsc, $(ENGINE))
-javascript_version:
 	@ if [ "@JSCOREVERSION@" != "" ]; then \
 		echo "@JSCOREVERSION@"; \
 	  else \
 	    echo "Unknown JavascriptCore version."; \
 	  fi
 endif
-
 ifeq (v8, $(ENGINE))
-javascript_version:
 	echo "Unknown v8 version."
 endif
-
+	echo "node-gyp: `($(NODEGYP) --version)`"
 
 # -----------------------------------------------------------------
 # Cleaning the javascript examples

Examples/test-suite/javascript/Makefile.in

@@ -3,6 +3,7 @@
 #######################################################################
 
 LANGUAGE     = javascript
+NODEGYP = @NODEGYP@
 SCRIPTSUFFIX = _runme.js
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
@@ -104,7 +105,7 @@ ifeq (node,$(JSENGINE))
 		$(SWIG) -c++ -javascript $(SWIGOPT) ../$*.i;
 
 	nodejs_swig_and_compile = \
-		node-gyp --loglevel=silent --directory $* configure build 1>>/dev/null
+		$(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null
 
 	run_testcase = \
 		if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \

configure.ac

@@ -1131,11 +1131,14 @@ else
   esac
 
   #----------------------------------------------------------------
-  # Look for Node.js which is the default javascript engine
+  # Look for Node.js which is the default Javascript engine
   #----------------------------------------------------------------
 
   AC_CHECK_PROGS(NODEJS, node)
 
+  # node-gyp is needed to run the test-suite/examples for all Javascript engines
+  AC_CHECK_PROGS(NODEGYP, node-gyp)
+
   #----------------------------------------------------------------
   # Look for JavascriptCore (Webkit) settings (JSCOREINCDIR, JSCOREDYNAMICLINKING)
   #----------------------------------------------------------------
@@ -1302,6 +1305,7 @@ AC_SUBST(JSCENABLED)
 AC_SUBST(JSV8ENABLED)
 
 AC_SUBST(NODEJS)
+AC_SUBST(NODEGYP)
 
 #----------------------------------------------------------------
 # Look for gcj
@@ -2455,7 +2459,7 @@ fi
 AC_SUBST(SKIP_JAVA)
 
 SKIP_JAVASCRIPT=
-if test -z "$JAVASCRIPT" || test -z "$NODEJS"; then
+if test -z "$JAVASCRIPT" || test -z "$NODEJS" || test -z "$NODEGYP"; then
     SKIP_JAVASCRIPT="1"
 fi
 AC_SUBST(SKIP_JAVASCRIPT)