summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>2012-03-09 18:02:25 +0000
committerdominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>2012-03-09 18:02:25 +0000
commit10b15e6b018264276c56e791b8eebc0d8d817225 (patch)
tree78cdc9b71515925b47353b6cf7a06b0c0debde77
parent8dbcf9b358f50f7a7c1f1368d167999c31b1e86b (diff)
downloadlibproxy-10b15e6b018264276c56e791b8eebc0d8d817225.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. git-svn-id: http://libproxy.googlecode.com/svn/trunk@834 c587cffe-e639-0410-9787-d7902ae8ed56
-rw-r--r--NEWS1
-rw-r--r--libproxy/cmake/modules.cmk2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 13146fc..cddeb51 100644
--- a/NEWS
+++ b/NEWS
@@ -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()