From 3a51aafd7f4d491d59d9fa5cc6c231309a0750fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 8 Jun 2011 22:39:35 +0200 Subject: [PATCH] Make Vala a mandatory build requirement --- README | 4 ++-- wscript | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README b/README index d4548ea6..5c697225 100644 --- a/README +++ b/README @@ -11,9 +11,9 @@ Midori is a lightweight web browser. * Customizable and extensible interface. * 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. diff --git a/wscript b/wscript index ad15ca8e..1cfe216c 100644 --- a/wscript +++ b/wscript @@ -88,14 +88,12 @@ def configure (conf): return dirvalue conf.check_tool ('compiler_cc') - 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) + if find_program_impl (conf.env, 'valac'): + conf.check_tool ('vala') + else: + conf.check_message ('program', 'valac', False, False) + Utils.pprint ('RED', 'Vala is requird to build Midori.') + sys.exit (1) conf.check_tool ('glib2') if option_enabled ('nls'): @@ -360,7 +358,6 @@ 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)