--- configure.in
+++ configure.in	2012-06-26 17:32:44.272010723 +0000
@@ -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=
@@ -2855,7 +2855,7 @@ case "$opsys" in
     ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
     if test "x$HAVE_LIBNCURSES" = "xyes"; then
       TERMINFO=yes
-      LIBS_TERMCAP="-lncurses"
+      LIBS_TERMCAP="-ltinfo"
     fi
     ;;
 
--- src/config.in
+++ src/config.in	2011-11-22 14:34:49.000000000 +0000
@@ -450,6 +450,9 @@ along with GNU Emacs.  If not, see <http
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
 #undef HAVE_LIBNCURSES
 
+/* Define to 1 if you have the `tinfo' library (-ltinfo). */
+#undef HAVE_LIBTINFO
+
 /* Define to 1 if using libotf. */
 #undef HAVE_LIBOTF