diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-06-20 18:19:52 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-06-20 18:19:52 +0000 |
| commit | c4eeaf841635f17b2c307a5ae1098f9345ba6e67 (patch) | |
| tree | 7702162ae6226e74f455f2b19addcca1d6f160e6 | |
| parent | f0dc22f5ff2acfe0de1cd8112cd113b0d9cc2210 (diff) | |
| download | libproxy-c4eeaf841635f17b2c307a5ae1098f9345ba6e67.tar.gz | |
Support building with javascriptcoregtk 1.5 (split in webkitgtk 1.5, thus webkitgtk 1.5 does not build without this detection)
git-svn-id: http://libproxy.googlecode.com/svn/trunk@816 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | libproxy/cmake/modules/pacrunner_webkit.cmk | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -4,6 +4,8 @@ New in version 0.4.8 (not yet released) xulrunner being part of the now lightning fast moving firefox is impossible to be tracked as a dependency and it is not supported by Mozilla to be used in this scenario. +* Support building with javascritpcoregtk 1.5 + (got split out of webkitgtk). New in version 0.4.7 ============================== diff --git a/libproxy/cmake/modules/pacrunner_webkit.cmk b/libproxy/cmake/modules/pacrunner_webkit.cmk index 7b29c4a..e0a1ec6 100644 --- a/libproxy/cmake/modules/pacrunner_webkit.cmk +++ b/libproxy/cmake/modules/pacrunner_webkit.cmk @@ -13,7 +13,10 @@ elseif(APPLE) endif() else() if(WITH_WEBKIT3) - px_check_modules(WEBKIT webkitgtk-3.0) + px_check_modules(WEBKIT javascriptcoregtk-3.0>=1.5.0) + if(NOT WEBKIT_LIBRARIES) + px_check_modules(WEBKIT webkitgtk-3.0<1.5.0) + endif(NOT WEBKIT_LIBRARIES) else() px_check_modules(WEBKIT webkit-1.0) endif() |