[gsettings] Change AM_GSETTINGS macro to GLIB_GSETTINGS

So we don't use Automake's macro namespace

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=616648

diff --git a/docs/reference/gio/migrating.xml b/docs/reference/gio/migrating.xml
index 32910bc..c604937 100644 (file)
--- a/docs/reference/gio/migrating.xml
+++ b/docs/reference/gio/migrating.xml
@@ -392,12 +392,12 @@ produces a <filename>org.gnome.font-rendering.gschema.xml</filename> file with t
         variable for the schema compiler, which can be used in
         <filename>configure.in</filename> as follows:
 <programlisting>
-AM_GSETTINGS
+GLIB_GSETTINGS
 </programlisting>
         The corresponding <filename>Makefile.am</filename> fragment looks like
         this:
 <programlisting>
-# gsettingsschemadir and gschema_compile are defined by the AM_GSETTINGS
+# gsettingsschemadir and gschema_compile are defined by the GLIB_GSETTINGS
 # macro in configure.ac
 gsettingsschema_DATA = my.app.gschema.xml
 # This rule will check your schemas for validity before installation

diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 46c0981..2935246 100644 (file)
--- a/m4macros/gsettings.m4
+++ b/m4macros/gsettings.m4
@@ -1,9 +1,9 @@
-dnl AM_GSETTINGS
+dnl GLIB_GSETTINGS
 dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
 dnl the schema should be compiled
 dnl
 
-AC_DEFUN([AM_GSETTINGS],
+AC_DEFUN([GLIB_GSETTINGS],
 [
   AC_ARG_ENABLE(schemas-install,
        AC_HELP_STRING([--disable-schemas-install],