[banshee] Add shamrock macros for finding mono-2.pc.

[Ruben Vermeersch <rubenv src gnome org>]

commit aaa5ca2fb39703c7c5d65a989c6312fe821d812a
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Apr 6 18:29:27 2010 +0200

    Add shamrock macros for finding mono-2.pc.
    
    The ABI changed in mono 2.7 and as such, the pkg-config file was renamed from
    mono.pc to mono-2.pc. This patch adds shamrock macro's for finding the desired
    mono module. As well as macro's for checking for assemblies in the specified
    GAC. No 1.0 profile assembly check macro has been added for mono-2, as I think
    this has been deprecated.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=614980

 build/m4/shamrock/mono.m4 |   51 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 11 deletions(-)
---
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
index 0087197..c40ecbf 100644
--- a/build/m4/shamrock/mono.m4
+++ b/build/m4/shamrock/mono.m4
@@ -18,48 +18,77 @@ 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],
+[
+	_SHAMROCK_CHECK_MONO_MODULE(mono-2, $1)
+])
+
+AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
 [
-	PKG_CHECK_MODULES(MONO_MODULE, mono >= $1, 
+	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 required 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(4.0, $*)
+	_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, $*)
+])