From 9126f1afae922339949d0b76e282411618bcb565 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 26 Oct 2010 12:02:12 -0400 Subject: [PATCH] gsettings m4: Use --strict for checking A while ago we allowed glib-compile-schemas to return a 'success' status in the case that just one schema file contained errors. Of course, this is the exact opposite of what we want in the case that we are checking schema validity at compile time. Use the --strict flag for that case. This closes #633115. --- m4macros/gsettings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index e81a512..4e4352f 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -37,7 +37,7 @@ mostlyclean-am: clean-gsettings-schemas gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) %.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas -- 2.7.4