Require Vala unless --disable-vala is passed
This commit is contained in:
parent
78cfcb64d9
commit
67f4f7d977
2 changed files with 10 additions and 6 deletions
2
README
2
README
|
@ -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
|
||||
|
||||
Optional: Unique 0.9, libidn, docutils, libnotify
|
||||
Optional: Unique 0.9, libidn, docutils, libnotify, Vala
|
||||
|
||||
For installation instructions read INSTALL.
|
||||
|
||||
|
|
14
wscript
14
wscript
|
@ -87,11 +87,14 @@ def configure (conf):
|
|||
return dirvalue
|
||||
|
||||
conf.check_tool ('compiler_cc')
|
||||
# Circumvent mandatory check for valac
|
||||
if find_program_impl (conf.env, 'valac'):
|
||||
conf.check_tool ('vala')
|
||||
else:
|
||||
conf.check_message ('program', 'valac', False, False)
|
||||
if option_enabled ('vala'):
|
||||
if find_program_impl (conf.env, 'valac'):
|
||||
conf.check_tool ('vala')
|
||||
else:
|
||||
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')
|
||||
|
||||
if option_enabled ('userdocs'):
|
||||
|
@ -367,6 +370,7 @@ def set_options (opt):
|
|||
|
||||
group = opt.add_option_group ('Optional features', '')
|
||||
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 ('libnotify', 'notification support', group)
|
||||
add_enable_option ('addons', 'building of extensions', group)
|
||||
|
|
Loading…
Reference in a new issue