[telepathy-gabble/master] use PKG_CHECK_MODULES instead of hardcoding Wocky CFLAGS and LIBS

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Sep 11 07:56:24 PDT 2009


---
 configure.ac |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 10db884..3219be7 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)
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list