Allow buildiing with GTK+ 3 and libunique

This commit is contained in:
Christian Dywan 2011-11-09 22:56:21 +01:00
parent d9c4bb15c0
commit 191339ec9e

View file

@ -175,14 +175,16 @@ def configure (conf):
int(given_major) == major and int(given_minor) > minor or \ int(given_major) == major and int(given_minor) > minor or \
int(given_major) == major and int(given_minor) == minor and int(given_micro) >= micro int(given_major) == major and int(given_minor) == minor and int(given_micro) >= micro
if option_enabled ('unique') and not option_enabled('gtk3'): if option_enabled ('unique'):
check_pkg ('unique-1.0', '0.9', False) if option_enabled('gtk3'): unique_pkg = 'unique-3.0'
else: unique_pkg = 'unique-1.0'
check_pkg (unique_pkg, '0.9', False)
unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1]
if unique != 'yes': if unique != 'yes':
option_checkfatal ('unique', 'single instance') option_checkfatal ('unique', 'single instance')
conf.define ('UNIQUE_VERSION', 'No') conf.define ('UNIQUE_VERSION', 'No')
else: else:
conf.define ('UNIQUE_VERSION', conf.check_cfg (modversion='unique-1.0')) conf.define ('UNIQUE_VERSION', conf.check_cfg (modversion=unique_pkg))
else: else:
unique = 'no ' unique = 'no '
conf.define ('UNIQUE_VERSION', 'No') conf.define ('UNIQUE_VERSION', 'No')