[gcr] Allow valgrind support to be completely disabled

[Laurent Bigonville <lbigon src gnome org>]

commit a649665e3ad1a2c2fa70fd45b08a8b956a535825
Author: Laurent Bigonville <bigon bigon be>
Date:   Fri Jun 21 15:21:05 2013 +0200

    Allow valgrind support to be completely disabled
    
    Valgrind macros will still be enabled by default
    
    https://bugzilla.gnome.org/show_bug.cgi?id=702648

 configure.ac    |    4 ++--
 egg/Makefile.am |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dab43d0..c69423f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,8 +334,8 @@ AM_CONDITIONAL([WITH_COVERAGE], [test "$enable_coverage" = "yes"])
 AC_MSG_RESULT($enable_coverage)
 
 AC_ARG_ENABLE(valgrind,
-       AC_HELP_STRING([--enable-valgrind],
-       [Run gnome-keyring-daemon using valgrind]))
+       AC_HELP_STRING([--enable-valgrind[=@<:@yes/no/run@:>@]],
+       [Run gcr using valgrind]), ,enable_valgrind=yes)
 
 AC_MSG_CHECKING([valgrind])
 valgrind_status="yes"
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 0e49fc8..e826a2c 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -10,8 +10,7 @@ noinst_LTLIBRARIES = \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_builddir) \
-       -I$(top_srcdir)/build \
-       -DWITH_VALGRIND
+       -I$(top_srcdir)/build
 
 libegg_la_CFLAGS = \
        $(GLIB_CFLAGS) \