From e35edfbbb5a39477f8b4c5b51ed4cf9f2b18790b Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 23 Sep 2011 08:06:27 +0000 Subject: [PATCH] Use terminfo, not termcap. --- postgresql/config/programs.m4 | 4 ++-- postgresql/src/backend/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/postgresql/config/programs.m4 b/postgresql/config/programs.m4 index 565195d..c050409 100644 --- a/postgresql/config/programs.m4 +++ b/postgresql/config/programs.m4 @@ -111,7 +111,7 @@ AC_SUBST(FLEXFLAGS) # PGAC_CHECK_READLINE # ------------------- # Check for the readline library and dependent libraries, either -# termcap or curses. Also try libedit, since NetBSD's is compatible. +# terminfo or curses. Also try libedit, since NetBSD's is compatible. # Add the required flags to LIBS, define HAVE_LIBREADLINE. AC_DEFUN([PGAC_CHECK_READLINE], @@ -125,7 +125,7 @@ then READLINE_ORDER="-lreadline -ledit" else READLINE_ORDER="-ledit -lreadline" fi for pgac_rllib in $READLINE_ORDER ; do - for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do + for pgac_lib in "" " -ltinfo" ; do LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS" AC_TRY_LINK_FUNC([readline], [[ # Older NetBSD, OpenBSD, and Irix have a broken linker that does not diff --git a/postgresql/src/backend/Makefile b/postgresql/src/backend/Makefile index ec82d8d..2740512 100644 --- a/postgresql/src/backend/Makefile +++ b/postgresql/src/backend/Makefile @@ -41,7 +41,7 @@ OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a LIBS := $(filter-out -lpgport, $(LIBS)) $(LDAP_LIBS_BE) # The backend doesn't need everything that's in LIBS, however -LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)) +LIBS := $(filter-out -lz -lreadline -ledit -ltinfo, $(LIBS)) ########################################################################## -- 1.7.0.4