Don't use windows-termcap.c when linking against a curses library

gdb/
2015-01-17  Eli Zaretskii  <eliz@gnu.org>

        * configure.ac [*mingw32*]: Only add windows-termcap.o to
        CONFIG_OBS if not building with a curses library.
        * configure: Regenerate.

        * windows-termcap.c: Include defs.h.  Make the whole body empty if
        either one of HAVE_CURSES_H or HAVE_NCURSES_H or
        HAVE_NCURSES_NCURSES_H is defined.

(cherry picked from commit 63413d85873c450fa4ed2494f21fb1a65bdaf554)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 721076c1f13129daeb64f9621bdd301962a0de38..6eb4e7ab3c2af7e13ae715e464ce6d4c1d32e85a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.ac [*mingw32*]: Only add windows-termcap.o to
+       CONFIG_OBS if not building with a curses library.
+       * configure: Regenerate.
+
+       * windows-termcap.c: Include defs.h.  Make the whole body empty if
+       either one of HAVE_CURSES_H or HAVE_NCURSES_H or
+       HAVE_NCURSES_NCURSES_H is defined.
+
 2015-01-16  Eli Zaretskii  <eliz@gnu.org>
 
        * tui/tui-win.c (tui_rehighlight_all, tui_set_var_cmd): New

diff --git a/gdb/configure b/gdb/configure
index 7ff74badbf7ceaeec6320a3739c25d9e86cb0eb9..0c3a19a3e6b78369fc3cc94e99721ef99c7e2dbc 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -7184,9 +7184,10 @@ case $host_os in
     ac_cv_search_tgetent="none required"
     ;;
   *mingw32*)
-    ac_cv_search_tgetent="none required"
-    CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
-    ;;
+    if test x"$prefer_curses" != xyes; then
+      ac_cv_search_tgetent="none required"
+      CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
+    fi ;;
 esac
 
 # These are the libraries checked by Readline.

diff --git a/gdb/configure.ac b/gdb/configure.ac
index ec776d71e87e458dcdb4bc03bb56bc3725a2a207..6a276f0d1c22ff6067b2a26dfe6cd1c839e44756 100644 (file)
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -607,9 +607,10 @@ case $host_os in
     ac_cv_search_tgetent="none required"
     ;;
   *mingw32*)
-    ac_cv_search_tgetent="none required"
-    CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
-    ;;
+    if test x"$prefer_curses" != xyes; then
+      ac_cv_search_tgetent="none required"
+      CONFIG_OBS="$CONFIG_OBS windows-termcap.o"
+    fi ;;
 esac
 
 # These are the libraries checked by Readline.

diff --git a/gdb/windows-termcap.c b/gdb/windows-termcap.c
index 026c3d2311951780f9b7537f2c9b82504a38bf02..01540833bc525b7d3d7eeffc2b1be526b639b2be 100644 (file)
--- a/gdb/windows-termcap.c
+++ b/gdb/windows-termcap.c
@@ -19,6 +19,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+
+#include "defs.h"
+
+#if !defined HAVE_CURSES_H && !defined HAVE_NCURSES_H && !defined HAVE_NCURSES_NCURSES_H
+
 #include <stdlib.h>
 
 /* -Wmissing-prototypes */
@@ -71,3 +76,5 @@ tgoto (const char *cap, int col, int row)
 {
   return NULL;
 }
+
+#endif /* !HAVE_CURSES_H && !HAVE_NCURSES_H && !HAVE_NCURSES_NCURSES_H */