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