[banshee] [build] Fix up build of the new GIO hardware support

[Bertrand Lorentz <blorentz src gnome org>]

commit 1e909e6d6a259b8d4c681c920451175cab249072
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat Aug 14 14:03:57 2010 +0200

    [build] Fix up build of the new GIO hardware support
    
    The if conditionnal in build.environment.mk didn't work. We can always
    append the optionnal LINK_* variables, they will just be empty if GIO
    hardware support is disabled.
    Clean-up gio.m4 by removing the GIOSHARP_ASSEMBLIES variable which
    was never used. Also fix up indentation.

 build/build.environment.mk |    5 +----
 build/m4/banshee/gio.m4    |   30 ++++++++----------------------
 2 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index f5702c2..7862a74 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -166,10 +166,7 @@ REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCO
 REF_EXTENSION_WIKIPEDIA= $(LINK_BANSHEE_WEBBROWSER_DEPS)
 
 # Backends
-REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO)
-if ENABLE_GIO_HARDWARE
-	REF_BACKEND_GIO += $(LINK_GUDEV) $(LINK_GKEYFILE)
-endif
+REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
 REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
 REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
 REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4
index 75cbd3f..92fd031 100644
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@ -6,7 +6,7 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
 	AC_ARG_ENABLE(gio_hardware, AC_HELP_STRING([--disable-gio-hardware], [Disable GIO Hardware backend]), ,enable_gio_hardware="yes")
 	
 	if test "x$enable_gio" = "xyes"; then
-	   	PKG_CHECK_MODULES(GTKSHARP_BEANS,
+		PKG_CHECK_MODULES(GTKSHARP_BEANS,
 			gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED,
 			enable_gio=yes, enable_gio=no)
 
@@ -19,33 +19,19 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
 			enable_gio="$enable_gio", enable_gio=no)
 
 		if test "x$enable_gio_hardware" = "xyes"; then
-            PKG_CHECK_MODULES(GUDEV_SHARP,
-                gudev-sharp-1.0 >= 0.1,
-                enable_gio_hardware="$enable_gio", enable_gio_hardware=no)
+			PKG_CHECK_MODULES(GUDEV_SHARP,
+				gudev-sharp-1.0 >= 0.1,
+				enable_gio_hardware="$enable_gio", enable_gio_hardware=no)
 
-            PKG_CHECK_MODULES(GKEYFILE_SHARP,
-                gkeyfile-sharp-1.0 >= 0.1,
-                enable_gio_hardware="$enable_gio_hardware", enable_gio_hardware=no)
-
-            if test "x$enable_gio_hardware" = "xyes"; then
-                asm="`$PKG_CONFIG --variable=Libraries gkeyfile-sharp-1.0`"
-                GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm $asm.config"
-                asm="`$PKG_CONFIG --variable=Libraries gudev-sharp-1.0`"
-                GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm $asm.config"
-                AC_SUBST(GIOSHARP_ASSEMBLIES)
-            fi
-        fi
-
-		if test "x$enable_gio" = "xyes"; then
-			asm="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`"
-			GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm $asm.config"
-			AC_SUBST(GIOSHARP_ASSEMBLIES)
+			PKG_CHECK_MODULES(GKEYFILE_SHARP,
+				gkeyfile-sharp-1.0 >= 0.1,
+				enable_gio_hardware="$enable_gio_hardware", enable_gio_hardware=no)
 		fi
 
 		AM_CONDITIONAL(ENABLE_GIO, test "x$enable_gio" = "xyes")
 		AM_CONDITIONAL(ENABLE_GIO_HARDWARE, test "x$enable_gio_hardware" = "xyes")
 	else
-        enable_gio_hardware="no"
+		enable_gio_hardware="no"
 		AM_CONDITIONAL(ENABLE_GIO, false)
 		AM_CONDITIONAL(ENABLE_GIO_HARDWARE, false)
 	fi