make non js builds compile

make js support compile with older debian/ubuntu packaging


svn path=/trunk/netsurf/; revision=13990

8 files changed, 20 insertions, 12 deletions

diff --git a/Docs/LIBRARIES b/Docs/LIBRARIES
index 55305aaaa..ac8f29822 100644
--- a/Docs/LIBRARIES
+++ b/Docs/LIBRARIES
@@ -15,6 +15,7 @@
       $ svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet
       $ svn co svn://svn.netsurf-browser.org/trunk/hubbub
       $ svn co svn://svn.netsurf-browser.org/trunk/libcss
+      $ svn co svn://svn.netsurf-browser.org/trunk/libdom
       $ svn co svn://svn.netsurf-browser.org/trunk/libnsbmp
       $ svn co svn://svn.netsurf-browser.org/trunk/libnsgif
       $ svn co svn://svn.netsurf-browser.org/trunk/libdom
@@ -36,7 +37,7 @@
   Framebuffer front end
 =======================
 
-  Optional:
+  Required:
 
       $ svn co svn://svn.netsurf-browser.org/trunk/libnsfb
 
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 2e658e6b6..488b8491f 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -15,6 +15,7 @@ NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
 NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP
 NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
 NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
+NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
 
 # add a line similar to below for each optional pkg-configed lib here
 $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG))
@@ -24,11 +25,16 @@ $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
 $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
 $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG  ))
 $(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,Video))
+$(eval $(call pkg_config_find_and_add,MOZJS,mozjs185,JavaScript))
 $(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript))
 
 # no pkg-config for this library
 $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp)))
 
+ifeq ($(NETSURF_USE_MOZJS),YES)
+NETSURF_USE_JS:=YES
+endif
+
 # GTK and GLIB flags to disable depricated usage
 GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
 		-DG_DISABLE_DEPRECATED \
diff --git a/javascript/jsapi.c b/javascript/jsapi.c
index da979c458..d1372442c 100644
--- a/javascript/jsapi.c
+++ b/javascript/jsapi.c
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mozjs/jsapi.h"
+#include "javascript/jsapi.h"
 
 #include "content/content.h"
 #include "javascript/content.h"
-#include "javascript/jsapi.h"
 #include "javascript/js.h"
 
 #include "utils/log.h"
diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index 61dc82c81..71abb8c20 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -23,6 +23,12 @@
 #ifndef _NETSURF_JAVASCRIPT_JSAPI_H_
 #define _NETSURF_JAVASCRIPT_JSAPI_H_
 
+#ifdef WITH_MOZJS
+#include "js/jsapi.h"
+#else
+#include "mozjs/jsapi.h"
+#endif
+
 #if JS_VERSION <= 180
 inline JSObject *
 JS_NewCompartmentAndGlobalObject(JSContext *cx, 
diff --git a/javascript/jsapi/console.c b/javascript/jsapi/console.c
index 8621d810c..2d971e44d 100644
--- a/javascript/jsapi/console.c
+++ b/javascript/jsapi/console.c
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mozjs/jsapi.h"
-
-#include "content/content.h"
 #include "javascript/jsapi.h"
+
+//#include "content/content.h"
 #include "utils/log.h"
 
 static JSBool jsdebug(JSContext *cx, uintN argc, jsval *vp)
diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c
index fe13af13e..c73dac721 100644
--- a/javascript/jsapi/document.c
+++ b/javascript/jsapi/document.c
@@ -16,10 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mozjs/jsapi.h"
-
-#include "content/content.h"
 #include "javascript/jsapi.h"
+
 #include "utils/log.h"
 
 static JSFunctionSpec jsfunctions_document[] = {
diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c
index d4941d70f..11a59b5ff 100644
--- a/javascript/jsapi/window.c
+++ b/javascript/jsapi/window.c
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mozjs/jsapi.h"
+#include "javascript/jsapi.h"
 
 #include "content/content.h"
-#include "javascript/jsapi.h"
 #include "utils/log.h"
 
 /* IDL 
diff --git a/javascript/none.c b/javascript/none.c
index ec0ccc0f8..66ee03d85 100644
--- a/javascript/none.c
+++ b/javascript/none.c
@@ -42,7 +42,7 @@ void js_destroycontext(jscontext *ctx)
 {
 }
 
-jsobject *js_newcompartment(jscontext *ctx, struct content* c)
+jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
 {
 	return NULL;
 }