diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-03-22 22:54:22 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-03-22 22:54:22 +0000 |
| commit | b59bb8cd760b3ebda7fd004e07621b90b7efb401 (patch) | |
| tree | 136a8cd6a6aa1f6917ce4e2d403ee32270b07496 | |
| parent | 91b431e9f1f75210e2bff34f796eb9888efe8be5 (diff) | |
| download | libproxy-b59bb8cd760b3ebda7fd004e07621b90b7efb401.tar.gz | |
pacrunner_mozjs: ^Ct's not pretend we support xulrunner < 2.0b12... who wants new libproxy wants new xul too
git-svn-id: http://libproxy.googlecode.com/svn/trunk@791 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | libproxy/cmake/modules/pacrunner_mozjs.cmk | 6 | ||||
| -rw-r--r-- | libproxy/modules/pacrunner_mozjs.cpp | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk index 0aaea3a..3c3e041 100644 --- a/libproxy/cmake/modules/pacrunner_mozjs.cmk +++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk @@ -11,14 +11,10 @@ elseif(NOT APPLE) option(WITH_MOZJS "Search for MOZJS package" ON) if (WITH_MOZJS) foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) - pkg_search_module(MOZJS ${MOZJSLIB}) + pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) if(MOZJS_FOUND) include_directories(${MOZJS_INCLUDE_DIRS}) link_directories(${MOZJS_LIBRARY_DIRS}) - pkg_search_module(MOZJS2 ${MOZJSLIB}>=2.0b12) - if(MOZJS2_FOUND) - add_definitions(-DHAVE_MOZJS_2) - endif(MOZJS2_FOUND) break() else() set(MOZJS_FOUND 0) diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp index b1a89eb..b557dac 100644 --- a/libproxy/modules/pacrunner_mozjs.cpp +++ b/libproxy/modules/pacrunner_mozjs.cpp @@ -116,11 +116,7 @@ public: //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX); //JS_SetVersion(this->jsctx, JSVERSION_LATEST); //JS_SetErrorReporter(cx, reportError); - #ifdef HAVE_MOZJS_2 if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error; - #else - if (!(this->jsglb = JS_NewObject(this->jsctx, &cls, NULL, NULL))) goto error; - #endif if (!JS_InitStandardClasses(this->jsctx, this->jsglb)) goto error; // Define Javascript functions |