diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-02 11:12:43 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-02 11:12:43 -0500 |
commit | 5c3834907b18b2c9230d39767ab9092e80c5c849 (patch) | |
tree | a87926900366d88b12884046a39e96de06afccdb | |
parent | 86df02fa5a703cacd492db1b999f9449c3247c6b (diff) | |
parent | d3fb9ada324ede93d8dc789a621380c1c7828d21 (diff) | |
download | libdbusmenu-5c3834907b18b2c9230d39767ab9092e80c5c849.tar.gz libdbusmenu-5c3834907b18b2c9230d39767ab9092e80c5c849.tar.bz2 libdbusmenu-5c3834907b18b2c9230d39767ab9092e80c5c849.zip |
merge lp:~ted/dbusmenu/valgrind-no-libs to fix the valgrind tests on ARM. h/t goes to sewardj
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | tests/Makefile.am | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e397cb5..a46901f 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/tests/Makefile.am b/tests/Makefile.am index 82f6a9d..805adb9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -223,6 +223,7 @@ test_json_server_CFLAGS = \ -I $(srcdir) \ $(DBUSMENUGLIB_CFLAGS) \ $(DBUSMENUTESTS_CFLAGS) \ + $(DBUSMENUTESTSVALGRIND_CFLAGS) \ -Wall -Werror test_json_server_LDADD = \ |