configure: Enable coverage for all plugins via PLUGIN_CFLAGS
authorTobias Brunner <tobias@strongswan.org>
Tue, 20 Jun 2017 11:52:16 +0000 (13:52 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 20 Jun 2017 11:52:16 +0000 (13:52 +0200)
configure.ac
src/libstrongswan/plugins/bliss/Makefile.am
src/libstrongswan/plugins/newhope/Makefile.am
src/libstrongswan/plugins/ntru/Makefile.am

index e4832b3..f016314 100644 (file)
@@ -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"
index b2d0942..cbe4706 100644 (file)
@@ -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
index b01987d..8dd6c5f 100644 (file)
@@ -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
index c9fcee9..4045544 100644 (file)
@@ -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