Add plugin dependency for the GIO and GVfs modules.

Original commit message from CVS:
* configure.ac:
* ext/gio/gstgio.c: (plugin_init):
Add plugin dependency for the GIO and GVfs modules.
Fixes bug #566876.
This commit is contained in:
Sebastian Dröge 2009-01-07 18:36:04 +00:00
parent 54910e9253
commit b6b860f9a4
3 changed files with 21 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2009-01-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* configure.ac:
* ext/gio/gstgio.c: (plugin_init):
Add plugin dependency for the GIO and GVfs modules.
Fixes bug #566876.
2009-01-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* configure.ac:

View file

@ -484,7 +484,15 @@ dnl *** libgio ***
USE_GIO=$BUILD_EXPERIMENTAL
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.15.2, HAVE_GIO="yes", [
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.2, [
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_MSG_RESULT(no)
])

View file

@ -230,6 +230,11 @@ plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (gst_gio_debug, "gio", 0, "GIO elements");
gst_plugin_add_dependency_simple (plugin, NULL, GIO_MODULE_DIR, NULL,
GST_PLUGIN_DEPENDENCY_FLAG_NONE);
gst_plugin_add_dependency_simple (plugin, "LD_LIBRARY_PATH", GIO_LIBDIR,
"gvfsd", GST_PLUGIN_DEPENDENCY_FLAG_NONE);
/* FIXME: Rank is MARGINAL for now, should be at least SECONDARY+1 in the future
* to replace gnomevfssink/src. For testing purposes PRIMARY+1 one makes sense
* so it gets autoplugged and preferred over filesrc/sink. */