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

Adjust enabling and disabling of options again

Browse source
This commit is contained in:
Christian Dywan 2009-06-05 23:14:53 +02:00
parent e9ee1bcfbe
commit e19d038b53
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wscript
View file

@ -117,15 +117,17 @@ def configure (conf):
if option_enabled ('unique'): if option_enabled ('unique'):
check_pkg ('unique-1.0', '0.9', False) check_pkg ('unique-1.0', '0.9', False)
unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1]
if unique != 'yes':
option_checkfatal ('unique', 'single instance')
else: else:
option_checkfatal ('unique', 'single instance')
unique = 'no ' unique = 'no '
conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes']) conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes'])
if option_enabled ('libidn'): if option_enabled ('libidn'):
check_pkg ('libidn', '1.0', False) check_pkg ('libidn', '1.0', False)
libidn = ['N/A','yes'][conf.env['HAVE_LIBIDN'] == 1] libidn = ['N/A','yes'][conf.env['HAVE_LIBIDN'] == 1]
option_checkfatal ('libidn', 'international domain names') if libidn != 'yes':
option_checkfatal ('libidn', 'international domain names')
else: else:
libidn = 'no ' libidn = 'no '
conf.define ('HAVE_LIBIDN', [0,1][libidn == 'yes']) conf.define ('HAVE_LIBIDN', [0,1][libidn == 'yes'])
@ -133,7 +135,8 @@ def configure (conf):
if option_enabled ('sqlite'): if option_enabled ('sqlite'):
check_pkg ('sqlite3', '3.0', False, var='SQLITE') check_pkg ('sqlite3', '3.0', False, var='SQLITE')
sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1] sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1]
option_checkfatal ('sqlite', 'history database') if sqlite != 'yes':
option_checkfatal ('sqlite', 'history database')
else: else:
sqlite = 'no ' sqlite = 'no '
conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes']) conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes'])
@ -153,7 +156,8 @@ def configure (conf):
if conf.env['HAVE_HILDON'] == 1: if conf.env['HAVE_HILDON'] == 1:
check_pkg ('libosso', mandatory=False, 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]
option_checkfatal ('hildon', 'Maemo integration') if hildon != 'yes':
option_checkfatal ('hildon', 'Maemo integration')
else: else:
hildon = 'no ' hildon = 'no '
conf.define ('HAVE_HILDON', [0,1][hildon == 'yes']) conf.define ('HAVE_HILDON', [0,1][hildon == 'yes'])