diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 250ce4e0e..4f20b83b8 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -519,10 +519,22 @@ java_clean:
 
 # You need to set this variable to the jscore[or other javascript engine] directories containing the
 # files "JavaScript.h" and others
-JS_INCLUDE= @JSCOREINC@
+
+ifeq (,$(V8))
+  JS_INCLUDE = @JSCOREINC@
+  JS_DLNK    = @JSCOREDYNAMICLINKING@
+else
+  JS_INCLUDE = @JSV8INC@
+  JS_DLNK    = @JSCOREDYNAMICLINKING@
+endif
+
+ifeq (,$(V8))
+  SWIGJS     = $(SWIG) -javascript -jsc
+else
+  SWIGJS     = $(SWIG) -javascript -v8
+endif
 
 # Extra JAVASCRIPT specific dynamic linking options
-JS_DLNK  = @JSCOREDYNAMICLINKING@
 JS_LIBPREFIX = @JSCORELIBRARYPREFIX@
 JSSO =@JSCORESO@
 JSLDSHARED = @JSCORELDSHARED@
@@ -535,7 +547,7 @@ JSCXXFLAGS = @JSCXXFLAGS@
 # ----------------------------------------------------------------
 
 javascript: $(SRCS)
-	$(SWIG) -javascript -jsc -debug-codetemplates $(SWIGOPT) $(INTERFACEPATH)
+	$(SWIGJS) $(SWIGOPT) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) $(JSCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JS_INCLUDE)
 	$(JSLDSHARED) $(CCSHARED) $(JSCFLAGS) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO)
 
@@ -544,7 +556,7 @@ javascript: $(SRCS)
 # ----------------------------------------------------------------
 
 javascript_cpp: $(SRCS)
-	$(SWIG) -c++ -javascript -jsc -debug-codetemplates $(SWIGOPT) $(INTERFACEPATH)
+	$(SWIGJS) -c++ $(SWIGOPT) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) $(JSCXXFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JS_INCLUDE)
 	$(JSCXXSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO)
 
@@ -559,7 +571,7 @@ javascript_exe: $(SRCS)
 # ----------------------------------------------------------------
 
 javascript_run: $(SRCS)
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(JAVASCRIPT_EXE) -l $(JAVASCRIPT_MODULE) $(JS_SCRIPT)
+	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(JAVASCRIPT_EXE) -l $(TARGET) $(JS_SCRIPT)
 
 # -----------------------------------------------------------------
 # Cleaning the javascript examples
diff --git a/Examples/javascript/class/Makefile b/Examples/javascript/class/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/class/Makefile
+++ b/Examples/javascript/class/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/constant/Makefile b/Examples/javascript/constant/Makefile
index 4bc75b1a0..1ac61ec6b 100755
--- a/Examples/javascript/constant/Makefile
+++ b/Examples/javascript/constant/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS =
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/enum/Makefile b/Examples/javascript/enum/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/enum/Makefile
+++ b/Examples/javascript/enum/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/exception/Makefile b/Examples/javascript/exception/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/exception/Makefile
+++ b/Examples/javascript/exception/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/functor/Makefile b/Examples/javascript/functor/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/functor/Makefile
+++ b/Examples/javascript/functor/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/namespace/Makefile b/Examples/javascript/namespace/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/namespace/Makefile
+++ b/Examples/javascript/namespace/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/operator/Makefile b/Examples/javascript/operator/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/operator/Makefile
+++ b/Examples/javascript/operator/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/overload/Makefile b/Examples/javascript/overload/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/overload/Makefile
+++ b/Examples/javascript/overload/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/pointer/Makefile b/Examples/javascript/pointer/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/pointer/Makefile
+++ b/Examples/javascript/pointer/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/reference/Makefile b/Examples/javascript/reference/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/reference/Makefile
+++ b/Examples/javascript/reference/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/simple/Makefile b/Examples/javascript/simple/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/simple/Makefile
+++ b/Examples/javascript/simple/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/template/Makefile b/Examples/javascript/template/Makefile
index ea41e55ce..1ac61ec6b 100755
--- a/Examples/javascript/template/Makefile
+++ b/Examples/javascript/template/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.cpp
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/Examples/javascript/variables/Makefile b/Examples/javascript/variables/Makefile
index e80e370e0..1ac61ec6b 100755
--- a/Examples/javascript/variables/Makefile
+++ b/Examples/javascript/variables/Makefile
@@ -1,17 +1,16 @@
 TOP = ../..
 SWIG = $(TOP)/../preinst-swig
-SRCS = example.c
-JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JAVASCRIPT_EXE = $(TOP)/../Tools/javascript/javascript
-JAVASCRIPT_MODULE = example
+CXXSRCS    = example.cpp
+JSCXXSRCS = $(TOP)/../Tools/javascript/javascript.cxx
 JS_SCRIPT = runme.js
 TARGET = example
 INTERFACE = example.i
 SWIGOPT = -I$(TOP)/../Lib/javascript -I$(TOP)/../Lib/javascript/jsc
 
 all::
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_cpp
 
 clean::
 	$(MAKE) -f $(TOP)/Makefile javascript_clean
@@ -20,5 +19,5 @@ check:: all
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
 		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' javascript_exe
 	$(MAKE) -f $(TOP)/Makefile JSCXXSRCS='$(JSCXXSRCS)' TARGET='$(TARGET)' \
-		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JAVASCRIPT_MODULE='$(JAVASCRIPT_MODULE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
+		JAVASCRIPT_EXE='$(JAVASCRIPT_EXE)' JS_SCRIPT='$(JS_SCRIPT)' javascript_run
 
diff --git a/configure.in b/configure.in
index 92955c4c0..f3d7e4ccd 100644
--- a/configure.in
+++ b/configure.in
@@ -1088,6 +1088,8 @@ AC_MSG_NOTICE([Disabling Javascript])
 JAVASCRIPT=
 else
 
+###     JavascriptCore     ###
+
 # check for include files
 AC_MSG_CHECKING(for include file JavaScriptCore/JavaScript.h)
 AC_ARG_WITH(javascriptincl, [  --with-javascript=path    Set location of Javascript include directory], [JSCOREINCDIR="$withval"], [JSCOREINCDIR=])
@@ -1153,7 +1155,6 @@ else
 AC_MSG_RESULT($JSCORELIB)
 fi
 
-
 # linking options
 case $host in
 *-*-darwin*) 
@@ -1176,10 +1177,9 @@ case $host in
 *) JSCORELIBRARYPREFIX="lib";;
 esac
 
-if "$JS_NO_WARNINGS" == "1"; then
+if test "$JS_NO_WARNINGS" == "1"; then
 case $host in
 *-*-darwin* | *-*-linux* | *-*-cygwin* | *-*-mingw*) 
-  echo "HHHHHHHHHHHHHHHHHHHHHHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
   JSCXXFLAGS="`echo $CXXFLAGS | sed 's/-Wall//g'`"
   ;;
 *)
@@ -1211,6 +1211,78 @@ AC_SUBST(JSCORELDSHARED)
 AC_SUBST(JSCORECXXSHARED)
 AC_SUBST(JSCXXFLAGS)
 
+###    V8     ###
+
+# check for include files
+AC_MSG_CHECKING(for include file v8.h)
+AC_ARG_WITH(javascriptv8incl, [  --with-javascript-v8=path    Set location of Javascript include directory], [JSV8INCDIR="$withval"], [JSV8INCDIR=])
+
+if test -z "$JSV8INCDIR"; then
+  JSV8INCDIR="/usr/include/ /usr/local/include/"
+
+  # Add in default directory for JavaScriptCore headers for Linux and MacOSX
+  case $host in
+  *-*-linux*) JSV8INCDIR="/usr/include /usr/local/include/ $JSV8INCDIR";;
+  *-*-darwin*) JSV8INCDIR="$JSV8INCDIR";; #TODO: add configuration for osx
+  *);;
+  esac
+fi
+
+for d in $JSV8INCDIR ; do
+  if test -r "$d/v8.h" ; then
+    AC_MSG_RESULT($d)
+    JSV8INCDIR=$d
+    JSV8INC=-I\"$d\"
+    break
+  fi
+done
+
+if test "$JSV8INC" = "" ; then
+  AC_MSG_RESULT(not found)
+fi
+
+
+# check for V8 library
+AC_ARG_WITH(jsv8lib,[  --with-jsv8lib =path      Set location of V8 library directory],[
+	JSV8LIB="-L$withval"], [JSV8LIB=])
+AC_MSG_CHECKING(for V8 library)
+
+if test -z "$JSV8LIB"; then
+dirs="/usr/lib/ /usr/local/lib/"
+for i in $dirs ; do
+
+    if test -r $i/libv8.so; then
+            AC_MSG_RESULT($i)
+            JSV8LIB="-L$i -lv8"
+            break
+    fi
+done
+
+if test "$JSV8LIB" = "" ; then
+	AC_MSG_RESULT(not found)
+fi
+
+else
+AC_MSG_RESULT($JSCORELIB)
+fi
+
+
+# linking options
+case $host in
+*-*-darwin*) 
+        JSV8DYNAMICLINKING="" # TODO: add osx configuration
+        ;;
+*-*-linux*) 
+        JSV8DYNAMICLINKING="$JSV8LIB"
+        ;;
+*)
+        JSV8DYNAMICLINKING=""
+        ;;
+esac
+
+AC_SUBST(JSV8INC)
+AC_SUBST(JSV8DYNAMICLINKING)
+
 #----------------------------------------------------------------
 # Look for gcj
 #----------------------------------------------------------------
@@ -2372,10 +2444,10 @@ fi
 AC_SUBST(SKIP_JAVA)
 
 SKIP_JAVASCRIPT=
-if test -z "$JSCOREINC"; then
+if test -z "$JSCOREINC" && test -z "$JSV8INC"; then
   # Add in default directory for JavaScriptCore headers for Linux and MacOSX 
   case $host in
-  *-*-linux*) if test -z "$JSCORELIB"; then
+  *-*-linux*) if test -z "$JSCORELIB" && test -z "$JSV8LIB"; then
 			  SKIP_JAVASCRIPT="1"
 			  fi
 			  ;;