Commit 7e3f20d0 authored by Andrew Jeffery's avatar Andrew Jeffery

autotools: Fix autoconf-archive compatibility issues

autoconf-archive 2019-01-06 changed the setup of code coverage support.
Deal with both old and new. Based on Patrick Venture's similar patch in
other repositories[1].

[1] https://github.com/openbmc/phosphor-pid-control/commit/90e9dbcae6c1df3127dd3de41f9d1e1b5a438828

Change-Id: I29dae544d8feb462e848ab00c25da188f74686a7
Signed-off-by: Andrew Jeffery's avatarAndrew Jeffery <andrew@aj.id.au>
parent 4b8203d7
...@@ -31,7 +31,13 @@ mboxctl_SOURCES = mboxctl.c ...@@ -31,7 +31,13 @@ mboxctl_SOURCES = mboxctl.c
mboxctl_LDFLAGS = $(LIBSYSTEMD_LIBS) mboxctl_LDFLAGS = $(LIBSYSTEMD_LIBS)
mboxctl_CFLAGS = $(LIBSYSTEMD_CFLAGS) mboxctl_CFLAGS = $(LIBSYSTEMD_CFLAGS)
if AUTOCONF_CODE_COVERAGE_2019_01_06
include $(top_srcdir)/aminclude_static.am
clean-local: code-coverage-clean
distclean-local: code-coverage-dist-clean
else
@CODE_COVERAGE_RULES@ @CODE_COVERAGE_RULES@
endif
check_PROGRAMS = check_PROGRAMS =
XFAIL_TESTS = XFAIL_TESTS =
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([mboxd], [2.1.1], [https://github.com/openbmc/mboxbridge/issues]) AC_INIT([mboxd], [2.1.1], [https://github.com/openbmc/mboxbridge/issues])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([subdir-objects -Wall foreign dist-xz]) AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-portability foreign dist-xz])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_MACRO_DIRS([m4])
...@@ -65,6 +65,10 @@ AS_IF([test "x$enable_virtual_pnor" == "xyes"], ...@@ -65,6 +65,10 @@ AS_IF([test "x$enable_virtual_pnor" == "xyes"],
) )
AX_CODE_COVERAGE AX_CODE_COVERAGE
m4_ifdef([_AX_CODE_COVERAGE_RULES],
[AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [true])],
[AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [false])])
AX_ADD_AM_MACRO_STATIC([])
PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd, , AC_MSG_ERROR([libsytemd not found])) PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd, , AC_MSG_ERROR([libsytemd not found]))
AC_SUBST([LIBSYSTEMD_CFLAGS]) AC_SUBST([LIBSYSTEMD_CFLAGS])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment