[gnome-system-monitor/gtk3] Preparing for move from gconf to gsettings.

[Chris Kühl <chriskuehl src gnome org>]

commit 6bb33d0e30046d899d8968152a8a28c34f5d79dc
Author: Chris Kühl <chrisk openismus com>
Date:   Fri Jan 28 12:36:44 2011 +0100

    Preparing for move from gconf to gsettings.

 configure.in    |    8 ++++++--
 src/Makefile.am |    9 ++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 9726e00..9ebda4d 100644
--- a/configure.in
+++ b/configure.in
@@ -25,13 +25,13 @@ AC_HEADER_STDC
 GNOME_COMPILE_WARNINGS
 
 GLIB_REQUIRED=2.16.0
-GCONF_REQUIRED=1.1.5
+GCONF_REQUIRED=2.31.1
 LIBWNCK_REQUIRED=2.5.0
 LIBGTOP_REQUIRED=2.23.1
 GTK_REQUIRED=2.20.0
 GNOME_ICON_THEME_REQUIRED=2.15.3
 GTKMM_REQUIRED=2.8
-GIOMM_REQUIRED=2.16.0
+GIOMM_REQUIRED=2.25.0
 GLIBMM_REQUIRED=2.14
 LIBXML_REQUIRED=2.0
 RSVG_REQUIRED=2.12
@@ -66,6 +66,10 @@ dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS"
 
 AM_GCONF_SOURCE_2
 
+AC_SUBST(gsettingsschemadir,
+	 `pkg-config --variable gsettingsschemadir gio-2.0`)
+AC_SUBST(gsettingsupdateschemacache,
+	 `pkg-config --variable gsettingsupdateschemacache gio-2.0`)
 
 GETTEXT_PACKAGE=gnome-system-monitor
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/src/Makefile.am b/src/Makefile.am
index 91c81f5..23e80cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,8 +55,15 @@ schema_DATA = $(schema_ins:.schemas.in=.schemas)
 EXTRA_DIST = \
 	$(schema_ins)
 
+gsettingsschema_DATA = org.gnome.gnome-system-monitor.gschema
+org.gnome.gnome-system-monitor.gschema: gnome-system-monitor.schemas
+	gsettings-schema-convert --force --gconf --xml --schema-id $(@:.gschema=) $< -o $@
+install-data-hook:
+	$(gsettingsupdateschemacache) $(gsettingsschemadir)
+
 CLEANFILES = \
-	$(schema_DATA)
+	$(schema_DATA) 		\
+	$(gsettingsschema_DATA)
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local: