[telepathy-glib/master] configure: build with and link to GIO

Jonny Lamb jonny.lamb at collabora.co.uk
Mon Sep 28 07:39:05 PDT 2009


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 configure.ac           |    2 +-
 tests/Makefile.am      |    3 ++-
 tests/dbus/Makefile.am |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index df1370c..7ba7127 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ dnl (srcdir != builddir)
 AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.])
 
 dnl Check for Glib
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gio-2.0])
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 900c281..daed5cd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -66,7 +66,8 @@ include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
 LDADD = \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS)
 
 AM_CFLAGS = \
     $(ERROR_CFLAGS) \
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 9be880e..e5aafdc 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -45,7 +45,8 @@ TESTS = $(noinst_PROGRAMS)
 
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
-    $(top_builddir)/tests/lib/libtp-glib-tests.la
+    $(top_builddir)/tests/lib/libtp-glib-tests.la \
+    $(GLIB_LIBS)
 
 test_account_SOURCES = account.c
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list