Use terminfo rather than termcap on recent NetBSD.

* configure.in: On NetBSD, if terminfo is found, use it in preference
to termcap.  (Bug#6190)

diff --git a/ChangeLog b/ChangeLog
index 83beaca69837a42504a1666d99f1b341f570dc3b..1615145c4f364fd58d2500b55fdce9961bb60e27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  enami tsugutomo  <tsugutomo.enami@jp.sony.com>
+
+       * configure.in: On NetBSD, if terminfo is found, use it in
+       preference to termcap.  (Bug#6190)
+
 2010-05-20  Glenn Morris  <rgm@gnu.org>
 
        * make-dist (src): Include *.mk.

diff --git a/configure.in b/configure.in
index 383815bf88353a9ca86db61868232773cb7b4df8..3d11ef584fa47597360b9feb5d5e631aa27827ce 100644 (file)
--- 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" ;;