[0.11] gst-plugins-good: configure: Require GIO 2.31.10

Sebastian Dröge slomo at kemper.freedesktop.org
Tue Jan 17 06:02:50 PST 2012


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

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue Jan 17 11:19:33 2012 +0100

configure: Require GIO 2.31.10

---

 configure.ac        |   17 ++++++++++++++++-
 gst/udp/Makefile.am |    2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5e16f67..f836898 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,22 @@ dnl *** checks for dependency libraries ***
 
 dnl GLib is required
 AG_GST_GLIB_CHECK([2.24])
-PKG_CHECK_MODULES(GIO, [ gio-2.0 >= 2.20 ], , AC_MSG_ERROR([gio is required]))
+
+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)
+])
 
 dnl Orc
 ORC_CHECK([0.4.11])
diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am
index 0a4fb6b..1611238 100644
--- a/gst/udp/Makefile.am
+++ b/gst/udp/Makefile.am
@@ -15,7 +15,7 @@ BUILT_SOURCES = $(built_sources) $(built_headers)
 
 libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c gstdynudpsink.c gstudpnetutils.c
 
-libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_NET_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) -D_GNU_SOURCE
+libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_NET_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstudp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_NET_LIBS) $(GIO_LIBS)
 libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstudp_la_LIBTOOLFLAGS = --tag=disable-static



More information about the gstreamer-commits mailing list