From 0a5a008971666d57e8137b20e5349b0631cad0cb Mon Sep 17 00:00:00 2001 From: enami tsugutomo Date: Wed, 19 May 2010 23:37:29 -0700 Subject: [PATCH] Use terminfo rather than termcap on recent NetBSD. * configure.in: On NetBSD, if terminfo is found, use it in preference to termcap. (Bug#6190) --- ChangeLog | 5 +++++ configure.in | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83beaca6983..1615145c4f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-20 enami tsugutomo + + * configure.in: On NetBSD, if terminfo is found, use it in + preference to termcap. (Bug#6190) + 2010-05-20 Glenn Morris * make-dist (src): Include *.mk. diff --git a/configure.in b/configure.in index 383815bf883..3d11ef584fa 100644 --- a/configure.in +++ b/configure.in @@ -2643,7 +2643,7 @@ HAVE_LIBNCURSES=yes ## Use terminfo instead of termcap? ## Note only system files NOT using terminfo are: -## freebsd < 40000, ms-w32, msdos, netbsd, and +## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and ## darwin|gnu without ncurses. TERMINFO=no LIBS_TERMCAP= @@ -2685,13 +2685,22 @@ fail; fi ;; + netbsd) + if test $ac_cv_search_tputs = -lterminfo; then + TERMINFO=yes + LIBS_TERMCAP="-lterminfo" + else + LIBS_TERMCAP="-ltermcap" + fi + ;; + esac case "$opsys" in ## hpux: Make sure we get select from libc rather than from libcurses ## because libcurses on HPUX 10.10 has a broken version of select. ## We used to use -lc -lcurses, but this may be cleaner. - hpux*|netbsd) LIBS_TERMCAP="-ltermcap" ;; + hpux*) LIBS_TERMCAP="-ltermcap" ;; openbsd) LIBS_TERMCAP="-lncurses" ;; -- 2.39.2