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

Error out if libhildon is available but not libosso

Browse source 
libhildon remains optional but we assume that it makes no sense
to use it without libosso.
This commit is contained in:
Christian Dywan 2009-06-14 21:25:33 +02:00
parent 4822eaf4c4
commit 5416008f28
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wscript
View file

@ -140,6 +140,7 @@ def configure (conf):
var = name.split ('-')[0].upper () var = name.split ('-')[0].upper ()
conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs ' + args, conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs ' + args,
atleast_version=version, mandatory=mandatory) atleast_version=version, mandatory=mandatory)
return conf.env['HAVE_' + var]
if option_enabled ('unique'): if option_enabled ('unique'):
check_pkg ('unique-1.0', '0.9', False) check_pkg ('unique-1.0', '0.9', False)
@ -183,9 +184,8 @@ def configure (conf):
check_pkg ('libxml-2.0', '2.6') check_pkg ('libxml-2.0', '2.6')
if option_enabled ('hildon'): if option_enabled ('hildon'):
check_pkg ('hildon-1', mandatory=False, var='HILDON') if check_pkg ('hildon-1', mandatory=False, var='HILDON'):
if conf.env['HAVE_HILDON'] == 1: check_pkg ('libosso', var='HILDON')
check_pkg ('libosso', mandatory=False, var='HILDON')
hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1] hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1]
if hildon != 'yes': if hildon != 'yes':
option_checkfatal ('hildon', 'Maemo integration') option_checkfatal ('hildon', 'Maemo integration')