Merge lp:~evgeni/libdbusmenu/optional-valgrind into lp:libdbusmenu/12.10

[Evgeni Golov]

make pkg-config check not fail if valgrind was not found

this allows to build and run non-valgrind checks on arches where valgrind
is not available

[Charles Kerr (charlesk)]

Evgeni, thanks for reporting this issue and suggesting this patch!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-04-11 16:42:40 +0000
+++ configure.ac	2012-06-12 06:58:20 +0000
@@ -121,7 +121,8 @@
                                   gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION,
                                   [have_tests=yes]
 )
-PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind)
+PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no)
+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
 ])
 
 AC_SUBST(DBUSMENUTESTS_CFLAGS)
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-04-04 19:16:32 +0000
+++ tests/Makefile.am	2012-06-12 06:58:20 +0000
@@ -16,10 +16,12 @@
 	test-glib-submenu
 
 if WANT_DBUSMENUDUMPER
+if HAVE_VALGRIND
 TESTS += \
 	test-json \
 	test-json-instruction
 endif
+endif
 
 if WANT_LIBDBUSMENUGTK
 TESTS += \
@@ -59,10 +61,12 @@
 	test-glib-simple-items
 
 if WANT_DBUSMENUDUMPER
+if HAVE_VALGRIND
 check_PROGRAMS += \
 	test-json-client \
 	test-json-server
 endif
+endif
 
 if WANT_LIBDBUSMENUGTK
 check_PROGRAMS += \