From 63413d85873c450fa4ed2494f21fb1a65bdaf554 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 19 Jan 2015 16:34:29 +0100 Subject: Don't use windows-termcap.c when linking against a curses library gdb/ 2015-01-17 Eli Zaretskii * 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. --- gdb/configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gdb/configure') diff --git a/gdb/configure b/gdb/configure index f62d5a0..fb2480c 100755 --- a/gdb/configure +++ b/gdb/configure @@ -7188,9 +7188,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. -- cgit v1.1