Merge branch 'master' into dbus-sharp

Conflicts:
	configure.ac
	src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
	src/Backends/Banshee.Hal/Banshee.Hal.csproj
	src/Clients/Beroe/Beroe.csproj
	src/Clients/Booter/Booter.csproj
	src/Clients/Halie/Halie.csproj
	src/Clients/Muinshee/Muinshee.csproj
	src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
	src/Core/Banshee.Core/Banshee.Core.csproj
	src/Core/Banshee.Services/Banshee.Services.csproj
	src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
	src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
	src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
	src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
	src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj

5 files changed, 53 insertions, 6 deletions

diff --git a/build/m4/banshee/dap-karma.m4 b/build/m4/banshee/dap-karma.m4
index ddb05b30d..202fd1057 100644
--- a/build/m4/banshee/dap-karma.m4
+++ b/build/m4/banshee/dap-karma.m4
@@ -12,7 +12,12 @@ AC_DEFUN([BANSHEE_CHECK_DAP_KARMA],
 		enable_karmasharp="$enable_karmasharp", enable_karmasharp=no)
 
 	if test "x$enable_karmasharp" = "xyes"; then
-		KARMASHARP_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries karma-sharp`"
+		asms="`$PKG_CONFIG --variable=Libraries karma-sharp`"
+		for asm in $asms; do
+			KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm"
+			[[ -r "$asm.config" ]] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.config"
+			[[ -r "$asm.mdb" ]] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.mdb"
+		done
 		AC_SUBST(KARMASHARP_ASSEMBLIES)
 		AC_SUBST(KARMASHARP_LIBS)
 	fi
diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
index a9b913028..3420f0c99 100644
--- a/build/m4/banshee/gstreamer.m4
+++ b/build/m4/banshee/gstreamer.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
 [
-	GSTREAMER_REQUIRED_VERSION=0.10.12
+	GSTREAMER_REQUIRED_VERSION=0.10.23
 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
 
 	PKG_CHECK_MODULES(GST,
@@ -11,11 +11,16 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
 		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
 		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
 
-	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10"
+	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
 
 	AC_SUBST(GST_CFLAGS)
 	AC_SUBST(GST_LIBS)
 
+	PKG_CHECK_MODULES(GST_0_10_26,
+		gstreamer-plugins-base-0.10 >= 0.10.26,
+		has_gst_0_10_26=yes, has_gst_0_10_26=no)
+	AM_CONDITIONAL(HAVE_GST_0_10_26, test "x$has_gst_0_10_26" = "xyes")
+
 	dnl Builtin equalizer (optional)
 	AC_ARG_ENABLE(builtin-equalizer,
 		AC_HELP_STRING([--disable-builtin-equalizer],
diff --git a/build/m4/banshee/mono-addins.m4 b/build/m4/banshee/mono-addins.m4
index 267d0e3dc..99ea5a6fd 100644
--- a/build/m4/banshee/mono-addins.m4
+++ b/build/m4/banshee/mono-addins.m4
@@ -5,8 +5,5 @@ AC_DEFUN([BANSHEE_CHECK_MONO_ADDINS],
 
 	PKG_CHECK_MODULES(MONO_ADDINS_SETUP, mono-addins-setup >= 0.3.1)
 	AC_SUBST(MONO_ADDINS_SETUP_LIBS)
-
-	PKG_CHECK_MODULES(MONO_ADDINS_GUI, mono-addins-gui >= 0.3.1)
-	AC_SUBST(MONO_ADDINS_GUI_LIBS)
 ])
 
diff --git a/build/m4/banshee/soundmenu.m4 b/build/m4/banshee/soundmenu.m4
new file mode 100644
index 000000000..9522feb68
--- /dev/null
+++ b/build/m4/banshee/soundmenu.m4
@@ -0,0 +1,20 @@
+AC_DEFUN([BANSHEE_CHECK_SOUNDMENU],
+[
+	LIBINDICATESHARP_REQUIRED=0.4.1
+
+	AC_ARG_ENABLE([soundmenu],
+		AS_HELP_STRING([--enable-soundmenu], [Enable sound menu support]),
+		enable_soundmenu=$enableval, enable_soundmenu=no
+	)
+
+	if test "x$enable_soundmenu" = "xyes"; then
+		has_indicatesharp=no
+		PKG_CHECK_MODULES(INDICATESHARP,
+			indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED,
+			has_indicatesharp=yes, has_indicatesharp=no)
+	fi
+
+	AM_CONDITIONAL(HAVE_INDICATESHARP, test "x$has_indicatesharp" = "xyes")
+	AM_CONDITIONAL(ENABLE_SOUNDMENU, test "x$enable_soundmenu" = "xyes")
+])
+
diff --git a/build/m4/banshee/ubuntuonemusicstore.m4 b/build/m4/banshee/ubuntuonemusicstore.m4
new file mode 100644
index 000000000..2ff4a67b7
--- /dev/null
+++ b/build/m4/banshee/ubuntuonemusicstore.m4
@@ -0,0 +1,20 @@
+AC_DEFUN([BANSHEE_CHECK_UBUNTUONE],
+[
+	AC_ARG_ENABLE([ubuntuone],
+		AS_HELP_STRING([--enable-ubuntuone], [Enable Ubuntu One Music Store support]),
+		enable_ubuntuone=$enableval, enable_ubuntuone=no
+	)
+
+	if test "x$enable_ubuntuone" = "xyes"; then
+		has_ubuntuonesharp=no
+		PKG_CHECK_MODULES(UBUNTUONESHARP,
+			[ubuntuone-sharp-1.0],
+			has_ubuntuonesharp=yes, has_ubuntuonesharp=no)
+		if test "x$has_ubuntuonesharp" = "xno"; then
+			AC_MSG_ERROR([ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone])
+		fi
+	fi
+
+	AM_CONDITIONAL(ENABLE_UBUNTUONE, test "x$enable_ubuntuone" = "xyes")
+])
+