luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-07 19:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[gsettings] Change AM_GSETTINGS macro to GLIB_GSETTINGS

Browse Source 
So we don't use Automake's macro namespace

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=616648
This commit is contained in:
Javier Jardón 2010-04-23 15:39:44 +02:00
parent 38e2273207
commit f68dc4d97d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/gio/migrating.xml
View File

@ -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 variable for the schema compiler, which can be used in
<filename>configure.in</filename> as follows: <filename>configure.in</filename> as follows:
<programlisting> <programlisting>
AM_GSETTINGS GLIB_GSETTINGS
</programlisting> </programlisting>
The corresponding <filename>Makefile.am</filename> fragment looks like The corresponding <filename>Makefile.am</filename> fragment looks like
this: this:
<programlisting> <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 # macro in configure.ac
gsettingsschema_DATA = my.app.gschema.xml gsettingsschema_DATA = my.app.gschema.xml
# This rule will check your schemas for validity before installation # This rule will check your schemas for validity before installation

4
m4macros/gsettings.m4
View File

@ -1,9 +1,9 @@
dnl AM_GSETTINGS dnl GLIB_GSETTINGS
dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
dnl the schema should be compiled dnl the schema should be compiled
dnl dnl
AC_DEFUN([AM_GSETTINGS], AC_DEFUN([GLIB_GSETTINGS],
[ [
AC_ARG_ENABLE(schemas-install, AC_ARG_ENABLE(schemas-install,
AC_HELP_STRING([--disable-schemas-install], AC_HELP_STRING([--disable-schemas-install],