[glibmm] Fix make dist with gsettings example

[Jonathon Jongsma <jjongsma src gnome org>]

commit 873293e5c7d49fd3642466068044c42b3ca13f9c
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Tue Jun 1 09:55:20 2010 -0500

    Fix make dist with gsettings example

 ChangeLog            |    7 +++++++
 configure.ac         |    1 +
 examples/Makefile.am |    7 +++----
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 05d061d..d7cc453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-01  Jonathon Jongsma  <jonathon quotidian org>
+
+	* configure.ac: use GLIB_GSETTINGS
+	* examples/Makefile.am: fix the settings example to use the new m4
+	  macros shipped with glib.  The previous method was breaking 'make
+	  dist'
+
 2010-06-01  Murray Cumming  <murrayc murrayc com>
 
 	Gio::Settings: Make get_has_unapplied() const.
diff --git a/configure.ac b/configure.ac
index b49055a..d996879 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,7 @@ MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
 
 AC_CHECK_PROGS([M4], [gm4 m4], [m4])
+GLIB_GSETTINGS
 
 # Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE
 # in the header.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0e14925..467e861 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -33,8 +33,7 @@ check_PROGRAMS =			\
 	thread/dispatcher		\
 	thread/dispatcher2		\
 	thread/thread			\
-	thread/threadpool		\
-	gschemas.compiled
+	thread/threadpool
 
 glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
 giomm_includes  = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
@@ -79,8 +78,8 @@ network_socket_client_LDADD     = $(giomm_ldadd) $(GTHREAD_LIBS)
 network_socket_server_SOURCES   = network/socket-server.cc
 network_socket_server_LDADD     = $(giomm_ldadd) $(GTHREAD_LIBS)
 
-gschemas.compiled: $(wildcard settings/*.gschema.xml)
-	gschema-compile settings/
+gsettings_SCHEMAS = $(wildcard settings/*.gschema.xml)
+ GSETTINGS_RULES@
 
 settings_settings_SOURCES = settings/settings.cc
 settings_settings_LDADD   = $(giomm_ldadd)