[glib] [gsettings] Change AM_GSETTINGS macro to GLIB_GSETTINGS
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] [gsettings] Change AM_GSETTINGS macro to GLIB_GSETTINGS
- Date: Fri, 23 Apr 2010 15:37:06 +0000 (UTC)
commit f68dc4d97d7aeaa8588a4ea0d36f057cd5aaf42e
Author: Javier Jardón <jjardon gnome org>
Date: Fri Apr 23 15:39:44 2010 +0200
[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
docs/reference/gio/migrating.xml | 4 ++--
m4macros/gsettings.m4 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/gio/migrating.xml b/docs/reference/gio/migrating.xml
index 32910bc..c604937 100644
--- 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
--- 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],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]