aboutsummaryrefslogtreecommitdiff
path: root/m4/gcov.m4
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2012-03-30 10:45:03 -0400
committerPackage Import Robot <package-import@ubuntu.com>2012-03-30 10:45:03 -0400
commit01d561bf282f03825ca22533f66d72ba44fd85a9 (patch)
treeedee2e0c9543f22f13bf3baed30c9f6096c170a9 /m4/gcov.m4
parent2e2e1a5d8571b6a75de63ad771be172251a874a3 (diff)
parent31b5a5a6508535ed1af86919c79d75571f1a65ef (diff)
downloadayatana-indicator-sound-01d561bf282f03825ca22533f66d72ba44fd85a9.tar.gz
ayatana-indicator-sound-01d561bf282f03825ca22533f66d72ba44fd85a9.tar.bz2
ayatana-indicator-sound-01d561bf282f03825ca22533f66d72ba44fd85a9.zip
Import upstream version 0.8.5.0
Diffstat (limited to 'm4/gcov.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