summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2003-03-13 06:16:51 +0000
committerMartin Pool <mbp@samba.org>2003-03-13 06:16:51 +0000
commit9951cca72fcbba4d4f93ac0e30bab2e4f54487f5 (patch)
tree8f01a86d443828541e76c849d447f79effafb0be
parent6d0a1eaaaad05b2860561619856698f8d1e193c1 (diff)
downloadsamba-9951cca72fcbba4d4f93ac0e30bab2e4f54487f5.tar.gz
samba-9951cca72fcbba4d4f93ac0e30bab2e4f54487f5.tar.bz2
samba-9951cca72fcbba4d4f93ac0e30bab2e4f54487f5.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. (This used to be commit 1ffa4d75b75979b8abb409634212ce43a0826467)
-rw-r--r--source3/configure.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index b2cd15b3b3..aa95cf19fe 100644
--- 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.