Mercurial > emacs

changeset 108665:45004fc2d3e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backport from trunk: close bug#6190. * src/s/netbsd.h: If terminfo is found, use it in preference to termcap.
author Glenn Morris <rgm@gnu.org>
date Thu, 20 May 2010 21:06:34 -0700
parents 1561cf68ce2a
children 6fcf1baf9c2a
files src/ChangeLog src/s/netbsd.h
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu May 20 10:50:32 2010 -0400
+++ b/src/ChangeLog	Thu May 20 21:06:34 2010 -0700
@@ -1,3 +1,8 @@
+2010-05-20  enami tsugutomo  <tsugutomo.enami@jp.sony.com>
+
+	* s/netbsd.h: If terminfo is found, use it in preference to
+	termcap.  (Bug#6190)  [Backport from trunk]
+
 2010-05-20  Kevin Ryde  <user42@zip.com.au>
 
 	* keyboard.c (Vlast_command, Vkeyboard_translate_table)
--- a/src/s/netbsd.h	Thu May 20 10:50:32 2010 -0400
+++ b/src/s/netbsd.h	Thu May 20 21:06:34 2010 -0700
@@ -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