summaryrefslogtreecommitdiff
path: root/gdb/configure.ac
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2017-09-26 16:23:19 +0100
committerPedro Alves <palves@redhat.com>2017-09-26 16:23:19 +0100
commit5007d765ae09c10c7f3b18bb16841b9d2d59e181 (patch)
treeb43b21ec5b4d3e5f8dc812c171c78c78bb61e83b /gdb/configure.ac
parent262c0a877f91b9102fd42523598b46ea79a8970e (diff)
Allow linking GDB with ncursesw
Triggered by https://launchpad.net/bugs/1275210, to be able to cope with UTF-8 characters in gdbtui. Reference: https://sourceware.org/ml/gdb-patches/2017-09/msg00356.html gdb/ChangeLog: 2017-09-26 Matthias Klose <doko@ubuntu.com> * configure.ac: Search ncursesw before ncurses. Check ncursesw/ncurses.h before ncurses/ncurses.h. * gdb_curses.h: Include <ncursesw/ncurses.h> * config.in, configure: Regenerate.
Diffstat (limited to 'gdb/configure.ac')
-rw-r--r--gdb/configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 2e4ccb6b1d..9dc4c77360 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -562,7 +562,7 @@ if test x"$prefer_curses" = xyes; then
# search /usr/local/include, if ncurses is installed in /usr/local. A
# default installation of ncurses on alpha*-dec-osf* will lead to such
# a situation.
- AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses])
+ AC_SEARCH_LIBS(waddstr, [ncursesw ncurses cursesX curses])
if test "$ac_cv_search_waddstr" != no; then
curses_found=yes
@@ -604,7 +604,7 @@ case $host_os in
esac
# These are the libraries checked by Readline.
-AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses])
+AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncursesw ncurses])
if test "$ac_cv_search_tgetent" = no; then
CONFIG_OBS="$CONFIG_OBS stub-termcap.o"
@@ -1301,7 +1301,7 @@ AC_CHECK_HEADERS(sys/user.h, [], [],
#endif
])
-AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h ncurses/term.h)
+AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncursesw/ncurses.h ncurses/ncurses.h ncurses/term.h)
AC_CHECK_HEADERS(term.h, [], [],
[#if HAVE_CURSES_H
# include <curses.h>