From 7332e2a22962628a2ce240cd658273ddbb178f28 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 18 Jan 2012 16:15:59 +0100
Subject: [PATCH] configure.ac: Require GLib 2.31.10 and improve GIO check

---
 configure.ac | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3cde72d..73e1994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,24 +197,25 @@ AC_CHECK_TYPE([struct ip_mreqn], [
 
 dnl *** checks for dependency libraries ***
 
-dnl GLib is required
-AG_GST_GLIB_CHECK([2.24])
+
+dnl GLib
+GLIB_REQ=2.31.10
+
+AG_GST_GLIB_CHECK([$GLIB_REQ])
 
 dnl Check for GIO
-translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true)
-AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [
-  PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.31.10)
-  GIO_MODULE_DIR="`$PKG_CONFIG --variable=giomoduledir gio-2.0`"
-  AC_DEFINE_UNQUOTED(GIO_MODULE_DIR, "$GIO_MODULE_DIR",
-      [The GIO modules directory.])
-  GIO_LIBDIR="`$PKG_CONFIG --variable=libdir gio-2.0`"
-      AC_DEFINE_UNQUOTED(GIO_LIBDIR, "$GIO_LIBDIR",
-          [The GIO library directory.])
-
-  AC_SUBST(GIO_CFLAGS)
-  AC_SUBST(GIO_LIBS)
-  AC_SUBST(GIO_LDFLAGS)
-])
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQ)
+GIO_MODULE_DIR="`$PKG_CONFIG --variable=giomoduledir gio-2.0`"
+AC_DEFINE_UNQUOTED(GIO_MODULE_DIR, "$GIO_MODULE_DIR",
+    [The GIO modules directory.])
+GIO_LIBDIR="`$PKG_CONFIG --variable=libdir gio-2.0`"
+    AC_DEFINE_UNQUOTED(GIO_LIBDIR, "$GIO_LIBDIR",
+        [The GIO library directory.])
+
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+AC_SUBST(GIO_LDFLAGS)
+dnl GLib is required
 
 dnl Orc
 ORC_CHECK([0.4.11])
-- 
2.7.4