[binutils-gdb] mingw32: fix windows-termcap/curses check

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=03b7960334677d33ee7410f2c819f78820c32024

commit 03b7960334677d33ee7410f2c819f78820c32024
Author: Pedro Alves <palves@redhat.com>
Date:   Thu Jan 22 18:30:01 2015 +0000

    mingw32: fix windows-termcap/curses check
    
    When GDB is configured with "--without-tui --with-curses" or "--with-tui",
    $prefer_curses is set to yes.  But, that still doesn't mean that curses
    will be used.  configure will still search for the curses library, and
    continue building without it.  That's done here:
    
     curses_found=no
     if test x"$prefer_curses" = xyes; then
     ...
       AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses])
    
       if test "$ac_cv_search_waddstr" != no; then
         curses_found=yes
       fi
     fi
    
    So if waddstr is not found, meaning curses is not really
    available, even though it'd be preferred, $prefer_curses is
    'yes', but $curses_found is 'no'.
    
    So the right fix to tell whether we're linking with curses is
    $curses_found=yes.
    
    gdb/ChangeLog:
    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.

Diff:
---
 gdb/ChangeLog         | 8 ++++++++
 gdb/configure         | 2 +-
 gdb/configure.ac      | 2 +-
 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 */