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

Require Vala unless --disable-vala is passed

Browse source
This commit is contained in:
Christian Dywan 2010-07-03 23:30:21 +02:00
parent 78cfcb64d9
commit 67f4f7d977
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -13,7 +13,7 @@ Midori is a lightweight web browser.
Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2, sqlite 3.0 Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2, sqlite 3.0
Optional: Unique 0.9, libidn, docutils, libnotify Optional: Unique 0.9, libidn, docutils, libnotify, Vala
For installation instructions read INSTALL. For installation instructions read INSTALL.

6
wscript
View file

@ -87,11 +87,14 @@ def configure (conf):
return dirvalue return dirvalue
conf.check_tool ('compiler_cc') conf.check_tool ('compiler_cc')
# Circumvent mandatory check for valac if option_enabled ('vala'):
if find_program_impl (conf.env, 'valac'): if find_program_impl (conf.env, 'valac'):
conf.check_tool ('vala') conf.check_tool ('vala')
else: else:
conf.check_message ('program', 'valac', False, False) conf.check_message ('program', 'valac', False, False)
Utils.pprint ('RED', 'Vala is required for some extensions.')
Utils.pprint ('RED', 'Pass --disable-vala to not build with Vala.')
sys.exit (1)
conf.check_tool ('glib2') conf.check_tool ('glib2')
if option_enabled ('userdocs'): if option_enabled ('userdocs'):
@ -367,6 +370,7 @@ def set_options (opt):
group = opt.add_option_group ('Optional features', '') group = opt.add_option_group ('Optional features', '')
add_enable_option ('unique', 'single instance support', group) add_enable_option ('unique', 'single instance support', group)
add_enable_option ('vala', 'Vala support', group)
add_enable_option ('libidn', 'international domain name support', group) add_enable_option ('libidn', 'international domain name support', group)
add_enable_option ('libnotify', 'notification support', group) add_enable_option ('libnotify', 'notification support', group)
add_enable_option ('addons', 'building of extensions', group) add_enable_option ('addons', 'building of extensions', group)