[0.11] gst-plugins-base: configure.ac: Require GLib 2.31. 10 and improve GIO check

Sebastian Dröge slomo at kemper.freedesktop.org
Wed Jan 18 07:15:53 PST 2012


Module: gst-plugins-base
Branch: 0.11
Commit: 5ed617b65944dabae2c7808ec827ed52697b1ea0
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=5ed617b65944dabae2c7808ec827ed52697b1ea0

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed Jan 18 16:15:30 2012 +0100

configure.ac: Require GLib 2.31.10 and improve GIO check

---

 configure.ac |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index bc9fd0e..88c08d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,24 +224,23 @@ AG_GST_CHECK_FUNCTION
 
 dnl *** checks for dependency libraries ***
 
-dnl GLib is required
-AG_GST_GLIB_CHECK([2.26])
+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)
 
 ORC_CHECK([0.4.11])
 



More information about the gstreamer-commits mailing list