1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
$NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $
* Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
--- cmake/readline.cmake.orig 2015-02-13 12:07:00.000000000 +0000
+++ cmake/readline.cmake
@@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
SET(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR})
CHECK_CXX_SOURCE_COMPILES("
#include <stdio.h>
- #include <readline.h>
+ #include <readline/readline.h>
int main(int argc, char **argv)
{
rl_completion_func_t *func1= (rl_completion_func_t*)0;
@@ -142,7 +142,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
CHECK_C_SOURCE_COMPILES("
#include <stdio.h>
- #include <readline.h>
+ #include <readline/readline.h>
#if RL_VERSION_MAJOR > 5
#error
#endif
@@ -180,8 +180,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
#include <readline.h>
int main(int argc, char **argv)
{
- int res= (*rl_completion_entry_function)(0,0);
+ typedef int MYFunction(const char*, int);
+ MYFunction* myf= rl_completion_entry_function;
+ int res= (myf)(NULL, 0);
completion_matches(0,0);
+ return res;
}"
LIBEDIT_INTERFACE)
SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
@@ -195,32 +198,13 @@ MACRO (MYSQL_CHECK_READLINE)
SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline")
FIND_CURSES()
- IF(WITH_READLINE)
- MYSQL_USE_BUNDLED_READLINE()
- ELSE()
- # OSX includes incompatible readline lib
- IF (NOT APPLE)
- MYSQL_FIND_SYSTEM_READLINE()
- ENDIF()
- IF(USE_NEW_READLINE_INTERFACE)
- SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
- SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY})
- ELSE()
- MYSQL_FIND_SYSTEM_LIBEDIT()
- IF(USE_LIBEDIT_INTERFACE)
- SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR})
- SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY})
- ELSE()
- MYSQL_USE_BUNDLED_READLINE()
- ENDIF()
- ENDIF()
- ENDIF()
+ MYSQL_FIND_SYSTEM_READLINE()
SET(CMAKE_REQUIRED_LIBRARIES ${MY_READLINE_LIBRARY})
SET(CMAKE_REQUIRED_INCLUDES ${MY_READLINE_INCLUDE_DIR})
CHECK_CXX_SOURCE_COMPILES("
#include <stdio.h>
- #include <readline.h>
+ #include <readline/readline.h>
int main(int argc, char **argv)
{
HIST_ENTRY entry;
|
