Updating branch refs/heads/master
to 191339ec9e4e07a56fdb1404cc70423db8c3c467 (commit)
from d9c4bb15c0d0add3add59adbc76b2bec5a3e7224 (commit)
commit 191339ec9e4e07a56fdb1404cc70423db8c3c467
Author: Christian Dywan <[email protected]>
Date: Wed Nov 9 22:56:21 2011 +0100
Allow buildiing with GTK+ 3 and libunique
wscript | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/wscript b/wscript
index d717a3a..7562f0c 100644
--- a/wscript
+++ b/wscript
@@ -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 and
int(given_micro) >= micro
- if option_enabled ('unique') and not option_enabled('gtk3'):
- check_pkg ('unique-1.0', '0.9', False)
+ if option_enabled ('unique'):
+ 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]
if unique != 'yes':
option_checkfatal ('unique', 'single instance')
conf.define ('UNIQUE_VERSION', 'No')
else:
- conf.define ('UNIQUE_VERSION', conf.check_cfg
(modversion='unique-1.0'))
+ conf.define ('UNIQUE_VERSION', conf.check_cfg
(modversion=unique_pkg))
else:
unique = 'no '
conf.define ('UNIQUE_VERSION', 'No')
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
