diff options
| author | Dominique Leuenberger <dimstar@opensuse.org> | 2020-11-10 15:48:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 15:48:35 +0100 |
| commit | d3b6d8767b2147d2f14c974d5bd7a0dbfae63c62 (patch) | |
| tree | 432c21486c865b7cea491452cd04dbac34f4573a | |
| parent | 3e33513e2cde494ecd14363c3dd3ecb7f9ac1627 (diff) | |
| parent | 2203f710988eaa3061e75b083296944e34e17d59 (diff) | |
| download | libproxy-git-d3b6d8767b2147d2f14c974d5bd7a0dbfae63c62.tar.gz | |
Merge pull request #139 from mcatanzaro/mcatanzaro/disable-mozjs
Disable mozjs extension by default
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | libproxy/cmake/modules.cmk | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6d3e81d..67abba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ script: -DWITH_GNOME3=ON \ -DWITH_KDE=ON \ -DWITH_WEBKIT3=ON \ + -DWITH_MOZJS=ON \ -DBIPR=0 - make - sudo make install @@ -101,7 +101,7 @@ WITH_KDE: Default to ON. Enables plug-in to read proxy settings Note: this plug-in only has a *runtime* dependency on either kreadconfig or kreadconfig5. -WITH_MOZJS: Default to ON. Enable Mozilla javascript bindings. As +WITH_MOZJS: Default to OFF. Enable Mozilla javascript bindings. As Mozilla Javascript engine is often installed multiple you can set prefered order using MOZJS_SEARCH_ORDER, wich defaults to "xulrunner-js;firefox-js;mozilla-js;seamonkey-js". diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk index 0794a6e..11d2d43 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 "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES}) +px_module(pacrunner_mozjs 0 ${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) |