Add plugin dependency for the gnomevfs modules.

Original commit message from CVS:
* configure.ac:
* ext/gnomevfs/gstgnomevfs.c: (plugin_init):
Add plugin dependency for the gnomevfs modules.
Fixes bug #566875.

diff --git a/ChangeLog b/ChangeLog
index 4ffbd43..dd0d500 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-01-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
+       * configure.ac:
+       * ext/gnomevfs/gstgnomevfs.c: (plugin_init):
+       Add plugin dependency for the gnomevfs modules.
+       Fixes bug #566875.
+
+2009-01-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
        * win32/common/libgstcdda.def:
        Add new symbol to the list of exported symbols.
 

diff --git a/configure.ac b/configure.ac
index 364f647..33dcae8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -467,7 +467,17 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 dnl *** GNOME VFS ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GNOME_VFS, true)
 AG_GST_CHECK_FEATURE(GNOME_VFS, [GNOME VFS], gnomevfs, [
-  AG_GST_PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0)
+  PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, [
+      HAVE_GNOME_VFS="yes"
+      AC_SUBST(GNOME_VFS_CFLAGS)
+      AC_SUBST(GNOME_VFS_LIBS)
+      GNOME_VFS_MODULES_DIR="`$PKG_CONFIG --variable=modulesdir gnome-vfs-2.0`"
+      AC_DEFINE_UNQUOTED(GNOME_VFS_MODULES_DIR, "$GNOME_VFS_MODULES_DIR",
+             [The GnomeVFS modules directory.])
+    ],[
+      HAVE_GNOME_VFS="no"
+    ]
+    )
 ])
 
 dnl *** libgio ***

diff --git a/ext/gnomevfs/gstgnomevfs.c b/ext/gnomevfs/gstgnomevfs.c
index 2647e0f..747f1cf 100644 (file)
--- a/ext/gnomevfs/gstgnomevfs.c
+++ b/ext/gnomevfs/gstgnomevfs.c
@@ -114,6 +114,9 @@ plugin_init (GstPlugin * plugin)
     }
   }
 
+  gst_plugin_add_dependency_simple (plugin, NULL, GNOME_VFS_MODULES_DIR, NULL,
+      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
+
   if (!gst_element_register (plugin, "gnomevfssrc", GST_RANK_SECONDARY,
           gst_gnome_vfs_src_get_type ()))
     return FALSE;