Updating branch refs/heads/master
to 2bf1a702f979993d56aa223273ea24ff8f7082a2 (commit)
from 988a091501bc67b72b31a4b15a744e380e9c3e13 (commit)
commit 2bf1a702f979993d56aa223273ea24ff8f7082a2
Author: Christian Dywan <[email protected]>
Date: Sat Jul 9 18:44:10 2011 +0200
Suggest more clearly how to deal with Vala versions
wscript | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/wscript b/wscript
index 254c3aa..789a57f 100644
--- a/wscript
+++ b/wscript
@@ -75,11 +75,11 @@ def configure (conf):
conf.check_tool ('compiler_cc')
conf.check_tool ('vala')
- if conf.env['VALAC_VERSION'][1] < 10:
- Utils.pprint ('RED', 'valac >= 0.10.0 required')
- sys.exit (1)
- elif conf.env['VALAC_VERSION'][1] > 10 and not conf.find_program
('vala-0.14'):
- Utils.pprint ('RED', 'valac 0.10 or git is required')
+ if conf.env['VALAC_VERSION'][1] < 10 or conf.env['VALAC_VERSION'][1] in
(11, 12):
+ Utils.pprint ('RED', 'valac 0.10 or 0.14/ git is required\n' \
+ 'You can choose the version to use like this:\n' \
+ 'VALAC=valac-0.14 ./waf configure\n' \
+ 'VALAC=valac-0.10 ./waf configure --disable-gtk3')
sys.exit (1)
if option_enabled ('nls'):
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
