Updating branch refs/heads/master to a006013cb459affbb77a08ae945a839f88c7a327 (commit) from 8d0d2554ca5cbefd4c4cf2facfea00f1100de699 (commit)
commit a006013cb459affbb77a08ae945a839f88c7a327 Author: Christian Dywan <christ...@twotoasts.de> Date: Fri Apr 13 00:07:40 2012 +0200 Require GTK+3 for granite, but only if enabled wscript | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index b1d8107..cb6d7d3 100644 --- a/wscript +++ b/wscript @@ -211,9 +211,14 @@ def configure (conf): if option_enabled ('granite'): if not option_enabled ('gtk3'): - option_checkfatal ('granite', 'granite requires --enable-gtk3') - check_pkg ('granite', '0.1', False) - granite = ['N/A', 'yes'][conf.env['HAVE_GRANITE'] == 1] + if getattr (Options.options, 'enable_granite'): + Utils.pprint ('RED', 'Granite requires --enable-gtk3') + sys.exit (1) + else: + granite = 'no (requires --enable-gtk3)' + else: + check_pkg ('granite', '0.1', False) + granite = ['N/A', 'yes'][conf.env['HAVE_GRANITE'] == 1] if granite != 'yes': option_checkfatal ('granite', 'new notebook, pop-overs') conf.define ('GRANITE_VERSION', 'No') _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits