Require GTK+3 for granite, but only if enabled

This commit is contained in:
Christian Dywan 2012-04-13 00:07:40 +02:00
parent 8d0d2554ca
commit a006013cb4

11
wscript
View file

@ -211,9 +211,14 @@ def configure (conf):
if option_enabled ('granite'): if option_enabled ('granite'):
if not option_enabled ('gtk3'): if not option_enabled ('gtk3'):
option_checkfatal ('granite', 'granite requires --enable-gtk3') if getattr (Options.options, 'enable_granite'):
check_pkg ('granite', '0.1', False) Utils.pprint ('RED', 'Granite requires --enable-gtk3')
granite = ['N/A', 'yes'][conf.env['HAVE_GRANITE'] == 1] 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': if granite != 'yes':
option_checkfatal ('granite', 'new notebook, pop-overs') option_checkfatal ('granite', 'new notebook, pop-overs')
conf.define ('GRANITE_VERSION', 'No') conf.define ('GRANITE_VERSION', 'No')