summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-08-26 16:02:41 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-09-11 15:49:24 +0100
commit9127dabddc682f645d1482845bf1322b4311f505 (patch)
tree42fefa12d21687030ee49af5d6524f670217b8bc /configure.ac
parent5364cc6617e99bce1ff72a4ba51212cef4ef24b6 (diff)
downloadtelepathy-gabble-9127dabddc682f645d1482845bf1322b4311f505.tar.gz
use PKG_CHECK_MODULES instead of hardcoding Wocky CFLAGS and LIBS
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 10db88421..3219be735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,10 +176,8 @@ AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON")
dnl Check for Wocky
# re-enable once Wocky has been released as a lib
-#PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
-
-WOCKY_CFLAGS="-I \$(top_srcdir)/lib/ext/wocky"
-WOCKY_LIBS="\$(top_srcdir)/lib/ext/wocky/wocky/libwocky.la"
+export PKG_CONFIG_PATH=lib/ext/wocky/wocky:$PKG_CONFIG_PATH
+PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
AC_SUBST(WOCKY_CFLAGS)
AC_SUBST(WOCKY_LIBS)