From: Christian Dywan <christian@twotoasts.de>
Date: Fri, 30 Jan 2009 17:33:04 +0000 (+0100)
Subject: Do not use grep for the libsoup check
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e8089ad39ee69c52cce2aeb947c478621aff0f;p=midori

Do not use grep for the libsoup check
---

diff --git a/wscript b/wscript
index 4375e4d2..70def3c4 100644
--- a/wscript
+++ b/wscript
@@ -219,11 +219,21 @@ def configure (conf):
     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']:
-    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')
+    webkit_binary = conf.env.get_flat ('LIBPATH_WEBKIT') + '/libwebkit-1.0.so'
+    try:
+        ldd = subprocess.Popen (['ldd', webkit_binary],
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        if not ldd.wait ():
+            found = False
+            for library in ldd.stdout.read ().split ('\n'):
+                if library[:8] == '\tlibsoup':
+                    found = True
+            if found:
+                Utils.pprint ('GREEN', 'WebKit was built with libsoup')
+            else:
+                Utils.pprint ('RED', 'WebKit was NOT built with libsoup')
+    except:
+        pass
     print "Persistent history:  " + sqlite + " (sqlite3)"
     print "Maemo integration:   " + hildon + " (hildon)"