[tracker/gstreamer-with-dlna] build: require gstreamer-pbutils when using Discoverer backend
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/gstreamer-with-dlna] build: require gstreamer-pbutils when using Discoverer backend
- Date: Wed, 13 Jul 2011 12:20:16 +0000 (UTC)
commit 7fa1e124a061f2ca215f77527463a36b4f4a34e9
Author: Aleksander Morgado <aleksander lanedo com>
Date: Wed Jul 13 14:17:54 2011 +0200
build: require gstreamer-pbutils when using Discoverer backend
configure.ac | 14 +++++++++++++-
src/tracker-extract/Makefile.am | 7 +++++++
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ffda2b2..74f9467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1607,6 +1607,17 @@ else
AC_DEFINE(GSTREAMER_BACKEND_TAGREADBIN, [], [Define that GStreamer Tagreadbin should be used])
;;
"xdiscoverer")
+ PKG_CHECK_MODULES(GSTREAMER_PBUTILS,
+ [gstreamer-pbutils-0.10 >= $GSTREAMER_REQUIRED],
+ [have_gstreamer_pbutils=yes],
+ [have_gstreamer_pbutils=no])
+ AC_SUBST(GSTREAMER_PBUTILS_CFLAGS)
+ AC_SUBST(GSTREAMER_PBUTILS_LIBS)
+
+ if test "x$have_gstreamer_pbutils" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find GStreamer pbutils])
+ fi
+
gstreamer_backend="Discoverer"
AC_DEFINE(GSTREAMER_BACKEND_DISCOVERER, [], [Define that GStreamer Discoverer should be used])
;;
@@ -1630,7 +1641,8 @@ else
esac
fi
-AM_CONDITIONAL(HAVE_GUPNP_DLNA, test "x$gstreamer_backend" = "xGUPnP-DLNA")
+AM_CONDITIONAL(HAVE_GUPNP_DLNA, test "x$gstreamer_backend" = "xGUPnP-DLNA")
+AM_CONDITIONAL(HAVE_GSTREAMER_PBUTILS, test "x$gstreamer_backend" = "xDiscoverer")
##################################################################
# Check for tracker-extract: helixbin for gstreamer
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 64e0a65..09a070b 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -328,11 +328,18 @@ libextract_gstreamer_la_LIBADD = \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(GSTREAMER_LIBS)
+
+# GStreamer with GUPnP-DLNA backend?
if HAVE_GUPNP_DLNA
libextract_gstreamer_la_CFLAGS += $(GUPNP_DLNA_CFLAGS)
libextract_gstreamer_la_LIBADD += $(GUPNP_DLNA_LIBS)
endif
+# GStreamer with Discoverer backend?
+if HAVE_GSTREAMER_PBUTILS
+libextract_gstreamer_la_CFLAGS += $(GSTREAMER_PBUTILS_CFLAGS)
+libextract_gstreamer_la_LIBADD += $(GSTREAMER_PBUTILS_LIBS)
+endif
# GStreamer helix
libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]