mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge neptunus.(none):/home/msvensson/mysql/bug8162

Browse source 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
This commit is contained in:
unknown 2005-04-27 12:24:17 +02:00
commit abf4e93d82
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.in
View file

@ -2407,17 +2407,24 @@ then
compile_readline=yes compile_readline=yes
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
else else
# Use system readline library
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
MYSQL_CHECK_LIBEDIT_INTERFACE MYSQL_CHECK_LIBEDIT_INTERFACE
MYSQL_CHECK_NEW_RL_INTERFACE MYSQL_CHECK_NEW_RL_INTERFACE
MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY
AC_LANG_RESTORE 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 then
# Use the new readline interface
readline_link="-lreadline" readline_link="-lreadline"
else elif [test "$mysql_cv_libedit_interface" = "yes"]; then
# Use libedit
readline_link="-ledit" 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 fi
fi fi