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

Avoid unneeded dependencies from termcap/curses library

Browse Source
This commit is contained in:
AlexPeshkoff 2020-07-16 18:32:44 +03:00
parent f47472f50f
commit 8c1ef78fcf
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/posix/Makefile.in
View File

@ -534,7 +534,7 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB)
isql: $(ISQL) isql: $(ISQL)
$(ISQL): $(ISQL_Objects) $(COMMON_LIB) $(ISQL): $(ISQL_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
nbackup: $(NBACKUP) nbackup: $(NBACKUP)

1
builds/posix/make.defaults
View File

@ -256,6 +256,7 @@ ifeq ($(EDITLINE_FLG),Y)
else else
LIBEDITLINE := $(LIB)/libedit.a LIBEDITLINE := $(LIB)/libedit.a
endif endif
TERMLIB := -l@TERMLIB@
endif endif
# Shared library name for usage inside of the UDF # Shared library name for usage inside of the UDF

1
configure.ac
View File

@ -868,7 +868,6 @@ if test "$EDITLINE_FLG" = "Y"; then
AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \ AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
AC_MSG_ERROR(termcap support not found))))) AC_MSG_ERROR(termcap support not found)))))
AC_SUBST(TERMLIB) AC_SUBST(TERMLIB)
XE_APPEND(-l$TERMLIB, LIBS)
fi fi
AC_SEARCH_LIBS(inet_aton, resolv) AC_SEARCH_LIBS(inet_aton, resolv)