In Valgrind 1.9.4, the headers have moved to <valgrind/valgrind.h>,

etc.  So check for that as well as the old names.
(This used to be commit 1ffa4d75b75979b8abb409634212ce43a0826467)

diff --git a/source3/configure.in b/source3/configure.in
index b2cd15b3b35f2b21ec3856bb554f00e49677baf9..aa95cf19fe304fb7f5a87c2da78119dd75c3de51 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -556,7 +556,10 @@ AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h t
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
 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)
-AC_CHECK_HEADERS(valgrind.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.