build: Use (new) gstreamer-discoverer pkg-config file

diff --git a/configure.ac b/configure.ac
index 922904e..6e2e5a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +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
+GST_DISCOVERER_REQUIRED=0.10.0.1
 GIO_REQUIRED=2.16
 GEE_REQUIRED=0.5.0
 UUID_REQUIRED=1.41.3
@@ -38,7 +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(LIBGSTDISCOVERER, gstreamer-discoverer-0.10 >= $GST_DISCOVERER_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)
@@ -102,9 +102,9 @@ 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",
+    AC_CHECK_FILE("${VAPIDIR}/gstreamer-discoverer-0.10.vapi",
                   true,
-                  [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-convenience-libs-0.10")])
+                  [AC_MSG_ERROR("Unable to find Vala bindings for gstreamer-discoverer-0.10")])
 
     AC_CHECK_FILE("${VAPIDIR}/gio-2.0.vapi",
                   true,

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 910aa69..f8271db 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -13,6 +13,7 @@ endif
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGUPNP_AV_CFLAGS) \
            $(LIBGSTREAMER_CFLAGS) \
+           $(LIBGSTDISCOVERER_FLAGS) \
            $(GIO_CFLAGS) \
            $(GEE_CFLAGS) \
            $(UUID_CFLAGS) \
@@ -108,7 +109,7 @@ rygel_VALAFLAGS = \
        --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 \
-       --pkg gstreamer-convenience-libs-0.10 \
+       --pkg gstreamer-discoverer-0.10 \
        -g
 # Note:  `-- the -g needs to be at the end of VALAFLAGS to not break make dist
 
@@ -116,7 +117,7 @@ rygel_LDADD = librygel-configuration.a \
              $(LIBGUPNP_LIBS) \
              $(LIBGUPNP_AV_LIBS) \
              $(LIBGSTREAMER_LIBS) \
-             $(GST_CONVENIENCE_LIBS) -lgstdiscoverer-0.10 \
+             $(LIBGSTDISCOVERER_LIBS) \
              $(GIO_LIBS) \
              $(GEE_LIBS) \
              $(UUID_LIBS) \