telepathy-mission-control: Drop separate GIO check, we now include it in GLIB_LIBS

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 4536ccdd1c187df466a9321ad234293f0563fe19
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=4536ccdd1c187df466a9321ad234293f0563fe19

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue May  8 12:52:59 2012 +0100

Drop separate GIO check, we now include it in GLIB_LIBS

Also use GLib 2.32 deprecation/availability checking.

---

 configure.ac                        |    5 ++---
 mission-control-plugins/Makefile.am |    3 +--
 util/Makefile.am                    |    6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 09896b2..c023438 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,9 +313,8 @@ PKG_CHECK_MODULES([GLIB],
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
-PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
-AC_SUBST(GIO_LIBS)
-AC_SUBST(GIO_CFLAGS)
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs])
 
 dnl Check for MCE, a Maemo service used to determine when the device is idle.
 PKG_CHECK_MODULES([MCE], mce >= 1.5, [HAVE_MCE=yes], [HAVE_MCE=no])
diff --git a/mission-control-plugins/Makefile.am b/mission-control-plugins/Makefile.am
index 76e6840..3bc2483 100644
--- a/mission-control-plugins/Makefile.am
+++ b/mission-control-plugins/Makefile.am
@@ -2,7 +2,6 @@ INCLUDES = \
 	$(TELEPATHY_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GIO_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-DG_LOG_DOMAIN=\"mc-plugins\" \
@@ -39,7 +38,7 @@ libmission_control_plugins_la_LIBADD = \
 	$(TELEPATHY_LIBS) \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-	$(GIO_LIBS)
+	$(NULL)
 
 nodist_libmission_control_plugins_la_SOURCES = \
 	mcp-signals-marshal.c \
diff --git a/util/Makefile.am b/util/Makefile.am
index 69832a5..f506dd2 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -3,15 +3,15 @@ AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(LIBFFI_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GIO_CFLAGS) \
-	$(TELEPATHY_CFLAGS) 
+	$(TELEPATHY_CFLAGS) \
+	$(NULL)
 
 LDADD = \
 	$(LIBFFI_LIBS) \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(TELEPATHY_LIBS) \
-	$(GIO_LIBS)
+	$(NULL)
 
 AM_CFLAGS = $(ERROR_CFLAGS)