[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99812: Backport from trunk: close bug#6190.

[Glenn Morris]

------------------------------------------------------------
revno: 99812
author: enami tsugutomo <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-05-20 21:06:34 -0700
message:
  Backport from trunk: close bug#6190.
  * src/s/netbsd.h: If terminfo is found, use it in preference to termcap.
modified:
  src/ChangeLog
  src/s/netbsd.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-20 14:50:32 +0000
+++ b/src/ChangeLog     2010-05-21 04:06:34 +0000
@@ -1,3 +1,8 @@
+2010-05-20  enami tsugutomo  <address@hidden>
+
+       * s/netbsd.h: If terminfo is found, use it in preference to
+       termcap.  (Bug#6190)  [Backport from trunk]
+
 2010-05-20  Kevin Ryde  <address@hidden>
 
        * keyboard.c (Vlast_command, Vkeyboard_translate_table)

=== modified file 'src/s/netbsd.h'
--- a/src/s/netbsd.h    2010-01-13 08:35:10 +0000
+++ b/src/s/netbsd.h    2010-05-21 04:06:34 +0000
@@ -45,7 +45,12 @@
 #define LIBS_DEBUG
 /* -lutil is not needed for NetBSD >0.9.  */
 /* #define LIBS_SYSTEM -lutil */
+#ifdef HAVE_TERM_H
+#define TERMINFO
+#define LIBS_TERMCAP -lterminfo
+#else
 #define LIBS_TERMCAP -ltermcap
+#endif
 
 #define NEED_ERRNO
 #define SYSV_SYSTEM_DIR