configure: Enable coverage for all plugins via PLUGIN_CFLAGS

diff --git a/configure.ac b/configure.ac
index e4832b391c39cf2bf32016566c704451522bd6b0..f0163147413748e49366a20932cc02b600afd2ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -350,6 +350,7 @@ fi
 if test -z "$CFLAGS"; then
        CFLAGS="-g -O2 -Wall -Wno-format -Wno-format-security -Wno-pointer-sign"
 fi
+AC_SUBST(PLUGIN_CFLAGS)
 AC_PROG_CC
 AM_PROG_CC_C_O
 
@@ -877,7 +878,7 @@ AC_COMPILE_IFELSE(
                AC_MSG_RESULT([no])
                # GCC, but not MinGW requires -rdynamic for plugins
                if test x$windows != xtrue; then
-                       AC_SUBST(PLUGIN_CFLAGS, [-rdynamic])
+                       PLUGIN_CFLAGS="$PLUGIN_CFLAGS -rdynamic"
                fi
        ]
 )
@@ -1233,6 +1234,7 @@ if test x$coverage = xtrue; then
        COVERAGE_LDFLAGS="-fprofile-arcs"
        AC_SUBST(COVERAGE_CFLAGS)
        AC_SUBST(COVERAGE_LDFLAGS)
+       PLUGIN_CFLAGS="$PLUGIN_CFLAGS $COVERAGE_CFLAGS"
 
        AC_MSG_NOTICE([coverage enabled, adding "-g -O0" to CFLAGS])
        CFLAGS="${CFLAGS} -g -O0"

diff --git a/src/libstrongswan/plugins/bliss/Makefile.am b/src/libstrongswan/plugins/bliss/Makefile.am
index b2d09427e046d7a0af6ce5086435c8bdf47c85ec..cbe47063dcb2deffd0e19a4a8e8475e069ffd9b9 100644 (file)
--- a/src/libstrongswan/plugins/bliss/Makefile.am
+++ b/src/libstrongswan/plugins/bliss/Makefile.am
@@ -3,8 +3,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan/math/libnttfft
 
 AM_CFLAGS = \
-       $(PLUGIN_CFLAGS) \
-       @COVERAGE_CFLAGS@
+       $(PLUGIN_CFLAGS)
 
 # these file are also used by bliss_huffman
 noinst_LTLIBRARIES = libbliss-params.la

diff --git a/src/libstrongswan/plugins/newhope/Makefile.am b/src/libstrongswan/plugins/newhope/Makefile.am
index b01987d223daafa983eb34279af52392456b9230..8dd6c5fabcc00c1223bd5a58b776f847c3c57cf4 100644 (file)
--- a/src/libstrongswan/plugins/newhope/Makefile.am
+++ b/src/libstrongswan/plugins/newhope/Makefile.am
@@ -3,8 +3,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan/math/libnttfft
 
 AM_CFLAGS = \
-       $(PLUGIN_CFLAGS) \
-       @COVERAGE_CFLAGS@
+       $(PLUGIN_CFLAGS)
 
 # these files are also used by the tests, we can't directly refer to them
 # because of the subdirectory, which would cause distclean to fail

diff --git a/src/libstrongswan/plugins/ntru/Makefile.am b/src/libstrongswan/plugins/ntru/Makefile.am
index c9fcee9825f6b3774f60087225fe79ae8436911f..4045544d4cf39e0dc6da6d061770708d5a2af918 100644 (file)
--- a/src/libstrongswan/plugins/ntru/Makefile.am
+++ b/src/libstrongswan/plugins/ntru/Makefile.am
@@ -2,8 +2,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan
 
 AM_CFLAGS = \
-       $(PLUGIN_CFLAGS) \
-       @COVERAGE_CFLAGS@
+       $(PLUGIN_CFLAGS)
 
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-ntru.la