Blame SOURCES/gdb-fedora-libncursesw.patch

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