projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| bd62a2c5 AO |
1 | diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cmake |
| 2 | --- mysql-5.7.21.orig/cmake/readline.cmake 2017-12-28 04:46:26.000000000 +0100 | |
| 3 | +++ mysql-5.7.21/cmake/readline.cmake 2018-03-31 21:17:28.373826351 +0200 | |
| 4 | @@ -110,23 +110,23 @@ ENDMACRO() | |
| 96b6cbc2 AO |
5 | |
| 6 | MACRO (FIND_SYSTEM_EDITLINE) | |
| 7 | FIND_PATH(FOUND_EDITLINE_READLINE | |
| 8 | - NAMES editline/readline.h | |
| 9 | + NAMES readline/readline.h | |
| 10 | ) | |
| 11 | IF(FOUND_EDITLINE_READLINE) | |
| 12 | - SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline") | |
| 13 | + SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline") | |
| 14 | ELSE() | |
| 15 | # Different path on FreeBSD | |
| 16 | FIND_PATH(FOUND_EDIT_READLINE_READLINE | |
| 17 | NAMES edit/readline/readline.h | |
| 18 | ) | |
| 19 | IF(FOUND_EDIT_READLINE_READLINE) | |
| 20 | - SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline") | |
| 21 | + SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/readline") | |
| 22 | ENDIF() | |
| 23 | ENDIF() | |
| 24 | ||
| 25 | FIND_LIBRARY(EDITLINE_LIBRARY | |
| 26 | NAMES | |
| 27 | - edit | |
| 28 | + readline | |
| 29 | ) | |
| 30 | MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY) | |
| 31 | ||
| bd62a2c5 | 32 | @@ -139,7 +139,7 @@ MACRO (FIND_SYSTEM_EDITLINE) |
| 96b6cbc2 AO |
33 | SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY}) |
| 34 | CHECK_CXX_SOURCE_COMPILES(" | |
| 35 | #include <stdio.h> | |
| 36 | - #include <readline.h> | |
| 37 | + #include <readline/history.h> | |
| 38 | int main(int argc, char **argv) | |
| 39 | { | |
| 40 | HIST_ENTRY entry; | |
| bd62a2c5 | 41 | @@ -149,14 +149,13 @@ MACRO (FIND_SYSTEM_EDITLINE) |
| 96b6cbc2 AO |
42 | |
| 43 | CHECK_CXX_SOURCE_COMPILES(" | |
| 44 | #include <stdio.h> | |
| 45 | - #include <readline.h> | |
| 46 | + #include <readline/readline.h> | |
| 47 | int main(int argc, char **argv) | |
| 48 | { | |
| 49 | - typedef int MYFunction(const char*, int); | |
| 50 | - MYFunction* myf= rl_completion_entry_function; | |
| 51 | - int res= (myf)(NULL, 0); | |
| 52 | - completion_matches(0,0); | |
| 53 | - return res; | |
| 54 | + rl_compentry_func_t *myf= rl_completion_entry_function; | |
| 55 | + char *res= (myf)(NULL, 0); | |
| 56 | + rl_completion_matches(0,0); | |
| 57 | + return res ? 0 : 1; | |
| 58 | }" | |
| bd62a2c5 | 59 | EDITLINE_HAVE_COMPLETION_INT) |
| 96b6cbc2 | 60 | |
| bd62a2c5 AO |
61 | @@ -168,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE) |
| 62 | typedef char* MYFunction(const char*, int); | |
| 63 | MYFunction* myf= rl_completion_entry_function; | |
| 64 | char *res= (myf)(NULL, 0); | |
| 65 | - completion_matches(0,0); | |
| 66 | + rl_completion_matches(0,0); | |
| 67 | return res != NULL; | |
| 68 | }" | |
| 69 | EDITLINE_HAVE_COMPLETION_CHAR) |