From f518de201a11000dddcad98261cd36ed65713342 Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jan.vcelak@nic.cz>
Date: Tue, 15 Apr 2014 12:36:26 +0200
Subject: [PATCH] configure: fix --disable-code-coverage
---
Makefile.am | 5 +++--
configure.ac | 1 +
m4/code-coverage.m4 | 5 +++--
src/Makefile.am | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 43c53a9b2b..4885799b9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,9 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libtap src tests samples doc man patches
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+ --disable-code-coverage
+
code_coverage_quiet = --quiet
check-code-coverage:
@@ -70,6 +73,4 @@ code-coverage-clean:
-find . -name "*.gcda" -o -name "*.gcov" -delete
endif
-DISTCHECK_CONFIGURE_FLAGS = --without-ragel --disable-code-coverage
-
.PHONY: check-code-coverage code-coverage-initial code-coverage-capture code-coverage-html code-coverage-clean
diff --git a/configure.ac b/configure.ac
index a1f16e4f21..00a2e84b18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,5 +401,6 @@ echo "
Ragel: ${RAGEL} ${FSM_TYPE}
Utils with IDN: ${libidn}
Use systemd notifications: ${enable_systemd}
+ Code coverage: ${enable_code_coverage}
Continue with 'make' command"
diff --git a/m4/code-coverage.m4 b/m4/code-coverage.m4
index b70192105f..6df6a00aaf 100644
--- a/m4/code-coverage.m4
+++ b/m4/code-coverage.m4
@@ -16,8 +16,9 @@ AC_DEFUN([AX_CODE_COVERAGE], [
dnl Check for --enable-code-coverage
AC_ARG_ENABLE([code-coverage],
AS_HELP_STRING([--enable-code-coverage], [enable code coverage testing with gcov]),
- [enable_code_coverage=yes],
- [enable_code_coverage=no])
+ [enable_code_coverage=$enableval],
+ [enable_code_coverage=no]
+ )
AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test "$enable_code_coverage" = "yes"])
AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
diff --git a/src/Makefile.am b/src/Makefile.am
index 19b7a2197e..074e1c347b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,7 +129,7 @@ libknotus_la_SOURCES = \
# dynamic: libknot
libknot_la_LDFLAGS = \
- $(CODE_COVERAGE_LDFLAGS) \
+ $(AM_LDFLAGS) \
-version-info 0:1:0 \
-export-symbols-regex '^(knot|KNOT|rrset|tsig|zone)_'
@@ -303,7 +303,7 @@ libknotd_la_LIBADD = libknots.la libknot.la
# sbin programs
knotd_LDADD = libknot.la libknotd.la
knotd_CPPFLAGS = $(AM_CPPFLAGS) ${systemd_daemon_CFLAGS}
-knotd_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) ${systemd_daemon_LIBS}
+knotd_LDFLAGS = $(AM_LDFLAGS) ${systemd_daemon_LIBS}
knotc_LDADD = libknot.la libknotd.la
--
GitLab