diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 19:23:23 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 19:23:23 +0500 |
| commit | e4c98b4fbf35564ddc4a930732547e3c012995de (patch) | |
| tree | 9448cab63e74b61a56dbd133d3ef099a5244f068 /acinclude.m4 | |
| parent | 412d05510bb372bf264a091a585b9c0856896b6e (diff) | |
| download | mariadb-git-e4c98b4fbf35564ddc4a930732547e3c012995de.tar.gz | |
fixed :
Bug #3937 fails to compile with both gcc 3.3.3/icc8
Bug #4728 mysql couldn't be compiled using system readline (readline-4.3)
acinclude.m4:
1. added defun MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY for last versions of readline and libedit
2. added #undef __P in defuns MYSQL_CHECK_LIBEDIT_INTERFACE, MYSQL_CHECK_NEW_RL_INTERFACE
client/mysql.cc:
1. added #undef __P before #include "readline/readline.h" because readline-4.2 declares own __P
2. changed !defined(USE_LIBEDIT_INTERFACE) to !defined(HAVE_HIST_ENTRY) before declaring of own hist_entry
because latest versions of libedit declare hist_entry too
cmd-line-utils/Makefile.am:
added copyright header
configure.in:
1. added comment for --with-readline/--with-libedit options
2. added define for HAVE_HIST_ENTRY and macro to check it
3. added AC_LANG_CPLUSPLUS before readline/libedit checks
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 11f5d07200a..5007b1e3efb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,10 +1,32 @@ # 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) + ], + [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 +48,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" ], [ |