From f0dc22f5ff2acfe0de1cd8112cd113b0d9cc2210 Mon Sep 17 00:00:00 2001 From: "dominique.leuenberger@gmail.com" Date: Mon, 20 Jun 2011 10:38:57 +0000 Subject: 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 --- libproxy/cmake/modules/pacrunner_mozjs.cmk | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'libproxy') 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() -- cgit v1.2.1