merge emacs-23

3 files changed, 11 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b22a2e07ff..dbb7be762a8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * config.in (TERMINFO): New definition.
+
+        * s/netbsd.h: Use it to choose between terminfo and termcap
+        (Bug#7642).
+
 2011-01-03  Jan Djärv  <jan.h.d@swipnet.se>
 
         * coding.h (ENCODE_UTF_8): Remove "Used by ..." comment.
diff --git a/src/config.in b/src/config.in
index ed103479441..0ccb13d7400 100644
--- a/src/config.in
+++ b/src/config.in
@@ -895,6 +895,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Process async input synchronously. */
 #undef SYNC_INPUT
 
+/* Define to 1 if you use terminfo instead of termcap. */
+#undef TERMINFO
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 27605c2808f..4a9e31167e2 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -45,8 +45,7 @@ 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
+#ifdef TERMINFO
 #define LIBS_TERMCAP -lterminfo
 #else
 #define LIBS_TERMCAP -ltermcap