configure.ac: Require GLib 2.31.10 and improve GIO check

This commit is contained in:
Sebastian Dröge 2012-01-18 16:15:59 +01:00
parent 2eeb0eb58e
commit 7332e2a229

View file

@ -197,24 +197,25 @@ AC_CHECK_TYPE([struct ip_mreqn], [
dnl *** checks for dependency libraries *** 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 dnl Check for GIO
translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true) PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQ)
AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [ GIO_MODULE_DIR="`$PKG_CONFIG --variable=giomoduledir gio-2.0`"
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.31.10) AC_DEFINE_UNQUOTED(GIO_MODULE_DIR, "$GIO_MODULE_DIR",
GIO_MODULE_DIR="`$PKG_CONFIG --variable=giomoduledir gio-2.0`"
AC_DEFINE_UNQUOTED(GIO_MODULE_DIR, "$GIO_MODULE_DIR",
[The GIO modules directory.]) [The GIO modules directory.])
GIO_LIBDIR="`$PKG_CONFIG --variable=libdir gio-2.0`" GIO_LIBDIR="`$PKG_CONFIG --variable=libdir gio-2.0`"
AC_DEFINE_UNQUOTED(GIO_LIBDIR, "$GIO_LIBDIR", AC_DEFINE_UNQUOTED(GIO_LIBDIR, "$GIO_LIBDIR",
[The GIO library directory.]) [The GIO library directory.])
AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS) AC_SUBST(GIO_LIBS)
AC_SUBST(GIO_LDFLAGS) AC_SUBST(GIO_LDFLAGS)
]) dnl GLib is required
dnl Orc dnl Orc
ORC_CHECK([0.4.11]) ORC_CHECK([0.4.11])