firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Editline cleanup:

Browse Source 
o removed obsolete readline tests
 o renamed readline into editline
 o editline is not enabled by default, enabled with '--with-editline'
This commit is contained in:
eku 2002-11-13 07:07:58 +00:00
parent 6a1228b525
commit 616c134010
6 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/posix/Makefile.in.firebird
View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.firebird,v 1.15 2002-11-11 13:09:17 eku Exp $
# $Id: Makefile.in.firebird,v 1.16 2002-11-13 07:07:55 eku Exp $
#
ROOT=..
@ -183,7 +183,7 @@ jrd/build_no.h : misc/writeBuildNum.sh
# is the only external library we have included.
#
EXTERNAL_LIBRARIES=
ifeq ($(READLINE_FLG),Y)
ifeq ($(EDITLINE_FLG),Y)
EXTERNAL_LIBRARIES:= $(EXTERNAL_LIBRARIES) $(LIBEDIT_A)
endif

4
builds/posix/make.defaults
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.defaults,v 1.5 2002-11-05 01:42:48 nmcc Exp $
# $Id: make.defaults,v 1.6 2002-11-13 07:07:55 eku Exp $
#
@ -65,7 +65,7 @@ SharedLibrarySoName=@FIREBIRD_LIBGDS_SO_X_LNK@
SharedLibraryBaseName=@FIREBIRD_LIBGDS_SO_LNK@
# link with readline libraries - set by configure
READLINE_FLG=@READLINE_FLG@
EDITLINE_FLG=@EDITLINE_FLG@
# Default programs and tools to be used in the build process

22
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.81 2002-11-12 13:46:06 eku Exp $
dnl $Id: configure.in,v 1.82 2002-11-13 07:07:53 eku Exp $
dnl ############################# INITIALISATION ###############################
@ -121,15 +121,15 @@ if test "$FIREBIRD_ARCH_TYPE" = "classic"; then
fi
AC_SUBST(MANAGER_PROCESS_TARGET)
READLINE_FLG=Y
AC_ARG_WITH(readline,
[ --with-readline support fancy command line editing (default=yes)],
EDITLINE_FLG=N
AC_ARG_WITH(editline,
[ --with-editline support fancy command line editing (default=yes)],
[case "$withval" in
yes) READLINE_FLG=Y;;
no) READLINE_FLG=N;;
*) AC_MSG_ERROR(bad value '${withval}' for --with-readline);;
yes) EDITLINE_FLG=Y;;
no) EDITLINE_FLG=N;;
*) AC_MSG_ERROR(bad value '${withval}' for --with-editline);;
esac])
AC_SUBST(READLINE_FLG)
AC_SUBST(EDITLINE_FLG)
FB_SERVICE_NAME=gds_db
FB_SERVICE_PORT=3050
@ -169,9 +169,8 @@ AC_CHECK_HEADERS(stdarg.h)
AC_CHECK_HEADERS(stdlib.h)
AC_CHECK_HEADERS(string.h)
AC_CHECK_HEADERS(signal.h)
if test "$READLINE_FLG" = "Y"; then
if test "$EDITLINE_FLG" = "Y"; then
AC_DEFINE(HAVE_EDITLINE_H)
# AC_CHECK_HEADERS(readline/readline.h)
fi
AC_CHECK_HEADERS(pwd.h)
AC_CHECK_HEADERS(unistd.h)
@ -190,9 +189,8 @@ fi
AC_CHECK_LIB(crypt, main)
AC_CHECK_LIB(curses, main)
dnl AC_CHECK_LIB(termcap, main)
if test "$READLINE_FLG" = "Y"; then
if test "$EDITLINE_FLG" = "Y"; then
AC_SUBST(EDITLINE_A, -ledit)
# AC_CHECK_LIB(readline, main,,, $LIBS)
fi
AC_CHECK_LIB(stdc++, main,,, $LIBS)
AC_CHECK_LIB(sfio, main,,, $LIBS) dnl Solaris only

1
src/include/gen/autoconfig_msvc.h
View File

@ -63,7 +63,6 @@
#define HAVE_STDLIB_H
#define HAVE_STRING_H
#define HAVE_SIGNAL_H
#undef HAVE_READLINE_READLINE_H
#undef HAVE_EDITLINE_H
#undef HAVE_UNISTD_H
#undef HAVE_VARARGS_H

17
src/isql/isql.epp
View File

@ -24,7 +24,7 @@
*
*/
/*
$Id: isql.epp,v 1.15 2002-10-07 01:29:12 skywalker Exp $
$Id: isql.epp,v 1.16 2002-11-13 07:07:56 eku Exp $
Revision 1.5 2000/11/18 16:49:24 fsg
Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans
Fixed Bug #122563 in extract.e get_procedure_args
@ -73,21 +73,6 @@
#include "editline.h"
#endif
#ifdef HAVE_READLINE_READLINE_H
#include <stdio.h>
#include <readline/readline.h>
#include <readline/history.h>
// We have conflicting values for NEWLINE readline wants '\n' and
// isql.h wants "\n". (note the quotes). So we undef it here after
// getting through the readline headers.
#ifdef NEWLINE
#undef NEWLINE
#endif
#endif
#include <string>

3
src/make.new/config/config.h.in
View File

@ -1,4 +1,4 @@
#ident "$Id: config.h.in,v 1.55 2002-11-12 13:46:11 eku Exp $"
#ident "$Id: config.h.in,v 1.56 2002-11-13 07:07:57 eku Exp $"
/*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
@ -45,7 +45,6 @@
#undef HAVE_STDLIB_H
#undef HAVE_STRING_H
#undef HAVE_SIGNAL_H
#undef HAVE_READLINE_READLINE_H
#undef HAVE_UNISTD_H
#undef HAVE_VARARGS_H
#undef HAVE_VFORK_H