--- configure
+++ configure
@@ -14294,7 +14294,7 @@ $as_echo_n "checking for library containing tputs... " >&6; }
 
 # Maybe curses should be tried earlier?
 # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
-for tputs_library in '' ncurses terminfo termcap curses; do
+for tputs_library in '' tinfo ncurses terminfo termcap curses; do
   OLIBS=$LIBS
   if test -z "$tputs_library"; then
     LIBS_TERMCAP=
@@ -14386,7 +14386,7 @@ case "$opsys" in
   ##  option to use it.
   darwin|gnu*)
     ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
-    if test "x$HAVE_LIBNCURSES" = "xyes"; then
+    if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
       TERMINFO=yes
       LIBS_TERMCAP="-lncurses"
     fi
--- configure.in
+++ configure.in
@@ -2803,7 +2803,7 @@ AC_DEFUN([tputs_link_source], [
 ])
 # Maybe curses should be tried earlier?
 # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
-for tputs_library in '' ncurses terminfo termcap curses; do
+for tputs_library in '' tinfo ncurses ncursesw terminfo termcap curses; do
   OLIBS=$LIBS
   if test -z "$tputs_library"; then
     LIBS_TERMCAP=
@@ -2853,7 +2853,7 @@ case "$opsys" in
   ##  option to use it.
   darwin|gnu*)
     ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
-    if test "x$HAVE_LIBNCURSES" = "xyes"; then
+    if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
       TERMINFO=yes
       LIBS_TERMCAP="-lncurses"
     fi