[banshee/gst#: 486/487] [gst#] Require explicit --enable-gst-sharp to build
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/gst#: 486/487] [gst#] Require explicit --enable-gst-sharp to build
- Date: Thu, 3 Jun 2010 18:05:26 +0000 (UTC)
commit f037861f13ce16026fe7b927ede5a448d4a8f2d5
Author: Gabriel Burt <gabriel burt gmail com>
Date: Thu Jun 3 10:53:29 2010 -0700
[gst#] Require explicit --enable-gst-sharp to build
build/m4/banshee/gstreamer-sharp.m4 | 11 +++++++++--
configure.ac | 1 +
.../Banshee.GStreamerSharp/PlayerEngine.cs | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/build/m4/banshee/gstreamer-sharp.m4 b/build/m4/banshee/gstreamer-sharp.m4
index 1eaa02e..7accc30 100644
--- a/build/m4/banshee/gstreamer-sharp.m4
+++ b/build/m4/banshee/gstreamer-sharp.m4
@@ -1,6 +1,13 @@
AC_DEFUN([BANSHEE_CHECK_GSTREAMER_SHARP],
[
- PKG_CHECK_MODULES(GST_SHARP, gstreamer-sharp-0.10)
- AC_SUBST(GST_SHARP_LIBS)
+ AC_ARG_ENABLE(gst_sharp, AC_HELP_STRING([--enable-gst-sharp], [Enable Gst# backend]), , enable_gst_sharp="no")
+
+ 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)
+ fi
])
diff --git a/configure.ac b/configure.ac
index 8bc39ec..9bc8573 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,6 +397,7 @@ EOF
if test "x$enable_moonlight" = "xyes"; then br=yes; echo " Moonlight Effects: ${enable_moonlight}"; fi
if test "x$enable_remote_audio" = "xyes"; then br=yes; echo " Remote Audio: ${enable_remote_audio}"; fi
if test "x$enable_torrent" = "xyes"; then br=yes; echo " Torrent Podcasts: ${enable_torrent}"; fi
+if test "x$enable_gst_sharp" = "xyes"; then br=yes; echo " Gst# Backend: ${enable_gst_sharp} (unfinished, experimental!)"; fi
if test -d ${expanded_libdir}/${PACKAGE}; then
if test x$br = xyes; then echo; fi
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
index 66a7050..5d8269d 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
@@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if HAVE_GST_SHARP
+#if ENABLE_GST_SHARP
using System;
using System.Collections;
@@ -150,4 +150,4 @@ namespace Banshee.GStreamerSharp
}
}
}
-#endif
\ No newline at end of file
+#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]