Backport from trunk: close bug#6190.

* src/s/netbsd.h: If terminfo is found, use it in preference to termcap.

diff --git a/src/ChangeLog b/src/ChangeLog
index 929cea2832a1a7e9ac2527bebd02c0c9e3d1990d..ddf73eaf3c5b572b8af5114e7f1e99039ea17b10 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 17d3b33451e3af5a4463f80ede6d97e095df7d1f..132fc137e508d4edbf299412f4488a7b4ee3d1ef 100644 (file)
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -45,7 +45,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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