[Xfce4-commits] <postler:master> Use Gee in the build as libfolks may need it

[Christian Dywan]

Updating branch refs/heads/master
         to 00a37cb526cc4a8e4d43eeb4376afcbb48335137 (commit)
       from c13da109e8b408f94e46add8dce2b79d31c3fb01 (commit)

commit 00a37cb526cc4a8e4d43eeb4376afcbb48335137
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Jul 4 23:55:27 2011 +0200

    Use Gee in the build as libfolks may need it

 postler/wscript_build |    4 +++-
 wscript               |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/postler/wscript_build b/postler/wscript_build
index bc81c13..d4540a5 100644
--- a/postler/wscript_build
+++ b/postler/wscript_build
@@ -13,11 +13,13 @@ obj.name = 'postler'
 obj.target = 'postler'
 obj.includes = '. ..'
 obj.find_sources_in_dirs ('.')
-obj.uselib = 'GIO GTHREAD GTK LIBNOTIFY LIBCANBERRA INDICATE UNIQUE WEBKIT SQLITE3 FOLKS ZEITGEIST'
+obj.uselib = 'GIO GTHREAD GTK LIBNOTIFY LIBCANBERRA INDICATE UNIQUE WEBKIT SQLITE3 FOLKS ZEITGEIST FOLKS'
 obj.packages = 'config postler posix gio-2.0 gtk+-2.0 libnotify libcanberra ' \
                'unique-1.0 webkit-1.0 sqlite3'
 obj.vapi_dirs = '.'
 
+if bld.env['HAVE_FOLKS']:
+    obj.packages += ' gee-1.0'
 if bld.env['HAVE_ZEITGEIST']:
     obj.packages += ' zeitgeist-1.0'
 if bld.env['HAVE_INDICATE']:
diff --git a/wscript b/wscript
index 033d188..8beccb0 100644
--- a/wscript
+++ b/wscript
@@ -121,6 +121,8 @@ def configure (conf):
     if option_enabled ('libfolks'):
         check_pkg ('folks', '', mandatory=False)
         if conf.env['HAVE_FOLKS']:
+            # Some versions of Folks need Gee, some don't
+            check_pkg ('gee-1.0')
             conf.env.append_value ('VALAFLAGS', '-D HAVE_FOLKS')
         else:
             Utils.pprint ('RED', 'libfolks enables contact lookup from ' \