Don't try to include termcap.h; see comment there.

3 files changed, 14 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 07b35a0ed93..8caa4e4ea18 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-21  Gerd Moellmann  <gerd@gnu.org>
+
+        * term.c, cm.c: Don't try to include termcap.h; see comment there.
+
 2000-11-21  Kenichi Handa  <handa@etl.go.jp>
 
         * s/sol2-5.h: Move #undef USE_MMAP_FOR_BUFFERS out of #if 0
diff --git a/src/cm.c b/src/cm.c
index 144baa847b5..56a1160c593 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -25,7 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "cm.h"
 #include "termhooks.h"
 
-#ifdef HAVE_TERMCAP_H
+/* For now, don't try to include termcap.h.  On some systems,
+   configure finds a non-standard termcap.h that the main build
+   won't find.  */
+
+#if defined HAVE_TERMCAP_H && 0
 #include <termcap.h>
 #else
 extern void tputs P_ ((const char *, int, int (*)(int)));
diff --git a/src/term.c b/src/term.c
index fc96d7d7129..8e1443f4507 100644
--- a/src/term.c
+++ b/src/term.c
@@ -38,7 +38,11 @@ Boston, MA 02111-1307, USA.  */
 #include "dispextern.h"
 #include "window.h"
 
-#ifdef HAVE_TERMCAP_H
+/* For now, don't try to include termcap.h.  On some systems,
+   configure finds a non-standard termcap.h that the main build
+   won't find.  */
+
+#if defined HAVE_TERMCAP_H && 0
 #include <termcap.h>
 #else
 extern void tputs P_ ((const char *, int, int (*)(int)));