mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug8162
into neptunus.(none):/home/msvensson/mysql/mysql-4.1 configure.in: Auto merged
This commit is contained in:
commit
abf4e93d82
1 changed files with 9 additions and 2 deletions
11
configure.in
11
configure.in
|
@ -2407,17 +2407,24 @@ then
|
|||
compile_readline=yes
|
||||
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
|
||||
else
|
||||
# Use system readline library
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
MYSQL_CHECK_LIBEDIT_INTERFACE
|
||||
MYSQL_CHECK_NEW_RL_INTERFACE
|
||||
MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY
|
||||
AC_LANG_RESTORE
|
||||
if [test "$mysql_cv_new_rl_interface" = "yes"] || [test "$mysql_cv_libedit_interface" = "no"]
|
||||
if [test "$mysql_cv_new_rl_interface" = "yes"]
|
||||
then
|
||||
# Use the new readline interface
|
||||
readline_link="-lreadline"
|
||||
else
|
||||
elif [test "$mysql_cv_libedit_interface" = "yes"]; then
|
||||
# Use libedit
|
||||
readline_link="-ledit"
|
||||
else
|
||||
AC_MSG_ERROR([Could not find system readline or libedit libraries
|
||||
Use --with-readline or --with-libedit to use the bundled
|
||||
versions of libedit or readline])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue