[gnome-games] build: Don't implicitly depend on glib 2.26
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] build: Don't implicitly depend on glib 2.26
- Date: Wed, 6 Oct 2010 00:17:51 +0000 (UTC)
commit afba1871cd8be6b1c712c40b9f7973b3d40988f7
Author: Christian Persch <chpe gnome org>
Date: Wed Oct 6 02:15:43 2010 +0200
build: Don't implicitly depend on glib 2.26
Make GLIB_GSETTINGS use conditional. This should allow building
with glib < 2.26 again.
configure.in | 2 +-
libgames-support/Makefile.am | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index d8a38f0..72a583b 100644
--- a/configure.in
+++ b/configure.in
@@ -611,7 +611,7 @@ PKG_CHECK_MODULES([GIO],[gio-2.0 >= $GIO_REQUIRED],[have_gio_2_26=yes],[have_gio
AM_CONDITIONAL([HAVE_GIO_2_26],[test "$have_gio_2_26" = "yes"])
-GLIB_GSETTINGS([],[:])
+m4_ifdef([GLIB_GSETTINGS],[GLIB_GSETTINGS([],[:])])
# Check for GNOME modules
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 477b041..d3d6a7a 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -239,6 +239,7 @@ CLEANFILES += GnomeGamesSupport-1.0.gir $(typelibs_DATA)
endif # HAVE_INTROSPECTION
@INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
+
+ HAVE_GIO_2_26_TRUE@@GSETTINGS_RULES@
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]