debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not use grep for the libsoup check

Browse source
This commit is contained in:
Christian Dywan 2009-01-30 18:33:04 +01:00
parent e9460d3ed4
commit a1e8089ad3
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wscript
View file

@ -219,11 +219,21 @@ def configure (conf):
print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)" print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)"
print "Persistent cookies: " + libsoup_25_2 + " (libSoup 2.25.2)" 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' webkit_binary = conf.env.get_flat ('LIBPATH_WEBKIT') + '/libwebkit-1.0.so'
if not Utils.exec_command ('ldd ' + wkbin + ' | grep libsoup > /dev/null'): 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') Utils.pprint ('GREEN', 'WebKit was built with libsoup')
else: else:
Utils.pprint ('RED', 'WebKit was NOT built with libsoup') Utils.pprint ('RED', 'WebKit was NOT built with libsoup')
except:
pass
print "Persistent history: " + sqlite + " (sqlite3)" print "Persistent history: " + sqlite + " (sqlite3)"
print "Maemo integration: " + hildon + " (hildon)" print "Maemo integration: " + hildon + " (hildon)"