diff options
| author | unknown <joreland@mysql.com> | 2004-08-24 21:07:08 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-24 21:07:08 +0200 |
| commit | 1e91f015caeeec47c65b754d19ac956d79ded31d (patch) | |
| tree | b97a7c4b8467dab0c313ce080b2c9a3b7cfb9e80 /configure.in | |
| parent | f7e31ee94c822b1d2be6d479d4fade6304243754 (diff) | |
| parent | 6b20f46abc65f8b3dd851df71d04b89cb0d3f208 (diff) | |
| download | mariadb-git-1e91f015caeeec47c65b754d19ac956d79ded31d.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/src/mgmsrv/Services.cpp:
Auto merged
configure.in:
Auto merged
acinclude.m4:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 9a902d17305..a4b38778363 100644 --- a/configure.in +++ b/configure.in @@ -2301,6 +2301,20 @@ AC_ARG_WITH(libedit, [ with_libedit=undefined ] ) +# +# We support next variants of compilation: +# --with-readline +# | yes | no | undefined +# --with-libedit | | | +# ---------------+----------------+------+---------------------------------- +# yes | ERROR! | use libedit from mysql sources +# ---------------+----------------+------+---------------------------------- +# no | use readline | use system readline or external libedit +# | from mysql | according to results of m4 tests +# ---------------+ sources (if it + +---------------------------------- +# undefined | is presented) | | use libedit from mysql sources + + compile_readline="no" compile_libedit="no" @@ -2328,6 +2342,7 @@ then readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a" readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline readline" compile_libedit=yes + AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY) AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE, 1) elif test "$with_readline" = "yes" then @@ -2339,8 +2354,12 @@ then compile_readline=yes AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) else + 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"] then readline_link="-lreadline" |