diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-04-23 17:27:26 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-04-23 17:27:26 -0400 |
| commit | ec664445a9cf1769e440a25ffb4e17e9e644f6d0 (patch) | |
| tree | 4bc0281ea94bc45467a3e5d178abf20c6824df05 /m4macros | |
| parent | e6e7015bbd253b01b51186a931cdd58dfb4390f2 (diff) | |
| download | glib-ec664445a9cf1769e440a25ffb4e17e9e644f6d0.tar.gz glib-ec664445a9cf1769e440a25ffb4e17e9e644f6d0.tar.bz2 glib-ec664445a9cf1769e440a25ffb4e17e9e644f6d0.zip | |
Rename gschema-compile to glib-compile-schemas
And clean up the autofoo a bit: use an uppercase variable,
check for pkg-config, check for presence of glib-compile-schemas.
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gsettings.m4 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index 2935246ae..b97867d41 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -7,24 +7,29 @@ AC_DEFUN([GLIB_GSETTINGS], [ AC_ARG_ENABLE(schemas-install, AC_HELP_STRING([--disable-schemas-install], - [Disable the schemas installation]), + [Disable installation of GSettings schemas]), [case ${enableval} in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; esac]) AM_CONDITIONAL([GSETTINGS_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - AC_SUBST(gschema_compile, `pkg-config --variable gschema_compile gio-2.0`) + AC_SUBST(GLIB_COMPILE_SCHEMAS, `$PKG_CONFIG --variable glib_compile_schemas gio-2.0`) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + AC_MSG_ERROR([glib-compile-schemas not found.]) + fi GSETTINGS_CHECK_RULE=' .PHONY : check-gsettings-schema gschema_xml_files := $(wildcard *.gschema.xml) check-gsettings-schema: gsettings_schema_validate_stamp -CLEANFILES += gsettings_schema_validate_stamp +MOSTLYCLEANFILES += gsettings_schema_validate_stamp gsettings_schema_validate_stamp: $(gschema_xml_files) - $(gschema_compile) --dry-run --schema-files $? + $(GLIB_COMPILE_SCHEMAS) --dry-run --schema-files $? touch [$]@ all: check-gsettings-schema |