diff options
| author | enami tsugutomo <tsugutomo.enami@jp.sony.com> | 2010-05-20 21:06:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-20 21:06:34 -0700 |
| commit | f5b416d2ef84115b7b0690dfff48be7ce3b4d79a (patch) | |
| tree | 0860f5b40b5d338674d13a551cbb034e022d8ad1 | |
| parent | aeb77d46603d3e2b302b377d0e354dff5625a9e6 (diff) | |
| download | emacs-f5b416d2ef84115b7b0690dfff48be7ce3b4d79a.tar.gz | |
Backport from trunk: close bug#6190.
* src/s/netbsd.h: If terminfo is found, use it in preference to termcap.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/s/netbsd.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 929cea2832a..ddf73eaf3c5 100644 --- 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 17d3b33451e..132fc137e50 100644 --- 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 |