Module: wine Branch: master Commit: 0a2c94e823c6fd8d50b075bcb4fd8c2bc3cefaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2c94e823c6fd8d50b075bcb4...
Author: John Reiser jreiser@BitWagon.com Date: Thu Jul 24 13:31:53 2008 -0700
configure: Add check for valgrind/valgrind.h.
---
configure | 4 +++- configure.ac | 3 ++- include/config.h.in | 3 +++ loader/kthread.c | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure b/configure index b5c34de..7bb0385 100755 --- a/configure +++ b/configure @@ -7210,6 +7210,7 @@ done
+ for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7320,7 +7321,8 @@ for ac_header in \ termios.h \ unistd.h \ utime.h \ - valgrind/memcheck.h + valgrind/memcheck.h \ + valgrind/valgrind.h
do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 457f32e..9aaacab 100644 --- a/configure.ac +++ b/configure.ac @@ -335,7 +335,8 @@ AC_CHECK_HEADERS(\ termios.h \ unistd.h \ utime.h \ - valgrind/memcheck.h + valgrind/memcheck.h \ + valgrind/valgrind.h ) AC_HEADER_STAT()
diff --git a/include/config.h.in b/include/config.h.in index c4f30c9..1245197 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -918,6 +918,9 @@ /* Define to 1 if you have the <valgrind/memcheck.h> header file. */ #undef HAVE_VALGRIND_MEMCHECK_H
+/* Define to 1 if you have the <valgrind/valgrind.h> header file. */ +#undef HAVE_VALGRIND_VALGRIND_H + /* Define if we have va_copy */ #undef HAVE_VA_COPY
diff --git a/loader/kthread.c b/loader/kthread.c index efffd99..cc51cc0 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -52,8 +52,8 @@ struct _pthread_cleanup_buffer; #ifdef HAVE_RESOLV_H # include <resolv.h> #endif -#ifdef HAVE_VALGRIND_MEMCHECK_H -#include <valgrind/memcheck.h> +#ifdef HAVE_VALGRIND_VALGRIND_H +#include <valgrind/valgrind.h> #endif #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h>