1*4882a593SmuzhiyunFrom 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jackie Huang <jackie.huang@windriver.com> 3*4882a593SmuzhiyunDate: Tue, 26 Feb 2019 23:57:06 -0800 4*4882a593SmuzhiyunSubject: [PATCH] configure.cmake: fix valgrind 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunCheck valgrind headers only if WITH_VALGRIND is set. 7*4882a593Smuzhiyun 8*4882a593Smuzhiyunmariadb uses two macros for valgrind compilations: 9*4882a593SmuzhiyunHAVE_valgrind - valgrind is installed and can be set by configure option -DWITH_VALGRIND 10*4882a593SmuzhiyunHAVE_VALGRIND - valgrind debug libraries is installed, set by auto check 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunWe would like to set them both by the configure option so that we can use 13*4882a593SmuzhiyunPACKAGECONFIG to decide if valgrind is needed or not. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunUpstream-Status: Inappropriate [oe specific] 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Jackie Huang <jackie.huang@windriver.com> 18*4882a593SmuzhiyunSigned-off-by: Mingli Yu <mingli.yu@windriver.com> 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun configure.cmake | 5 ++--- 22*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 3 deletions(-) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyundiff --git a/configure.cmake b/configure.cmake 25*4882a593Smuzhiyunindex 3cfc4b31..d017b3b3 100644 26*4882a593Smuzhiyun--- a/configure.cmake 27*4882a593Smuzhiyun+++ b/configure.cmake 28*4882a593Smuzhiyun@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun IF(WITH_VALGRIND) 31*4882a593Smuzhiyun SET(HAVE_valgrind 1) 32*4882a593Smuzhiyun-ENDIF() 33*4882a593Smuzhiyun- 34*4882a593Smuzhiyun-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 35*4882a593Smuzhiyun+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 36*4882a593Smuzhiyun HAVE_VALGRIND_MEMCHECK_H) 37*4882a593Smuzhiyun+ENDIF() 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun #-------------------------------------------------------------------- 40*4882a593Smuzhiyun # Check for IPv6 support 41