[gnome-bluetooth/gnome-2-32] Update for latest GSettings build changes

[Bastien Nocera <hadess src gnome org>]

commit 0e24642e66f356cecc645e35f39e950075001ad4
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 26 15:33:37 2010 +0100

    Update for latest GSettings build changes

 configure.ac           |    4 ++--
 properties/Makefile.am |    8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9154e89..1bcc709 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
-AM_GSETTINGS
+GLIB_GSETTINGS
 
 AC_PATH_PROG([XMLLINT],[xmllint])
 
@@ -69,7 +69,7 @@ fi
 AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
 GTK_REQUIRED=2.19.1
-GLIB_REQUIRED=2.25.1
+GLIB_REQUIRED=2.25.7
 DBUS_GLIB_REQUIRED=0.74
 NOTIFY_REQUIRED=0.4.3
 NAUTILUS_SENDTO_REQUIRED=2.28.0.1
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 9aefa7d..9e064c9 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -24,13 +24,9 @@ convertdir=$(datadir)/GConf/gsettings
 convert_DATA=gnome-bluetooth
 
 gsettingsschema_in_files = org.gnome.Bluetooth.gschema.xml.in
-gsettingsschema_DATA = $(gsettingsschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_CHECK_RULE@
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(gsettingsupdateschemacache) $(DESTDIR)$(gsettingsschemadir) --targetdir=$(DESTDIR)$(gsettingsschemadir)
-endif
+ GSETTINGS_RULES@
 
 CLEANFILES = $(desktop_DATA) $(schema_DATA)