diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/config.in | 3 | ||||
| -rwxr-xr-x | gdb/configure | 2 | ||||
| -rw-r--r-- | gdb/configure.in | 2 | ||||
| -rw-r--r-- | gdb/gdb_curses.h | 6 |
5 files changed, 15 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9e4e10e..7de45e4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-08-15 Mark Kettenis <kettenis@gnu.org> + * configure.in: Add <ncurses/ncurses.h> to the list of possible + curses headers. + * configure, config.in: Regenerate. + * gdb_curses.h [HAVE_NCURSES_NCURSES_H]: Include + <ncurses/ncurses.h>. + * config/nm-bsd.h (PTRACE_ARG3_TYPE): Remove define. * config/nm-nbsd.h: Update copyright year. (PTRACE_ARG3_TYPE): Remove define. diff --git a/gdb/config.in b/gdb/config.in index 8b5c96f..83b9142 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -305,6 +305,9 @@ /* Define if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H +/* Define if you have the <ncurses/ncurses.h> header file. */ +#undef HAVE_NCURSES_NCURSES_H + /* Define if you have the <ndir.h> header file. */ #undef HAVE_NDIR_H diff --git a/gdb/configure b/gdb/configure index 495d798..0245680 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5664,7 +5664,7 @@ EOF fi ;; esac -for ac_hdr in curses.h cursesX.h ncurses.h term.h +for ac_hdr in curses.h cursesX.h ncurses.h ncurses/ncurses.h term.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/gdb/configure.in b/gdb/configure.in index 899a334..07def81 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -430,7 +430,7 @@ case $host_os in Solaris 2.[789] when using GCC. ]]) fi ;; esac -AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h term.h) +AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h term.h) # FIXME: kettenis/20030102: In most cases we include these # unconditionally, so what's the point in checking these? diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h index 1e4bfcd..4371d4f 100644 --- a/gdb/gdb_curses.h +++ b/gdb/gdb_curses.h @@ -22,7 +22,9 @@ #ifndef GDB_CURSES_H #define GDB_CURSES_H 1 -#if defined (HAVE_NCURSES_H) +#if defined (HAVE_NCURSES_NCURSES_H) +#include <ncurses/ncurses.h> +#elif defined (HAVE_NCURSES_H) #include <ncurses.h> #elif defined (HAVE_CURSESX_H) #include <cursesX.h> @@ -30,4 +32,4 @@ #include <curses.h> #endif -#endif +#endif /* gdb_curses.h */ |