From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH] configure: Unconditionally check for valgrind
Date: Tue, 26 Mar 2013 14:48:27 +0100 [thread overview]
Message-ID: <5151A72B.9030402@canonical.com> (raw)
For those who want to run valgrind, but do not necessarily want to debug intel. :-)
---
diff --git a/configure.ac b/configure.ac
index de3990d..e084e84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,12 +440,12 @@ AM_CONDITIONAL(FULL_DEBUG, test x$DEBUG = xfull)
if test "x$DEBUG" = xno; then
AC_DEFINE(NDEBUG,1,[Disable internal debugging])
fi
-if test "x$DEBUG" != xno; then
- PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, have_valgrind=no)
- if test x$have_valgrind = xyes; then
- AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
- fi
+
+PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, have_valgrind=no)
+if test x$have_valgrind = xyes; then
+ AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
fi
+
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..d170a9a 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -27,12 +27,9 @@ AM_CFLAGS = \
@XORG_CFLAGS@ \
@UDEV_CFLAGS@ \
@DRM_CFLAGS@ \
+ @VALGRIND_CFLAGS@ \
$(NULL)
-if DEBUG
-AM_CFLAGS += @VALGRIND_CFLAGS@
-endif
-
noinst_LTLIBRARIES = libsna.la
libsna_la_LDFLAGS = -pthread
libsna_la_LIBADD = @UDEV_LIBS@ -lm @DRM_LIBS@ brw/libbrw.la fb/libfb.la
reply other threads:[~2013-03-26 13:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5151A72B.9030402@canonical.com \
--to=maarten.lankhorst@canonical.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox