[banshee] configure: move GTK backend detection from libbanshee to bnpx11 macro

[Andrés Aragoneses <aaragoneses src gnome org>]

commit 663c47149c56e003498b15288980479f85e1e217
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Tue Oct 15 23:08:54 2013 +0200

    configure: move GTK backend detection from libbanshee to bnpx11 macro
    
    The variables HAVE_X11, HAVE_QUARTZ, GRAPHIC_SUBSYSTEM_X11 and
    GRAPHICS_SUBSYSTEM_QUARTZ were not being used. The one which was
    being used (in the config summary) but not filled with any value,
    was GRAPHICS_SUBSYSTEM.
    
    There was already some GTK backend detection in bnpx11 m4 macro so
    we move from libbanshee to this just the only bits needed to fill
    the value GRAPHICS_SUBSYSTEM, also because libbanshee will be soon
    just optional.

 build/m4/banshee/bnpx11.m4     |   11 +++++++----
 build/m4/banshee/libbanshee.m4 |   12 ------------
 2 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/build/m4/banshee/bnpx11.m4 b/build/m4/banshee/bnpx11.m4
index 8d7a52c..f5ec1cc 100644
--- a/build/m4/banshee/bnpx11.m4
+++ b/build/m4/banshee/bnpx11.m4
@@ -2,17 +2,19 @@ dnl Stolen with gratitude from Totem's configure.in
 
 AC_DEFUN([BANSHEE_CHECK_NOW_PLAYING_X11],
 [
-       have_x11=no
+       GRAPHICS_SUBSYSTEM="Unknown"
        have_xvidmode=no
        GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
        for GTK_TARGET in $GTK_TARGETS; do
-               if test x$GTK_TARGET = xx11; then
+               if test x$GTK_TARGET = xquartz; then
+                       GRAPHICS_SUBSYSTEM="Quartz"
+               elif test x$GTK_TARGET = xx11; then
+                       GRAPHICS_SUBSYSTEM="X11"
+
                        PKG_CHECK_MODULES(BNPX_GTK, gtk+-3.0 >= 3.0 gdk-3.0 >= 3.0)
 
                        AC_PATH_X
 
-                       have_x11=yes
-
                        if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
                                X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
                        fi
@@ -36,5 +38,6 @@ AC_DEFUN([BANSHEE_CHECK_NOW_PLAYING_X11],
                fi
        done
        AM_CONDITIONAL(HAVE_XVIDMODE, [test x$have_xvidmode = xyes])
+       AC_SUBST(GRAPHICS_SUBSYSTEM)
 ])
 
diff --git a/build/m4/banshee/libbanshee.m4 b/build/m4/banshee/libbanshee.m4
index 3172cbc..12fc44e 100644
--- a/build/m4/banshee/libbanshee.m4
+++ b/build/m4/banshee/libbanshee.m4
@@ -15,15 +15,6 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
        SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GTK)
 
-       GTK_TARGETS=$(pkg-config --variable=targets gtk+-3.0)
-       for GTK_TARGET in $GTK_TARGETS; do
-               if test x$GTK_TARGET = xx11; then
-                       GRAPHICS_SUBSYSTEM_X11="yes"
-               elif test x$GTK_TARGET = xquartz; then
-                       GRAPHICS_SUBSYSTEM_QUARTZ="yes"
-               fi
-       done
-
        AC_ARG_ENABLE(clutter, AS_HELP_STRING([--enable-clutter],
                [Enable support for clutter video sink]), , enable_clutter="no")
 
@@ -36,11 +27,8 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE],
                        [Define if the video sink should be Clutter])
        fi
 
-       AM_CONDITIONAL(HAVE_X11, test "x$GRAPHICS_SUBSYSTEM_X11" = "xyes")
-       AM_CONDITIONAL(HAVE_QUARTZ, test "x$GRAPHICS_SUBSYSTEM_QUARTZ" = "xyes")
        AM_CONDITIONAL(HAVE_CLUTTER, test "x$enable_clutter" = "xyes")
 
-       AC_SUBST(GRAPHICS_SUBSYSTEM)
        AC_SUBST(LIBBANSHEE_CFLAGS)
        AC_SUBST(LIBBANSHEE_LIBS)
 ])