summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhaofeng Li <hello@zhaofeng.li>2021-06-13 20:31:01 -0700
committerZhaofeng Li <hello@zhaofeng.li>2021-06-13 20:46:01 -0700
commit66b30ef388a45f66f9b118d51cc76b53fdb8bbf4 (patch)
treefe44232127dc4e82e3514809b1f35f6cd2ef890f
parentdd74706ddb24d0370a9ffaed13cdbbdcf858ebc3 (diff)
downloadlibproxy-git-66b30ef388a45f66f9b118d51cc76b53fdb8bbf4.tar.gz
Actually disable mozjs by default
Fixes #153.
-rw-r--r--libproxy/cmake/modules.cmk2
-rw-r--r--libproxy/cmake/modules/pacrunner_mozjs.cmk2
2 files changed, 2 insertions, 2 deletions
diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
index 11d2d43..0794a6e 100644
--- a/libproxy/cmake/modules.cmk
+++ b/libproxy/cmake/modules.cmk
@@ -44,7 +44,7 @@ if(NM_FOUND OR NMold_FOUND)
set(NM_BUILD 1)
endif(NM_FOUND OR NMold_FOUND)
px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES})
-px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES})
+px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES})
px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES})
px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
px_module(wpad_dns_alias 1 1)
diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
index 2cc3c51..117d789 100644
--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
@@ -7,7 +7,7 @@ if(WIN32)
include_directories("${MOZJS_INCLUDE_DIR}")
endif()
elseif(NOT APPLE)
- option(WITH_MOZJS "Search for MOZJS package" ON)
+ option(WITH_MOZJS "Search for MOZJS package" OFF)
if (WITH_MOZJS)
pkg_search_module(MOZJS mozjs-68)
if(MOZJS_FOUND)