[Xfce4-commits] <postler:master> Require telepathy-glib on top of libfolks

[Christian Dywan]

Updating branch refs/heads/master
         to fd352581faa1ef76666f31c5821496769a684b85 (commit)
       from 6f78569a1210a853436e1cfd45924ac2b0ede9a3 (commit)

commit fd352581faa1ef76666f31c5821496769a684b85
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Aug 21 21:31:46 2011 +0200

    Require telepathy-glib on top of libfolks

 wscript |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/wscript b/wscript
index 8d092f1..47dd556 100644
--- a/wscript
+++ b/wscript
@@ -134,8 +134,9 @@ def configure (conf):
     conf.env['HAVE_GTK3'] = option_enabled ('gtk3')
 
     if option_enabled ('libfolks'):
+        check_pkg ('telepathy-glib', '', var='TELEPATHY_GLIB', mandatory=False)
         check_pkg ('folks', '', mandatory=False)
-        if conf.env['HAVE_FOLKS']:
+        if conf.env['HAVE_TELEPATHY_GLIB'] and 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')