From: Date: August 13 2008 12:22am
Subject: bzr commit into mysql-6.0-falcon branch (vvaintroub:2774) Bug#38746
List-Archive: http://lists.mysql.com/commits/51465
X-Bug: 38746
Message-Id: <200808122222.m7CMMkS7003163@ubuntu704desktop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/vlad/bzr/mysql-6.0-falcon-team/

 2774 Vladislav Vaintroub	2008-08-12
      Bug#38746 - Falcon does not build on Linux with valgrind 
      enabled.
      
      If HAVE_purify is defined, falcon always included
      <valgrind/memcheck.h>. Add autoconf check for this header
modified:
  configure.in
  storage/falcon/MemMgr.cpp

per-file messages:
  configure.in
    Add autoconf check for valgrind/memcheck
  storage/falcon/MemMgr.cpp
    Autoconf check for valgrind/memcheck.h
=== modified file 'configure.in'
--- a/configure.in	2008-08-06 08:26:05 +0000
+++ b/configure.in	2008-08-12 22:21:35 +0000
@@ -846,6 +846,7 @@ AC_CHECK_HEADERS(fcntl.h fenv.h float.h 
  execinfo.h)
 
 AC_CHECK_HEADERS([xfs/xfs.h])
+AC_CHECK_HEADERS([valgrind/memcheck.h])
 
 #--------------------------------------------------------------------
 # Check for system libraries. Adds the library to $LIBS

=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp	2008-08-11 19:56:57 +0000
+++ b/storage/falcon/MemMgr.cpp	2008-08-12 22:21:35 +0000
@@ -37,7 +37,12 @@
 #include "MemControl.h"
 
 #ifdef HAVE_purify
+#ifdef HAVE_CONFIG
+#include <config.h> 
+#endif
+#ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
+#endif
 #endif
 
 #ifndef VALGRIND_MAKE_MEM_UNDEFINED