diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2012-03-09 18:02:25 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2012-03-09 18:02:25 +0000 |
| commit | 2f7ccc5281c3d6db0d63860c967331dcdb5eef65 (patch) | |
| tree | 78cdc9b71515925b47353b6cf7a06b0c0debde77 | |
| parent | 7f9d5e149b1da226c4a08ff29a8ba63489269f23 (diff) | |
| download | libproxy-git-2f7ccc5281c3d6db0d63860c967331dcdb5eef65.tar.gz | |
Allow to forcibly build pacrunners as module.
The default is to build the pacrunner internal to libproxy if only one
pacrunner is to be built.
Using -DBIPR{ON|OFF} it is now possible to override this and have a
pacrunner built as module even if there is only one to be built.
In case of multiple pacrunners, BIPR is being ignored and forcibly set
to OFF.
Fixes issue 172.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | libproxy/cmake/modules.cmk | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -16,6 +16,7 @@ New in version 0.4.8 (not yet released) - #168: .pc file should be installed under OSX as well. - #170: Also check for "Transfer-Encoding: chunked". - #171: mozjs pacrunner: Fix parameters of dnsResolve_() + - #172: Allow to forcibly build pacrunner as module (-DBIPR={ON,OFF}) - #173: Libproxy doesn't build with gcc 4.7 New in version 0.4.7 diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk index 48346de..68ff898 100644 --- a/libproxy/cmake/modules.cmk +++ b/libproxy/cmake/modules.cmk @@ -19,7 +19,7 @@ include(cmake/modules/pacrunner_natus.cmk) include(cmake/modules/pacrunner_webkit.cmk) # Build the pacrunner into libproxy unless we are building for multiple engines -set(BIPR 1) +set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR") if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) set(BIPR 0) endif() |