diff options
| author | Patrick Venture <venture@google.com> | 2019-03-18 09:06:56 -0700 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2019-03-18 09:06:56 -0700 |
| commit | 51372f02b96e1f1b1317e25e956c712019557bb4 (patch) | |
| tree | 1adfd84f1c11a0d92b04ede6a363efddce5634cf | |
| parent | a8356420078bb7e7580fe6c42818e20203c7cbfc (diff) | |
| download | ipmi-blob-tool-51372f02b96e1f1b1317e25e956c712019557bb4.tar.gz ipmi-blob-tool-51372f02b96e1f1b1317e25e956c712019557bb4.zip | |
autotools: Fix for autoconf-archive 2019.01.19
The code coverage macros from the archive changed in a backward
incompatible way. This adds a workaround to autodetect either version
and do the right thing.
Change-Id: I4258fab8811f07760ebd73e8ac55c8493370e19b
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | test/Makefile.am | 1 |
4 files changed, 17 insertions, 3 deletions
@@ -19,6 +19,7 @@ .dirstamp .libs /aclocal.m4 +/aminclude_static.am /autom4te.cache /build-aux /config.h diff --git a/Makefile.am b/Makefile.am index c4335da..7473e23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,14 @@ CODE_COVERAGE_GENHTML_OPTIONS += --config-file $(abs_srcdir)/.lcovrc CODE_COVERAGE_GENHTML_OPTIONS += --prefix $(abs_srcdir) --prefix $(abs_builddir) export CODE_COVERAGE_GENHTML_OPTIONS +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@ +endif + export AM_CPPFLAGS = -I$(abs_builddir)/src -I$(abs_srcdir)/src \ $(CODE_COVERAGE_CPPFLAGS) export AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) diff --git a/configure.ac b/configure.ac index b1e8145..12762f0 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_LANG([C++]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([nostdinc foreign subdir-objects -Wall -Werror dist-xz tar-ustar]) +AM_INIT_AUTOMAKE([nostdinc foreign subdir-objects -Wall -Wno-portability -Werror dist-xz tar-ustar]) AM_SILENT_RULES([yes]) # Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS @@ -120,10 +120,16 @@ m4_foreach([vgtool], [valgrind_tool_list], # Code coverage AX_CODE_COVERAGE -AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage]) AS_IF([test "x$CODE_COVERAGE_ENABLED" = "xyes"], [ AX_APPEND_COMPILE_FLAGS([-DHAVE_GCOV], [CODE_COVERAGE_CPPFLAGS]) ]) +AS_IF([test "x$CODE_COVERAGE_ENABLED" = "xyes"], [ + AX_APPEND_COMPILE_FLAGS([-DHAVE_GCOV], [CODE_COVERAGE_CPPFLAGS]) +]) +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([]) # Append -Werror after doing autoconf compiler checks # Otherwise some perfectly valid checks can fail and cause our diff --git a/test/Makefile.am b/test/Makefile.am index 1fa4ced..8974e42 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,4 @@ @VALGRIND_CHECK_RULES@ -@CODE_COVERAGE_RULES@ gtest_cppflags = $(AM_CPPFLAGS) $(GTEST_CFLAGS) $(GMOCK_CFLAGS) gtest_ldadd = $(GTEST_LIBS) $(GMOCK_LIBS) -lgmock_main |
