* configure.in: Check for ncurses/term.h.

* gdb_curses.h: Include term.h here, prefering ncurses/term.h.
	* utils.c: Include gdb_curses.h instead of curses.h and term.h.
	* tui/tui.c: Don't include term.h.
	* configure, config.in: Rebuilt.

gdb/ChangeLog

@@ -1,3 +1,11 @@
+2004-11-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* configure.in: Check for ncurses/term.h.
+	* gdb_curses.h: Include term.h here, prefering ncurses/term.h.
+	* utils.c: Include gdb_curses.h instead of curses.h and term.h.
+	* tui/tui.c: Don't include term.h.
+	* configure, config.in: Rebuilt.
+
 2004-11-08  Mark Kettenis  <kettenis@gnu.org>
 
 	* m68kbsd-nat.c: Include "inf-ptrace.h".

gdb/config.in

@@ -314,6 +314,9 @@
 /* Define if you have the <ncurses/ncurses.h> header file.  */
 #undef HAVE_NCURSES_NCURSES_H
 
+/* Define if you have the <ncurses/term.h> header file.  */
+#undef HAVE_NCURSES_TERM_H
+
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 

gdb/configure.in

@@ -394,7 +394,8 @@ case $host_os in
    Solaris 2.[789] when using GCC. ]])
     fi ;;
 esac
-AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h term.h)
+AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h)
+AC_CHECK_HEADERS(ncurses/term.h term.h)
 
 # FIXME: kettenis/20030102: In most cases we include these
 # unconditionally, so what's the point in checking these?

gdb/gdb_curses.h

@@ -32,4 +32,10 @@
 #include <curses.h>
 #endif
 
+#if defined (HAVE_NCURSES_TERM_H)
+#include <ncurses/term.h>
+#elif defined (HAVE_TERM_H)
+#include <term.h>
+#endif
+
 #endif /* gdb_curses.h */

gdb/tui/tui.c

@@ -44,9 +44,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_TERM_H
-#include <term.h>
-#endif
 #include <signal.h>
 #include <fcntl.h>
 #if 0

gdb/utils.c

@@ -57,12 +57,7 @@
 
 #include <sys/param.h>		/* For MAXPATHLEN */
 
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#endif
-#ifdef HAVE_TERM_H
-#include <term.h>
-#endif
+#include "gdb_curses.h"
 
 #include "readline/readline.h"