build: update autotools build

This commit is contained in:
Dirk-Jan C. Binnema
2022-06-18 15:17:55 +03:00
parent cade7493fd
commit 0708033e48
4 changed files with 15 additions and 12 deletions

View File

@ -82,16 +82,16 @@ mu_guile_TEXINFOS= \
# SUFFIXES = .x .doc
# .cc.x:
# $(AM_V_GEN) $(GUILE_SNARF) -o $@ $< $(snarfcxxopts)
SNARF_DATA=$(XFILES)
#SNARF_DATA=$(XFILES)
# FIXME: GUILE_SITEDIR would be better, but that
# breaks 'make distcheck'
scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}
scm_DATA=mu.scm
EXTRA_DIST=$(scm_DATA) $(SNARF_DATA)
EXTRA_DIST=$(scm_DATA) $(XFILES)
## Add -MG to make the .x magic work with auto-dep code.
MKDEP = $(CC) -M -MG $(snarfcppopts)
CLEANFILES=$(XFILES)
#CLEANFILES=$(XFILES)

View File

@ -183,7 +183,8 @@ SCM_DEFINE(get_field,
SCM_ASSERT(scm_integer_p(FIELD), FIELD, SCM_ARG2, FUNC_NAME);
const auto field_opt{field_from_number(static_cast<size_t>(scm_to_int(FIELD)))};
SCM_ASSERT(!!field_opt, FIELD, SCM_ARG2, FUNC_NAME);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wswitch-enum"
switch (field_opt->id) {
case Field::Id::Priority:
return get_prio_scm(*msg);
@ -193,6 +194,7 @@ SCM_DEFINE(get_field,
return get_body(*msg, false);
default: break;
}
#pragma GCC diagnostic pop
switch (field_opt->type) {
case Field::Type::String: