xf86-video-intel: configure.ac src/sna/Makefile.am

[Chris Wilson]

 configure.ac        |    2 ++
 src/sna/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ddd3cc4ed6ac9b69f178147b49628b7a7f3f3104
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Apr 16 11:55:23 2013 +0100

    sna: Add VALGRIND_CFLAGS whilst compiling with --enable-valgrind
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index fa82507..9411e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -450,6 +450,7 @@ else
 		VG=auto
 	fi
 fi
+have_valgrind=no
 if test "x$VG" != xno; then
 	PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, have_valgrind=no)
 	AC_MSG_CHECKING([whether to include valgrind support])
@@ -462,6 +463,7 @@ if test "x$VG" != xno; then
 	fi
 	AC_MSG_RESULT([$have_valgrind ($VG)])
 fi
+AM_CONDITIONAL(VALGRIND, test x$have_valgrind = xyes)
 if test "x$DEBUG" = xsync; then
 	AC_DEFINE(DEBUG_SYNC,1,[Enable synchronous rendering for debugging])
 fi
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index 0fbd19d..ed6fad2 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -29,7 +29,7 @@ AM_CFLAGS = \
 	@DRM_CFLAGS@ \
 	$(NULL)
 
-if DEBUG
+if VALGRIND
 AM_CFLAGS += @VALGRIND_CFLAGS@
 endif