Merge branch 'master' into gst#

Conflicts:
	Banshee.sln
	src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj

5 files changed, 62 insertions, 23 deletions

diff --git a/build/m4/banshee/dap-ipod.m4 b/build/m4/banshee/dap-ipod.m4
index a83e4c0b1..ccc089408 100644
--- a/build/m4/banshee/dap-ipod.m4
+++ b/build/m4/banshee/dap-ipod.m4
@@ -19,7 +19,7 @@ AC_DEFUN([BANSHEE_CHECK_DAP_IPOD],
 		asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`"
 		for asm in $asms; do
 			IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm"
-			[ -r "$asm.mdb" ] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb"
+			[[ -r "$asm.mdb" ]] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb"
 		done
 		AC_SUBST(IPODSHARP_ASSEMBLIES)
 		AC_SUBST(IPODSHARP_LIBS)
diff --git a/build/m4/banshee/meego.m4 b/build/m4/banshee/meego.m4
new file mode 100644
index 000000000..eceebe325
--- /dev/null
+++ b/build/m4/banshee/meego.m4
@@ -0,0 +1,11 @@
+AC_DEFUN([BANSHEE_CHECK_MEEGO],
+[
+	AC_ARG_ENABLE(meego, AC_HELP_STRING([--enable-meego], [Enable Moblin integration]), , enable_meego="no")
+
+	if test "x$enable_meego" = "xyes"; then
+		AM_CONDITIONAL(HAVE_MEEGO, true)
+	else
+		AM_CONDITIONAL(HAVE_MEEGO, false)
+	fi
+])
+
diff --git a/build/m4/banshee/moblin.m4 b/build/m4/banshee/moblin.m4
deleted file mode 100644
index c6ee39847..000000000
--- a/build/m4/banshee/moblin.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_DEFUN([BANSHEE_CHECK_MOBLIN],
-[
-	AC_ARG_ENABLE(moblin, AC_HELP_STRING([--enable-moblin], [Enable Moblin integration]), , enable_moblin="no")
-
-	if test "x$enable_moblin" = "xyes"; then
-		AM_CONDITIONAL(HAVE_MOBLIN, true)
-	else
-		AM_CONDITIONAL(HAVE_MOBLIN, false)
-	fi
-])
-
diff --git a/build/m4/banshee/taglib.m4 b/build/m4/banshee/taglib.m4
index cfeb3284c..1fde14402 100644
--- a/build/m4/banshee/taglib.m4
+++ b/build/m4/banshee/taglib.m4
@@ -1,5 +1,5 @@
 AC_DEFUN([BANSHEE_CHECK_TAGLIB_SHARP],
 [
-	PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0.3.5)
+	PKG_CHECK_MODULES(TAGLIB_SHARP, taglib-sharp >= 2.0.3.7)
 	AC_SUBST(TAGLIB_SHARP_LIBS)
 ])
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
index 641eee2d4..c40ecbfc2 100644
--- a/build/m4/shamrock/mono.m4
+++ b/build/m4/shamrock/mono.m4
@@ -8,48 +8,87 @@ AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
 ])
 
+AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
+[
+	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
+])
+
 AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
 [
 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
 ])
 
+AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE],
+[
+	PKG_CHECK_MODULES(MONO_MODULE, $1 >= $2)
+])
+
 AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE],
 [
-	PKG_CHECK_MODULES(MONO_MODULE, mono >= $1)
+	_SHAMROCK_CHECK_MONO_MODULE(mono, $1)
 ])
 
-AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
+AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE],
 [
-	PKG_CHECK_MODULES(MONO_MODULE, mono >= $1, 
+	_SHAMROCK_CHECK_MONO_MODULE(mono-2, $1)
+])
+
+AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
+[
+	PKG_CHECK_MODULES(MONO_MODULE, $2 >= $1,
 		HAVE_MONO_MODULE=yes, HAVE_MONO_MODULE=no)
 	AC_SUBST(HAVE_MONO_MODULE)
 ])
 
+AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
+[
+	_SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono, $1)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE_NOBAIL],
+[
+	_SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono-2, $1)
+])
+
 AC_DEFUN([_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
 [
-	for asm in $(echo "$*" | cut -d, -f2- | sed 's/\,/ /g')
+	for asm in $(echo "$*" | cut -d, -f3- | sed 's/\,/ /g')
 	do
-		AC_MSG_CHECKING([for Mono $1 GAC for $asm.dll])
+		AC_MSG_CHECKING([for Mono $2 GAC for $asm.dll])
 		if test \
-			-e "$($PKG_CONFIG --variable=libdir mono)/mono/$1/$asm.dll" -o \
-			-e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/$1/$asm.dll"; \
+			-e "$($PKG_CONFIG --variable=libdir $1)/mono/$2/$asm.dll" -o \
+			-e "$($PKG_CONFIG --variable=prefix $1)/lib/mono/$2/$asm.dll"; \
 			then \
 			AC_MSG_RESULT([found])
 		else
 			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([missing reqired Mono $1 assembly: $asm.dll])
+			AC_MSG_ERROR([missing required Mono $2 assembly: $asm.dll])
 		fi
 	done
 ])
 
 AC_DEFUN([SHAMROCK_CHECK_MONO_1_0_GAC_ASSEMBLIES],
 [
-	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(1.0, $*)
+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 1.0, $*)
 ])
 
 AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES],
 [
-	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(2.0, $*)
+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 2.0, $*)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO2_2_0_GAC_ASSEMBLIES],
+[
+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 2.0, $*)
+])
+
+AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
+[
+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
 ])
 
+AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
+[
+	_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
+])