aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-04 15:02:28 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-04 15:02:28 -0500
commit0bb911f850ebfd0f4ad2686966933272bb9bdefd (patch)
treef32b4b36df352e4356c1b524a1efc16a0c40e9aa /configure.ac
parentbc392e208fa1f9b46c77ea8142dadd629722663a (diff)
parent2d60549a2394ce7d73907abcaca22b48553d6c5b (diff)
downloadlibdbusmenu-0bb911f850ebfd0f4ad2686966933272bb9bdefd.tar.gz
libdbusmenu-0bb911f850ebfd0f4ad2686966933272bb9bdefd.tar.bz2
libdbusmenu-0bb911f850ebfd0f4ad2686966933272bb9bdefd.zip
Import upstream version 0.5.97
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac24
1 files changed, 20 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index e397cb5..2d51716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(libdbusmenu, 0.5.96, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.5.97, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.96, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.97, [-Wno-portability])
AM_MAINTAINER_MODE
@@ -118,10 +118,10 @@ AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
AS_IF([test "x$enable_tests" != "xno"],[
PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
- valgrind,
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION,
[have_tests=yes]
)
+PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind)
])
AC_SUBST(DBUSMENUTESTS_CFLAGS)
@@ -194,6 +194,18 @@ if test "x$with_massivedebugging" = "xyes"; then
fi
###########################
+# gcov coverage reporting
+###########################
+
+m4_include([m4/gcov.m4])
+AC_TDD_GCOV
+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
+
+###########################
# Files
###########################
@@ -251,3 +263,7 @@ AS_IF([test "x$have_dumper" = "xyes"],
AC_MSG_NOTICE([ Dumper: no])
)
+AS_IF([test "x$use_gcov" = "xyes"],
+ AC_MSG_NOTICE([ Coverage reporting: yes]),
+ AC_MSG_NOTICE([ Coverage reporting: no])
+)