>From 849dff111d966332ccfbdc02d436d0021bad28a3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 23 Feb 2021 19:59:05 +0100 Subject: [PATCH] Fix link error during "make check". Some older DejaGnu versions have a dejagnu.h file that assumes a certain old interpretation of 'inline'. See The option '-fgnu89-inline' is supported by both GCC and clang. * testsuite/poke.libpoke/Makefile.am (values_CFLAGS, api_CFLAGS): New variables. * testsuite/poke.mi-json/Makefile.am (mi_json_CFLAGS): Add '-fgnu89-inline'. --- testsuite/poke.libpoke/Makefile.am | 6 ++++++ testsuite/poke.mi-json/Makefile.am | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/testsuite/poke.libpoke/Makefile.am b/testsuite/poke.libpoke/Makefile.am index c3bcdc1..1856040 100644 --- a/testsuite/poke.libpoke/Makefile.am +++ b/testsuite/poke.libpoke/Makefile.am @@ -30,6 +30,9 @@ values_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -I$(top_srcdir)/libpoke -I$(top_builddir)/libpoke +# Old DejaGnu versions need a specific old interpretation of 'inline'. +values_CFLAGS = -fgnu89-inline + values_LDADD = $(top_builddir)/gl/libgnu.la \ $(top_builddir)/libpoke/libpoke.la \ $(LTLIBTEXTSTYLE) @@ -42,6 +45,9 @@ api_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -I$(top_srcdir)/libpoke -I$(top_builddir)/libpoke +# Old DejaGnu versions need a specific old interpretation of 'inline'. +api_CFLAGS = -fgnu89-inline + api_LDADD = $(top_builddir)/gl/libgnu.la \ $(top_builddir)/libpoke/libpoke.la \ $(LTLIBTEXTSTYLE) diff --git a/testsuite/poke.mi-json/Makefile.am b/testsuite/poke.mi-json/Makefile.am index e0676c6..5ad27ad 100644 --- a/testsuite/poke.mi-json/Makefile.am +++ b/testsuite/poke.mi-json/Makefile.am @@ -34,7 +34,9 @@ mi_json_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -I$(top_srcdir)/libpoke -I$(top_builddir)/libpoke -mi_json_CFLAGS = $(JSON_C_CFLAGS) +# Old DejaGnu versions need a specific old interpretation of 'inline'. +mi_json_CFLAGS = -fgnu89-inline $(JSON_C_CFLAGS) + mi_json_LDADD = $(JSON_C_LIBS) $(top_builddir)/gl/libgnu.la \ $(top_builddir)/libpoke/libpoke.la -- 2.7.4