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 /acinclude.m4 | |
| 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 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d19942ce4e4..809e5e768e5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,10 +1,33 @@ # Local macros for automake & autoconf + +AC_DEFUN(MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY,[ + AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, + AC_TRY_COMPILE( + [ + #include "stdio.h" + #undef __P // readline-4.2 declares own __P + #include "readline/readline.h" + ], + [ + HIST_ENTRY entry; + ], + [ + mysql_cv_hist_entry_declared=yes + AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, [1], + [HIST_ENTRY is defined in the outer libeditreadline]) + ], + [mysql_cv_libedit_interface=no] + ) + ) +]) + AC_DEFUN(MYSQL_CHECK_LIBEDIT_INTERFACE,[ AC_CACHE_CHECK([libedit variant of rl_completion_entry_function], mysql_cv_libedit_interface, AC_TRY_COMPILE( [ #include "stdio.h" + #undef __P // readline-4.2 declares own __P #include "readline/readline.h" ], [ @@ -26,6 +49,7 @@ AC_DEFUN(MYSQL_CHECK_NEW_RL_INTERFACE,[ AC_TRY_COMPILE( [ #include "stdio.h" + #undef __P // readline-4.2 declares own __P #include "readline/readline.h" ], [ |