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

Use pkgconfig to locate X11, which takes correct paths into account on BSD

Browse source
This commit is contained in:
Christian Dywan 2009-11-12 21:53:02 +01:00
parent 42174b473a
commit 204f0fd98a
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wscript
View file

@ -137,9 +137,6 @@ def configure (conf):
Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.') Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.')
if Options.platform != 'win32':
conf.check_cc (lib='X11', uselib='X11')
if conf.env['CONVERT'] and not conf.env['WINRC']: if conf.env['CONVERT'] and not conf.env['WINRC']:
Utils.pprint ('YELLOW', 'midori.ico won\'t be created') Utils.pprint ('YELLOW', 'midori.ico won\'t be created')
@ -200,6 +197,8 @@ def configure (conf):
args = '' args = ''
if Options.platform == 'win32': if Options.platform == 'win32':
args = '--define-variable=target=win32' args = '--define-variable=target=win32'
elif sys.platform != 'darwin':
check_pkg ('x11')
check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args) check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args)
check_pkg ('webkit-1.0', '1.1.1', args=args) check_pkg ('webkit-1.0', '1.1.1', args=args)
check_pkg ('libsoup-2.4', '2.25.2') check_pkg ('libsoup-2.4', '2.25.2')