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 /cmd-line-utils | |
| 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 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/Makefile.am | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/cmd-line-utils/Makefile.am b/cmd-line-utils/Makefile.am index 7214d1231f9..88aaedde06d 100644 --- a/cmd-line-utils/Makefile.am +++ b/cmd-line-utils/Makefile.am @@ -1,3 +1,20 @@ +# Copyright (C) 2004 MySQL AB +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + ## Process this file with automake to create Makefile.in SUBDIRS= @readline_basedir@ |