c296a6a
Fedora: Force libncursesw over libncurses to match the includes.
c296a6a
https://bugzilla.redhat.com/show_bug.cgi?id=1270534
c296a6a
c296a6a
diff -dup -rup gdb-7.10.50.20151113-orig/gdb/configure gdb-7.10.50.20151113/gdb/configure
c296a6a
--- gdb-7.10.50.20151113-orig/gdb/configure	2015-11-14 16:14:04.404118312 +0100
c296a6a
+++ gdb-7.10.50.20151113/gdb/configure	2015-11-14 16:17:59.074566047 +0100
c296a6a
@@ -8463,6 +8463,7 @@ if test x"$prefer_curses" = xyes; then
c296a6a
   # search /usr/local/include, if ncurses is installed in /usr/local.  A
c296a6a
   # default installation of ncurses on alpha*-dec-osf* will lead to such
c296a6a
   # a situation.
c296a6a
+  # Fedora: Force libncursesw over libncurses to match the includes.
c296a6a
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
c296a6a
 $as_echo_n "checking for library containing waddstr... " >&6; }
c296a6a
 if test "${ac_cv_search_waddstr+set}" = set; then :
c296a6a
@@ -8487,7 +8488,7 @@ return waddstr ();
c296a6a
   return 0;
c296a6a
 }
c296a6a
 _ACEOF
c296a6a
-for ac_lib in '' ncurses cursesX curses; do
c296a6a
+for ac_lib in '' ncursesw; do
c296a6a
   if test -z "$ac_lib"; then
c296a6a
     ac_res="none required"
c296a6a
   else
c296a6a
@@ -8561,6 +8562,7 @@ case $host_os in
c296a6a
 esac
c296a6a
 
c296a6a
 # These are the libraries checked by Readline.
c296a6a
+# Fedora: Force libncursesw over libncurses to match the includes.
c296a6a
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
c296a6a
 $as_echo_n "checking for library containing tgetent... " >&6; }
c296a6a
 if test "${ac_cv_search_tgetent+set}" = set; then :
c296a6a
@@ -8585,7 +8587,7 @@ return tgetent ();
c296a6a
   return 0;
c296a6a
 }
c296a6a
 _ACEOF
c296a6a
-for ac_lib in '' termcap tinfo curses ncurses; do
c296a6a
+for ac_lib in '' termcap tinfo ncursesw; do
c296a6a
   if test -z "$ac_lib"; then
c296a6a
     ac_res="none required"
c296a6a
   else
c296a6a
diff -dup -rup gdb-7.10.50.20151113-orig/gdb/configure.ac gdb-7.10.50.20151113/gdb/configure.ac
c296a6a
--- gdb-7.10.50.20151113-orig/gdb/configure.ac	2015-11-14 16:14:04.404118312 +0100
c296a6a
+++ gdb-7.10.50.20151113/gdb/configure.ac	2015-11-14 16:17:54.898540284 +0100
c296a6a
@@ -771,7 +771,8 @@ if test x"$prefer_curses" = xyes; then
c296a6a
   # search /usr/local/include, if ncurses is installed in /usr/local.  A
c296a6a
   # default installation of ncurses on alpha*-dec-osf* will lead to such
c296a6a
   # a situation.
c296a6a
-  AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses])
c296a6a
+  # Fedora: Force libncursesw over libncurses to match the includes.
c296a6a
+  AC_SEARCH_LIBS(waddstr, [ncursesw])
c296a6a
 
c296a6a
   if test "$ac_cv_search_waddstr" != no; then
c296a6a
     curses_found=yes
c296a6a
@@ -813,7 +814,8 @@ case $host_os in
c296a6a
 esac
c296a6a
 
c296a6a
 # These are the libraries checked by Readline.
c296a6a
-AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses])
c296a6a
+# Fedora: Force libncursesw over libncurses to match the includes.
c296a6a
+AC_SEARCH_LIBS(tgetent, [termcap tinfo ncursesw])
c296a6a
 
c296a6a
 if test "$ac_cv_search_tgetent" = no; then
c296a6a
   CONFIG_OBS="$CONFIG_OBS stub-termcap.o"