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 c9151c7b1113e2f01bd33d4dd301a2e7e2040b35)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b6abdd99ce74236fbe6675a92a91e4e7258a907f..25245e9c0cd44e3455c59dd13ebe67cca77b27f5 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -433,15 +433,19 @@
 #include <com_err.h>
 #endif
 
-#if HAVE_VALGRIND_H
-/* Special macros that are no-ops except when run under Valgrind on x86.  */
+/* Special macros that are no-ops except when run under Valgrind on
+ * x86.  They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
+#if HAVE_VALGRIND_MEMCHECK_H
+        /* memcheck.h includes valgrind.h */
+#include <valgrind/memcheck.h>
+#elif HAVE_VALGRIND_H
 #include <valgrind.h>
 #endif
 
 /* If we have --enable-developer and the valgrind header is present,
  * then we're OK to use it.  Set a macro so this logic can be done only
  * once. */
-#if defined(DEVELOPER) && HAVE_VALGRIND_H
+#if defined(DEVELOPER) && (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H)
 #define VALGRIND
 #endif