From f98e647a3142adeb55e5f55f4488fa357b571e80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 17 Jan 2012 11:29:26 +0100 Subject: [PATCH] configure: We require GIO now --- configure.ac | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 53cc825..2288224 100644 --- a/configure.ac +++ b/configure.ac @@ -248,6 +248,22 @@ dnl *** checks for dependency libraries *** dnl GLib is required AG_GST_GLIB_CHECK([2.26]) +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) +]) + ORC_CHECK([0.4.11]) dnl checks for gstreamer @@ -646,25 +662,6 @@ AG_GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [ fi ]) -dnl *** libgio *** -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.16, [ - HAVE_GIO="yes" - 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.]) - ], [ - HAVE_GIO="no" - ]) - AC_SUBST(GIO_CFLAGS) - AC_SUBST(GIO_LIBS) - AC_SUBST(GIO_LDFLAGS) -]) - dnl *** libvisual *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBVISUAL, true) AG_GST_CHECK_FEATURE(LIBVISUAL, [libvisual visualization library], libvisual, [ -- 2.7.4