Backport from trunk: close bug#6190.

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

Backport from trunk: close bug#6190.
* src/s/netbsd.h: If terminfo is found, use it in preference to termcap.
f5b416d2 · enami tsugutomo · Glenn Morris · aeb77d46 · f5b416d2 · f5b416d2
Commit f5b416d2 authored May 20, 2010 by enami tsugutomo Committed by Glenn Morris May 20, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

src/ChangeLog src/ChangeLog +5 -0

src/s/netbsd.h src/s/netbsd.h +5 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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
+++ 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