summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2003-03-13 06:48:06 +0000
committerMartin Pool <mbp@samba.org>2003-03-13 06:48:06 +0000
commitda3b671f77ee2ec55a4bcf0dd7164c86bc08e8d5 (patch)
treea560135f5d73a364599874b42f8dde59eb022707
parentdbe2858b862232ede390fe0088f82d1e826612f9 (diff)
downloadsamba-da3b671f77ee2ec55a4bcf0dd7164c86bc08e8d5.tar.gz
samba-da3b671f77ee2ec55a4bcf0dd7164c86bc08e8d5.tar.bz2
samba-da3b671f77ee2ec55a4bcf0dd7164c86bc08e8d5.zip
In Valgrind 1.9.4, the headers have moved to <valgrind/valgrind.h>,
etc. So check for that as well as the old names when including macros and conditionally defining -DVALGRIND. (This used to be commit 054ed6d86d0ca61623d61db7bc31999c19269176)
-rw-r--r--source3/configure.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in
index c07c684383..d53492b5ab 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -557,6 +557,10 @@ AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h s
AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h ldap.h lber.h dlfcn.h)
AC_CHECK_HEADERS(sys/syslog.h syslog.h)
+# In valgrind 1.0.x, it's just valgrind.h. In 1.9.x+ there's a
+# subdirectory of headers.
+AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
+
#
# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
# This causes configure to fail to detect it. Check for shadow separately on HPUX.