aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchris <chris@e22d1c8e-a203-0410-8502-864332bf3fbf>2007-12-03 13:42:13 +0000
committerchris <chris@e22d1c8e-a203-0410-8502-864332bf3fbf>2007-12-03 13:42:13 +0000
commit3fa76c469f485a1b87496b833b6c550251f5af24 (patch)
tree65d0d1409eb0574950bd25a172402beabde09d23
parent937971a245f2b2beda09421f5975e7b45ff34c60 (diff)
downloadweb-sato-3fa76c469f485a1b87496b833b6c550251f5af24.tar.gz
web-sato-3fa76c469f485a1b87496b833b6c550251f5af24.tar.bz2
web-sato-3fa76c469f485a1b87496b833b6c550251f5af24.zip
* configure.ac:
* src/gtkhtml2/web_gtkhtml2_js.c: * src/gtkhtml2/web_gtkhtml2_js.h: Quick hack to build with xulrunner-js * patches/series: Remove at-import/box-pos patch, applied upstream git-svn-id: https://svn.o-hand.com/repos/web/trunk@98 e22d1c8e-a203-0410-8502-864332bf3fbf
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac6
-rw-r--r--patches/series1
-rw-r--r--src/gtkhtml2/web_gtkhtml2_js.c6
-rw-r--r--src/gtkhtml2/web_gtkhtml2_js.h2
5 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f674901..c68f122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-03 Chris Lord <chris@openedhand.com>
+
+ * configure.ac:
+ * src/gtkhtml2/web_gtkhtml2_js.c:
+ * src/gtkhtml2/web_gtkhtml2_js.h:
+ Quick hack to build with xulrunner-js
+
+ * patches/series:
+ Remove at-import/box-pos patch, applied upstream
+
2007-11-14 Ross Burton <ross@openedhand.com>
* data/web.desktop:
diff --git a/configure.ac b/configure.ac
index a31842a..be7f23e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,11 @@ if test x"$enable_gtkhtml2" = "xyes"; then
[GTKHTML2_LIBS="$GTKHTML2_LIBS -ljs"
AC_DEFINE(LIBJS_IS_SMJS, 1,
[Define if you have <js/jsapi.h> rather than <smjs/jsapi.h>])],
- [AC_MSG_ERROR([libsmjs not found])],
+ [PKG_CHECK_MODULES(JS, xulrunner-js,
+ [GTKHTML2_LIBS="$GTKHTML2_LIBS $JS_LIBS"
+ AC_DEFINE(LIBJS_IS_MOZJS, 1,
+ [Define if you have <mozjs/jsapi.h>])],
+ [AC_MSG_ERROR([libsmjs not found])])],
[#define XP_UNIX])],
[#define XP_UNIX])
diff --git a/patches/series b/patches/series
index 3956c1b..7c04e30 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
-at-import_box-pos.patch -p0
css-stylesheet-user.patch -p0
css-media.patch -p0
add-end-element-signal.patch -p0
diff --git a/src/gtkhtml2/web_gtkhtml2_js.c b/src/gtkhtml2/web_gtkhtml2_js.c
index b974149..b45ea26 100644
--- a/src/gtkhtml2/web_gtkhtml2_js.c
+++ b/src/gtkhtml2/web_gtkhtml2_js.c
@@ -1,12 +1,6 @@
#include "config.h"
#include <string.h>
-#define XP_UNIX
-#ifdef LIBJS_IS_SMJS
-#include <js/jsapi.h>
-#else
-#include <smjs/jsapi.h>
-#endif
#include <glib.h>
#include <libgtkhtml/gtkhtml.h>
#include <libgtkhtml/dom/core/dom-attr.h>
diff --git a/src/gtkhtml2/web_gtkhtml2_js.h b/src/gtkhtml2/web_gtkhtml2_js.h
index c3179c0..73316df 100644
--- a/src/gtkhtml2/web_gtkhtml2_js.h
+++ b/src/gtkhtml2/web_gtkhtml2_js.h
@@ -7,6 +7,8 @@
#define XP_UNIX
#ifdef LIBJS_IS_SMJS
#include <js/jsapi.h>
+#elif LIBJS_IS_MOZJS
+#include <mozjs/jsapi.h>
#else
#include <smjs/jsapi.h>
#endif