[gnote] Change GConf to GSettings in build system

[Aurimas Äernius <aurimasc src gnome org>]

commit 520c89da57cfd5ced3840d31ee14804618e30db4
Author: Aurimas Äernius <aurisc4 gmail com>
Date:   Mon Jun 20 23:13:31 2011 +0300

    Change GConf to GSettings in build system
    
    Require Glib 2.28.
    Replace GConf by GSettings.

 configure.ac            |   10 ++--------
 data/Makefile.am        |   20 ++++++--------------
 src/Makefile.am         |    3 +--
 src/addins/addins.mk.in |    2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b6330b2..57a94eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,8 @@ dnl all the library version.
 dnl if one is harcoded elsewhere, it is a bug
 
 GTK_VERSION=3.0
-LIBGLIBMM_VERSION=2.18
+LIBGLIBMM_VERSION=2.28
 LIBGTKMM_VERSION=3.0
-LIBGCONF_VERSION=2.0.0
 LIBPANELAPPLET_VERSION=3.0
 GTKSPELL_VERSION=2.0.9
 BOOST_VERSION=1.34
@@ -68,7 +67,6 @@ PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_VERSION])
 PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-3.0 >= $LIBGTKMM_VERSION])
 PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
 PKG_CHECK_MODULES(LIBXSLT, [libxslt])
-PKG_CHECK_MODULES(GCONF, [gconf-2.0])
 PKG_CHECK_MODULES(PCRE, [libpcrecpp])
 PKG_CHECK_MODULES(UUID, [uuid])
 
@@ -177,11 +175,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
                    [The domain to use with gettext])
 AM_GLIB_GNU_GETTEXT
 
-#
-# Find gconftool-2
-#
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
+GLIB_GSETTINGS
 
 GNOTE_LOCALEDIR=[${datadir}/locale]
 AC_SUBST(GNOTE_LOCALEDIR)
diff --git a/data/Makefile.am b/data/Makefile.am
index d07925f..16371b3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,17 +15,9 @@ desktop_DATA = $(desktop_files)
 #pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
 
-schemasdir	 = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = gnote.schemas.in
-schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
-
- INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-	$(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
-endif
+gsettings_SCHEMAS = org.gnome.gnote.gschema.xml
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
 
 
 if HAVE_DBUS
@@ -78,7 +70,7 @@ EXTRA_DIST = 					\
 	GNOME_GnoteApplet.xml                   \
 	$(desktop_in_files)     		\
 	$(pkgconfig_in_files)			\
-	$(schemas_in_files)     		\
+	org.gnome.gnote.gschema.xml		\
 	$(man_MANS)				\
 	$(noinst_DATA)				\
 	$(service_in_files)                     \
@@ -88,8 +80,8 @@ EXTRA_DIST = 					\
 DISTCLEANFILES = 				\
 	$(desktop_files)       			\
 	$(pkgconfig_DATA)			\
-	$(schemas_DATA)				\
 	$(applet_DATA)                          \
 	$(applet_DATA).in                       \
 	$(service_DATA)                         \
-	$(dbusservice_DATA)
+	$(dbusservice_DATA)			\
+	$(gsettings_SCHEMAS)
diff --git a/src/Makefile.am b/src/Makefile.am
index de30a32..6a6e1d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = gnote-applet.in
 
 INCLUDES = -I$(top_srcdir)
 AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
-	@GCONF_CFLAGS@ @GTK_CFLAGS@ \
+	@GTK_CFLAGS@ \
 	@GTKSPELL_CFLAGS@ @LIBXML_CFLAGS@ \
 	@LIBXSLT_CFLAGS@ \
 	@PCRE_CFLAGS@ \
@@ -19,7 +19,6 @@ AM_LDFLAGS=-export-dynamic
 
 GNOTE_LIBS = libgnote.a $(top_builddir)/libtomboy/libtomboy.la \
 	@LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
-	@GCONF_LIBS@ \
 	@LIBXSLT_LIBS@ \
 	@PCRE_LIBS@ \
 	@DBUS_LIBS@ \
diff --git a/src/addins/addins.mk.in b/src/addins/addins.mk.in
index fc4e544..9c514fa 100644
--- a/src/addins/addins.mk.in
+++ b/src/addins/addins.mk.in
@@ -4,7 +4,7 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
 AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
-	@GCONF_CFLAGS@ @LIBXML_CFLAGS@ \
+	@LIBXML_CFLAGS@ \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
 AM_LDFLAGS = -avoid-version -module -export-dynamic