diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-06-20 10:38:57 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-06-20 10:38:57 +0000 |
| commit | f0dc22f5ff2acfe0de1cd8112cd113b0d9cc2210 (patch) | |
| tree | d29d1148a79157ce4099a1bb91a268fb68670d56 | |
| parent | 6f0f63a6a714d8a33ed07c168417cafcc739f29d (diff) | |
| download | libproxy-f0dc22f5ff2acfe0de1cd8112cd113b0d9cc2210.tar.gz | |
Only support mozjs185 as valid mozilla pacrunner backend.
Xulrunner is no longer trackable from upstream due to the lightning
fast movement of the Firefox source base. Also, Mozilla does not
support usage of xulrunner from other apps.
git-svn-id: http://libproxy.googlecode.com/svn/trunk@815 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | libproxy/cmake/modules/pacrunner_mozjs.cmk | 18 |
2 files changed, 14 insertions, 11 deletions
@@ -1,3 +1,10 @@ +New in version 0.4.8 (not yet released) +============================== +* Only support standalone mozjs185 as mozilla js engine. + xulrunner being part of the now lightning fast moving firefox + is impossible to be tracked as a dependency and it is not + supported by Mozilla to be used in this scenario. + New in version 0.4.7 ============================== * Support/require xulrunner 2.0+ diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk index 3c3e041..636bcc1 100644 --- a/libproxy/cmake/modules/pacrunner_mozjs.cmk +++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk @@ -7,19 +7,15 @@ if(WIN32) include_directories("${MOZJS_INCLUDE_DIR}") endif() elseif(NOT APPLE) - set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") option(WITH_MOZJS "Search for MOZJS package" ON) if (WITH_MOZJS) - foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) - pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) - break() - else() - set(MOZJS_FOUND 0) - endif() - endforeach() + pkg_search_module(MOZJS mozjs185>=1.8.5) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) + else() + set(MOZJS_FOUND 0) + endif() else() set(MOZJS_FOUND 0) endif() |