[banshee] build: if Gst# backend is enabled, don't build the unmanaged backend



commit ff66abee7ef81ebae6802445ab832c76c728daed
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Wed Oct 16 21:29:05 2013 +0200

    build: if Gst# backend is enabled, don't build the unmanaged backend
    
    It could happen that both backends are built, and the user thinks it is
    running only the GStreamerSharp backend, when in reality it could be
    running both at the same time.

 build/m4/banshee/gstreamer-sharp.m4             |    9 ++++++---
 build/m4/banshee/libbanshee.m4                  |    3 +++
 configure.ac                                    |   10 ++++++----
 src/Backends/Banshee.GStreamerSharp/Makefile.am |    6 +-----
 src/Backends/Makefile.am                        |    4 +---
 5 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/build/m4/banshee/gstreamer-sharp.m4 b/build/m4/banshee/gstreamer-sharp.m4
index 7ebdc30..7fd14f3 100644
--- a/build/m4/banshee/gstreamer-sharp.m4
+++ b/build/m4/banshee/gstreamer-sharp.m4
@@ -5,9 +5,12 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER_SHARP],
        if test "x$enable_gst_sharp" = "xyes"; then
                PKG_CHECK_MODULES(GST_SHARP, gstreamer-sharp-0.10)
                AC_SUBST(GST_SHARP_LIBS)
-               AM_CONDITIONAL(ENABLE_GST_SHARP, true)
-       else
-               AM_CONDITIONAL(ENABLE_GST_SHARP, false)
+
+               PLAYBACK_BACKEND="Banshee.GStreamerSharp"
+               AC_SUBST(PLAYBACK_BACKEND)
+
+               dnl Clutter support is not available in Gst# backend (and was opt-in in the unmanaged one)
+               AM_CONDITIONAL(HAVE_CLUTTER, false)
        fi
 ])
 
diff --git a/build/m4/banshee/libbanshee.m4 b/build/m4/banshee/libbanshee.m4
index 12fc44e..f660e1c 100644
--- a/build/m4/banshee/libbanshee.m4
+++ b/build/m4/banshee/libbanshee.m4
@@ -29,6 +29,9 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
 
        AM_CONDITIONAL(HAVE_CLUTTER, test "x$enable_clutter" = "xyes")
 
+       PLAYBACK_BACKEND="Banshee.GStreamer"
+       AC_SUBST(PLAYBACK_BACKEND)
+
        AC_SUBST(LIBBANSHEE_CFLAGS)
        AC_SUBST(LIBBANSHEE_LIBS)
 ])
diff --git a/configure.ac b/configure.ac
index 47d8db4..e2e00ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,12 +53,14 @@ SHAMROCK_EXPAND_DATADIR
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22)
 
-dnl Default media backend, libbanshee/native dependencies
-BANSHEE_CHECK_GSTREAMER
-
-dnl For the new media backend using gstreamer-sharp
+dnl For the new media backend using gstreamer# (disabled by default for now)
 BANSHEE_CHECK_GSTREAMER_SHARP
 
+if test "x$enable_gst_sharp" != "xyes"; then
+       dnl Default media backend, libbanshee/native dependencies
+       BANSHEE_CHECK_GSTREAMER
+fi
+
 BANSHEE_CHECK_NOW_PLAYING_X11
 
 dnl User help
diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.am b/src/Backends/Banshee.GStreamerSharp/Makefile.am
index 769b260..a884bbe 100644
--- a/src/Backends/Banshee.GStreamerSharp/Makefile.am
+++ b/src/Backends/Banshee.GStreamerSharp/Makefile.am
@@ -15,11 +15,7 @@ SOURCES =  \
 
 RESOURCES = Banshee.GStreamerSharp.addin.xml
 
-if ENABLE_GST_SHARP
 include $(top_srcdir)/build/build.mk
 EXTRA_DIST += Banshee.GStreamerSharp.dll.config
 module_SCRIPTS += Banshee.GStreamerSharp.dll.config
-else
-include $(top_srcdir)/build/build.dist.mk
-EXTRA_DIST += Banshee.GStreamerSharp.dll.config
-endif
+
diff --git a/src/Backends/Makefile.am b/src/Backends/Makefile.am
index 9e16b66..cf41c1e 100644
--- a/src/Backends/Makefile.am
+++ b/src/Backends/Makefile.am
@@ -1,12 +1,10 @@
 SUBDIRS = \
        Banshee.Gio \
        Banshee.Gnome \
-       Banshee.GStreamer \
-       Banshee.GStreamerSharp \
+       $(PLAYBACK_BACKEND) \
        Banshee.Unix \
        Banshee.NowPlaying.X11 \
        Banshee.Osx \
        Banshee.Windows
 
 MAINTAINERCLEANFILES = Makefile.in
-


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]