build: Link against libraries required for GstDiscoverer

This is required for switching MetadataExtractor to use GstDiscoverer.

diff --git a/configure.ac b/configure.ac
index 8e1f778..922904e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ GUPNP_AV_REQUIRED=0.5.7
 GUPNP_VALA_REQUIRED=0.6.7
 DBUS_GLIB_REQUIRED=0.74
 GSTREAMER_REQUIRED=0.10.23
+GST_CONVENIENCE_LIBS_REQUIRED=0.10.0.1
 GIO_REQUIRED=2.16
 GEE_REQUIRED=0.5.0
 UUID_REQUIRED=1.41.3
@@ -37,6 +38,7 @@ PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
 PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED)
 PKG_CHECK_MODULES(LIBDBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
+PKG_CHECK_MODULES(GST_CONVENIENCE_LIBS, gstreamer-convenience-libs-0.10 >= $GST_CONVENIENCE_LIBS_REQUIRED)
 PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
 PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
 PKG_CHECK_MODULES(UUID, uuid >= $UUID_REQUIRED)
@@ -100,6 +102,10 @@ if test x$enable_vala = xyes ; then
                   true,
                   [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-0.10")])
 
+    AC_CHECK_FILE("${VAPIDIR}/gstreamer-convenience-libs-0.10.vapi",
+                  true,
+                  [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-convenience-libs-0.10")])
+
     AC_CHECK_FILE("${VAPIDIR}/gio-2.0.vapi",
                   true,
                   [AC_MSG_ERROR("Unable to find Vala bindings for gio-2.0")])

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index c700e68..910aa69 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -107,12 +107,16 @@ rygel_VALAFLAGS = \
        -H rygel.h -C --library=rygel-1.0 --vapidir=$(srcdir) --thread \
        --pkg rygel-build-config --pkg rygel-misc --pkg gupnp-1.0 \
        --pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gstreamer-0.10 \
-       --pkg gio-2.0 --pkg gee-1.0 --pkg posix -g
+       --pkg gio-2.0 --pkg gee-1.0 --pkg posix \
+       --pkg gstreamer-convenience-libs-0.10 \
+       -g
+# Note:  `-- the -g needs to be at the end of VALAFLAGS to not break make dist
 
 rygel_LDADD = librygel-configuration.a \
              $(LIBGUPNP_LIBS) \
              $(LIBGUPNP_AV_LIBS) \
              $(LIBGSTREAMER_LIBS) \
+             $(GST_CONVENIENCE_LIBS) -lgstdiscoverer-0.10 \
              $(GIO_LIBS) \
              $(GEE_LIBS) \
              $(UUID_LIBS) \