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

Applied sligtly modified patch from Dan Horak to use system libread

Browse Source
This commit is contained in:
alexpeshkoff 2009-07-21 13:00:54 +00:00
parent d3b564da7c
commit af74fb5d1f
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/posix/Makefile.in.extern.editline
View File

@ -59,12 +59,12 @@ include $(ROOT)/gen/make.shared.variables
.PHONY: libeditline
libeditline : $(LIB)/libeditline.a
libeditline : $(LIB)/libedit.a
$(LIB)/libeditline.a:
$(LIB)/libedit.a:
cd $(ROOT)/extern/editline; chmod +x configure; ./configure --enable-static --disable-shared
$(MAKE) -C $(ROOT)/extern/editline
cp $(ROOT)/extern/editline/src/.libs/libedit.a $(LIB)/libeditline.a
cp $(ROOT)/extern/editline/src/.libs/libedit.a $(LIB)
include $(ROOT)/gen/make.shared.targets

5
builds/posix/make.defaults
View File

@ -106,6 +106,7 @@ SFIO_EXAMPLES=@SFIO_EXAMPLES@
# link with readline libraries - set by configure
EDITLINE_FLG=@EDITLINE_FLG@
STD_EDITLINE=@STD_EDITLINE@
READLINE=@READLINE@
STD_ICU=@STD_ICU@
# threading options - set by configure
@ -223,9 +224,9 @@ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE), true)
LIBEDITLINE := -leditline
LIBEDITLINE := -l$(READLINE)
else
LIBEDITLINE := $(LIB)/libeditline.a
LIBEDITLINE := $(LIB)/libedit.a
endif
endif

9
configure.in
View File

@ -412,12 +412,19 @@ AC_ARG_WITH(system-editline,
esac])
# not need editline in default libs, but need to test for its presence
READLINE=edit # builtin default
saveLIBS=$LIBS
if test "$STD_EDITLINE" = "true"; then
AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
AC_CHECK_LIB(edit, readline, READLINE=edit,
AC_CHECK_LIB(editline, readline, READLINE=editline,
AC_CHECK_LIB(readline, readline, READLINE=readline, STD_EDITLINE=false)))
fi
if test "$STD_EDITLINE" = "true"; then
EDITLINE_FLG=Y
fi
LIBS=$saveLIBS
AC_SUBST(READLINE)
AC_SUBST(STD_EDITLINE)
AC_SUBST(EDITLINE_FLG)