From: Christian Dywan <christian@twotoasts.de>
Date: Fri, 30 Jan 2009 17:06:40 +0000 (+0100)
Subject: Use ldd and grep when checking if WebKit was built with libsoup
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9460d3ed44a3833ea18d17e8f21ead2c314f4a6;p=midori

Use ldd and grep when checking if WebKit was built with libsoup
---

diff --git a/wscript b/wscript
index 5fa22764..4375e4d2 100644
--- 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')