diff options
author | Eli Zaretskii <eliz@gnu.org> | 2015-01-19 16:34:29 +0100 |
---|---|---|
committer | Joel Brobecker <brobecker@adacore.com> | 2015-01-19 16:35:11 +0100 |
commit | 63413d85873c450fa4ed2494f21fb1a65bdaf554 (patch) | |
tree | 53d1be7fc9e9447ab0575c712babb896ce4f6c21 /gdb/configure.ac | |
parent | 1f99f6d0689d20db44c0c7d88e8af1ebe900d187 (diff) | |
download | gdb-63413d85873c450fa4ed2494f21fb1a65bdaf554.zip gdb-63413d85873c450fa4ed2494f21fb1a65bdaf554.tar.gz gdb-63413d85873c450fa4ed2494f21fb1a65bdaf554.tar.bz2 |
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.
Diffstat (limited to 'gdb/configure.ac')
-rw-r--r-- | gdb/configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdb/configure.ac b/gdb/configure.ac index 8dd7f8f..36a74d2 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -611,9 +611,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. |