aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorAllan LeSage <allanlesage@gmail.com>2012-03-21 11:22:01 -0500
committerAllan LeSage <allanlesage@gmail.com>2012-03-21 11:22:01 -0500
commit577fad28e2a126a1ae7168bf73a9da3405d23b5f (patch)
treeb3f5012ac57f7b9140eb8894a7f5572f230b7dbf /m4
parentcf5c77a39f7355e8a2a6ee719a36bcbe6dfc0d7f (diff)
downloadayatana-indicator-sound-577fad28e2a126a1ae7168bf73a9da3405d23b5f.tar.gz
ayatana-indicator-sound-577fad28e2a126a1ae7168bf73a9da3405d23b5f.tar.bz2
ayatana-indicator-sound-577fad28e2a126a1ae7168bf73a9da3405d23b5f.zip
Removed gcovr dependency for coverage tooling.
Diffstat (limited to 'm4')
-rw-r--r--m4/gcov.m423
1 files changed, 13 insertions, 10 deletions
diff --git a/m4/gcov.m4 b/m4/gcov.m4
index 1169573..3163584 100644
--- a/m4/gcov.m4
+++ b/m4/gcov.m4
@@ -5,11 +5,10 @@
# * gcovr
#
# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
AC_DEFUN([AC_TDD_GCOV],
-[AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov,
[
-AC_ARG_ENABLE(gcov,
+ AC_ARG_ENABLE(gcov,
AS_HELP_STRING([--enable-gcov],
[enable coverage testing with gcov]),
[use_gcov=$enableval], [use_gcov=no])
@@ -34,7 +33,6 @@ AC_ARG_ENABLE(gcov,
lcov_version_list="1.6 1.7 1.8 1.9"
AC_CHECK_PROG(LCOV, lcov, lcov)
AC_CHECK_PROG(GENHTML, genhtml, genhtml)
- AC_CHECK_PROG(GCOVR, gcovr, gcovr)
if test "$LCOV"; then
AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
@@ -63,10 +61,8 @@ AC_ARG_ENABLE(gcov,
AC_MSG_ERROR([Could not find genhtml from the lcov package])
fi
- if test -z "$GCOVR"; then
- AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr])
- fi
-
+ ac_cv_check_gcov=yes
+ ac_cv_check_lcov=yes
# Remove all optimization flags from CFLAGS
changequote({,})
@@ -78,6 +74,13 @@ AC_ARG_ENABLE(gcov,
COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
COVERAGE_LDFLAGS="-lgcov"
-fi
-])]) # AC_TDD_GCOV
+ # Check availability of gcovr
+ AC_CHECK_PROG(GCOVR, gcovr, gcovr)
+ if test -z "$GCOVR"; then
+ ac_cv_check_gcovr=no
+ else
+ ac_cv_check_gcovr=yes
+ fi
+fi
+]) # AC_TDD_GCOV