[Xfce4-commits] <midori:master> Make Vala a mandatory build requirement

[Christian Dywan]

Updating branch refs/heads/master
         to 3a51aafd7f4d491d59d9fa5cc6c231309a0750fd (commit)
       from 0dbee646b7dffbace0f507c4502aa49a2c8e2ef1 (commit)

commit 3a51aafd7f4d491d59d9fa5cc6c231309a0750fd
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Jun 8 22:39:35 2011 +0200

    Make Vala a mandatory build requirement

 README  |    4 ++--
 wscript |   15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/README b/README
index d4548ea..5c69722 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 ad15ca8..1cfe216 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)