[gnome-games] libgames-support: Always depend on gio

[Robert Ancell <rancell src gnome org>]

commit ced527a1f52ca646aa5e1341b952dbf787b15353
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri May 4 13:57:36 2012 +1200

    libgames-support: Always depend on gio

 configure.ac                 |    4 +--
 libgames-support/Makefile.am |   45 ++++++++++++++---------------------------
 2 files changed, 17 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c77f78c..6440d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,12 +276,10 @@ AC_SUBST([RSVG_LIBS])
 
 # GDBus
 
-PKG_CHECK_MODULES([GIO],[gio-2.0 >= $GIO_REQUIRED],[have_gio_2_26=yes],[have_gio_2_26=no])
+PKG_CHECK_MODULES([GIO],[gio-2.0 >= $GIO_REQUIRED])
 
 # GSettings
 
-AM_CONDITIONAL([HAVE_GIO_2_26],[test "$have_gio_2_26" = "yes"])
-
 m4_ifdef([GLIB_GSETTINGS],[GLIB_GSETTINGS([],[:])])
 
 # Check for SQLite
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index bfc9ab9..e9b9103 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -2,44 +2,34 @@ commondatadir = $(datadir)/gnome-games-common
 
 noinst_LTLIBRARIES = libgames-support.la
 
-# libgames-support.la
-
-libgames_support_la_SOURCES =		\
+libgames_support_la_SOURCES = \
 	games-stock.c			\
-	games-stock.h
-
-libgames_support_la_SOURCES +=		\
+	games-stock.h			\
 	games-clock.c			\
 	games-clock.h			\
-	games-preimage.c                \
-	games-preimage.h
-
-if HAVE_GIO_2_26
-libgames_support_la_SOURCES += \
-	games-settings.c \
-	games-settings.h
-endif
-
-libgames_support_la_SOURCES +=		\
-	games-file-list.c			\
-	games-file-list.h			\
+	games-preimage.c		\
+	games-preimage.h		\
+	games-settings.c		\
+	games-settings.h		\
+	games-file-list.c		\
+	games-file-list.h		\
 	games-frame.c			\
 	games-frame.h			\
 	games-fullscreen-action.c	\
 	games-fullscreen-action.h	\
 	games-gridframe.c		\
 	games-gridframe.h		\
-	games-pause-action.c		\
-	games-pause-action.h		\
+	games-pause-action.c	\
+	games-pause-action.h	\
 	games-score.h			\
 	games-score.c			\
 	games-scores.c			\
 	games-scores.h			\
-	games-scores-dialog.c		\
-	games-scores-dialog.h		\
+	games-scores-dialog.c	\
+	games-scores-dialog.h	\
 	games-controls.c		\
 	games-controls.h		\
-	games-scores-backend.c		\
+	games-scores-backend.c	\
 	games-scores-backend.h
 
 if ENABLE_SETGID
@@ -61,17 +51,14 @@ libgames_support_la_CPPFLAGS = \
 libgames_support_la_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(AM_CFLAGS)
 
 libgames_support_la_LIBADD = \
 	$(GTK_LIBS) \
+	$(GIO_LIBS) \
 	$(RSVG_LIBS)
 
-if HAVE_GIO_2_26
-libgames_support_la_CFLAGS += $(GIO_CFLAGS)
-libgames_support_la_LIBADD += $(GIO_LIBS)
-endif
-
 gsettingsschema_in_files = org.gnome.Games.WindowState.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.gschema.xml.in=.gschema.xml)
 
@@ -86,6 +73,6 @@ DISTCLEANFILES =
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
- HAVE_GIO_2_26_TRUE@@GSETTINGS_RULES@
+ GSETTINGS_RULES@
 
 -include $(top_srcdir)/git.mk