[gedit/gsettings: 11/13] Use the new GLIB_GSETTINGS macro to manage the scheme installation.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 1ac9ec369197102d4c27eaeab51823b375ad51de
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Apr 24 12:43:04 2010 +0200

    Use the new GLIB_GSETTINGS macro to manage the scheme installation.

 configure.ac     |   11 ++++++-----
 data/Makefile.am |    5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7e4db0f..df9c235 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,11 +293,6 @@ GEDIT_LIBS="$GEDIT_LIBS $X11_LIBS"
 AC_SUBST(GEDIT_CFLAGS)
 AC_SUBST(GEDIT_LIBS)
 
-AC_SUBST(gsettingsschemadir,
-         `pkg-config --variable gsettingsschemadir gio-2.0`)
-AC_SUBST(gsettingsupdateschemacache,
-         `pkg-config --variable gsettingsupdateschemacache gio-2.0`)
-
 dnl FIXME: Remove this when removing gedit-message-area
 
 if $PKG_CONFIG --atleast-version 2.17.1 gtk+-2.0; then
@@ -335,6 +330,12 @@ AC_SUBST(EGG_SMCLIENT_CFLAGS)
 AC_SUBST(EGG_SMCLIENT_LIBS)
 
 dnl ================================================================
+dnl GSettings stuff
+dnl ================================================================
+
+GLIB_GSETTINGS
+
+dnl ================================================================
 dnl Python
 dnl ================================================================
 
diff --git a/data/Makefile.am b/data/Makefile.am
index bb6f90e..194f4a7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,12 +19,13 @@ gedit- GEDIT_API_VERSION@.pc: gedit.pc
 bugreportdir = $(libexecdir)/gedit-2
 bugreport_SCRIPTS = gedit-bugreport.sh
 
+if GSETTINGS_SCHEMAS_INSTALL
 install-data-hook:
-	$(gsettingsupdateschemacache) $(gsettingsschemadir)
+	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+endif
 
 EXTRA_DIST = 				\
 	$(desktop_in_files)		\
-	gedit.schemas.in.in		\
 	$(man_MANS)			\
 	gedit.pc.in			\
 	gedit-bugreport.sh.in		\