]> spindle.queued.net Git - midori/commitdiff
Use ldd and grep when checking if WebKit was built with libsoup
authorChristian Dywan <christian@twotoasts.de>
Fri, 30 Jan 2009 17:06:40 +0000 (18:06 +0100)
committerChristian Dywan <christian@twotoasts.de>
Fri, 30 Jan 2009 17:06:40 +0000 (18:06 +0100)
wscript

diff --git a/wscript b/wscript
index 5fa2276497ea1c8c1a66eda4a75589d924f95ef4..4375e4d2e4046318f65f8509fb831eac62675657 100644 (file)
--- a/wscript
+++ b/wscript
@@ -218,7 +218,9 @@ def configure (conf):
             Utils.pprint ('RED', 'Please use an older or newer version.')
     print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)"
     print "Persistent cookies:  " + libsoup_25_2 + " (libSoup 2.25.2)"
-    if 'soup-2.4' in conf.env['LIB_WEBKIT']:
+    # if 'soup-2.4' in conf.env['LIB_WEBKIT']:
+    wkbin = conf.env['LIBPATH_WEBKIT'][0] + '/libwebkit-1.0.so'
+    if not Utils.exec_command ('ldd ' + wkbin + ' | grep libsoup > /dev/null'):
         Utils.pprint ('GREEN', 'WebKit was built with libsoup')
     else:
         Utils.pprint ('RED', 'WebKit was NOT built with libsoup')