From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 12 Oct 2012 12:53:25 +0000 (+0100)
Subject: Add support for configuring --with-valgrind=auto
X-Git-Tag: dbus-1.7.6~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57dc720b9f25dec999fcc53da982114098cefae9;p=thirdparty%2Fdbus.git

Add support for configuring --with-valgrind=auto

This is the configuration I'd like to use for the "debug build" of dbus
on Debian - if we use --with-valgrind=yes, we have to hard-code knowledge
of which architectures do and don't have Valgrind in two places instead
of just one.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=56925
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
---

diff --git a/configure.ac b/configure.ac
index f4c882626..174308fb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,6 +1225,10 @@ AC_ARG_WITH([valgrind],
   [],
   [with_valgrind=no])
 
+AS_IF([test "x$with_valgrind" = xauto],
+  [PKG_CHECK_EXISTS([valgrind >= 3.6],
+    [with_valgrind=yes], [with_valgrind=no])])
+
 if test x$with_valgrind != xno; then
   PKG_CHECK_MODULES([VALGRIND], [valgrind >= 3.6])
   AC_DEFINE([WITH_VALGRIND], [1], [Define to add Valgrind instrumentation])