diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rwxr-xr-x | gdb/configure | 2 | ||||
| -rw-r--r-- | gdb/configure.ac | 2 | ||||
| -rw-r--r-- | gdb/windows-termcap.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a6ba992..6e3e258 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2015-01-22 Pedro Alves <palves@redhat.com> + + * configure.ac [*mingw32*]: Check $curses_found instead of + $prefer_curses. + * configure: Regenerate. + * windows-termcap.c: Remove HAVE_CURSES_H, HAVE_NCURSES_H and + HAVE_NCURSES_NCURSES_H checks. + 2015-01-22 Eli Zaretskii <eliz@gnu.org> * gdb/tui/tui.c (tui_enable) [__MINGW32__]: If the call to 'newterm' diff --git a/gdb/configure b/gdb/configure index fb2480c..9632f9a 100755 --- a/gdb/configure +++ b/gdb/configure @@ -7188,7 +7188,7 @@ case $host_os in ac_cv_search_tgetent="none required" ;; *mingw32*) - if test x"$prefer_curses" != xyes; then + if test x"$curses_found" != xyes; then ac_cv_search_tgetent="none required" CONFIG_OBS="$CONFIG_OBS windows-termcap.o" fi ;; diff --git a/gdb/configure.ac b/gdb/configure.ac index 36a74d2..dfc6947 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -611,7 +611,7 @@ case $host_os in ac_cv_search_tgetent="none required" ;; *mingw32*) - if test x"$prefer_curses" != xyes; then + if test x"$curses_found" != xyes; then ac_cv_search_tgetent="none required" CONFIG_OBS="$CONFIG_OBS windows-termcap.o" fi ;; diff --git a/gdb/windows-termcap.c b/gdb/windows-termcap.c index 0154083..caafc47 100644 --- a/gdb/windows-termcap.c +++ b/gdb/windows-termcap.c @@ -22,8 +22,6 @@ #include "defs.h" -#if !defined HAVE_CURSES_H && !defined HAVE_NCURSES_H && !defined HAVE_NCURSES_NCURSES_H - #include <stdlib.h> /* -Wmissing-prototypes */ @@ -76,5 +74,3 @@ tgoto (const char *cap, int col, int row) { return NULL; } - -#endif /* !HAVE_CURSES_H && !HAVE_NCURSES_H && !HAVE_NCURSES_NCURSES_H */ |