[folks] Explicitly build and link generated C code against GIO as necessary.

[Travis Reitter <treitter src gnome org>]

commit 045ddc4fce532a3dc9b6851d9477bd3460aa6e1a
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Jul 15 14:08:16 2010 -0700

    Explicitly build and link generated C code against GIO as necessary.

 backends/telepathy/Makefile.am |    6 ++++++
 configure.ac                   |    4 ++++
 folks/Makefile.am              |    2 ++
 3 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 90feb58..d2569b2 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -23,6 +23,7 @@ libtp_lowlevel_la_SOURCES = \
 	$(NULL)
 
 libtp_lowlevel_la_CPPFLAGS = \
+	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
 	$(TP_GLIB_CFLAGS) \
@@ -35,6 +36,7 @@ libtp_lowlevel_la_CPPFLAGS = \
 libtp_lowlevel_la_LDFLAGS = \
 	-shared -rpath $(libdir) \
 	-avoid-version \
+	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(TP_GLIB_LIBS) \
 	$(NULL)
@@ -91,6 +93,7 @@ libfolks_telepathy_la_SOURCES = \
 	$(NULL)
 
 libfolks_telepathy_la_CPPFLAGS = \
+	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -99,6 +102,7 @@ libfolks_telepathy_la_CPPFLAGS = \
 	$(NULL)
 
 libfolks_telepathy_la_LIBADD = \
+	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(GEE_LIBS) \
@@ -152,6 +156,7 @@ libfolks_backend_telepathy_la_SOURCES = \
 	$(folks_backend_telepathy_valasources:.vala=.c)
 
 libfolks_backend_telepathy_la_CPPFLAGS = \
+	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -160,6 +165,7 @@ libfolks_backend_telepathy_la_CPPFLAGS = \
 	$(NULL)
 
 libfolks_backend_telepathy_la_LIBADD = \
+	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(GEE_LIBS) \
diff --git a/configure.ac b/configure.ac
index 5b77453..05368ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,10 @@ PKG_CHECK_MODULES(GLIB,
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
 AC_SUBST(DBUS_GLIB_CFLAGS)
 AC_SUBST(DBUS_GLIB_LIBS)
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 6201d0e..efe375f 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -37,12 +37,14 @@ folks_deps = \
 	$(NULL)
 
 libfolks_la_CFLAGS = \
+	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
 	$(NULL)
 
 libfolks_la_LIBADD = \
+	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(GEE_LIBS) \