Make Vala a mandatory build requirement
This commit is contained in:
parent
0dbee646b7
commit
3a51aafd7f
2 changed files with 8 additions and 11 deletions
4
README
4
README
|
@ -11,9 +11,9 @@ Midori is a lightweight web browser.
|
||||||
* Customizable and extensible interface.
|
* Customizable and extensible interface.
|
||||||
* Extensions written in C.
|
* Extensions written in C.
|
||||||
|
|
||||||
Requirements: GTK+ 2.10, WebkitGTK+ 1.1.14, libXML2, libsoup 2.25.2, sqlite 3.0
|
Requirements: GTK+ 2.10, WebkitGTK+ 1.1.14, libXML2, libsoup 2.25.2, sqlite 3.0, Vala 0.10
|
||||||
|
|
||||||
Optional: Unique 0.9, libidn, docutils, libnotify, Vala
|
Optional: Unique 0.9, libidn, docutils, libnotify
|
||||||
|
|
||||||
For installation instructions read INSTALL.
|
For installation instructions read INSTALL.
|
||||||
|
|
||||||
|
|
15
wscript
15
wscript
|
@ -88,14 +88,12 @@ def configure (conf):
|
||||||
return dirvalue
|
return dirvalue
|
||||||
|
|
||||||
conf.check_tool ('compiler_cc')
|
conf.check_tool ('compiler_cc')
|
||||||
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 requird to build Midori.')
|
||||||
Utils.pprint ('RED', 'Vala is required for some extensions.')
|
sys.exit (1)
|
||||||
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 ('nls'):
|
if option_enabled ('nls'):
|
||||||
|
@ -360,7 +358,6 @@ 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)
|
||||||
|
|
Loading…
Reference in a new issue