From 689c1b44a99b9de1cbaf3939efa0c809aa3d4f43 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sat, 1 Jun 2013 21:30:33 +0200 Subject: MDEV-4607 : libreadline-related compilation problems on NetBSD. Problem : libreadline.so was already present on the machine, however the cmake check NEW_READLINE_INTERFACE was unsuccessfull indicating, thus bundled library had to be used instead of system library. The problem was that the value for HAVE_HIST_ENTRY cmake variable was cached with incorrect value (1 on NetBSD). The fix is to change HAVE_HIST_ENTRY to 0 with CACHE FORCE, after switching to bundled readline. --- cmake/readline.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 285b436921e..c99557683a6 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -115,7 +115,7 @@ ENDMACRO() MACRO (MYSQL_USE_BUNDLED_READLINE) SET(USE_NEW_READLINE_INTERFACE 1) - SET(HAVE_HIST_ENTRY) + SET(HAVE_HIST_ENTRY 0 CACHE INTERNAL "" FORCE) SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils) SET(READLINE_LIBRARY readline) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/readline) -- cgit v1.2.1