[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/18a3528f661d
changeset:   77875:18a3528f661d
parent:      77874:b299b4279e13
parent:      77872:57f40cd6b33d
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Jun 30 17:33:13 2012 +0200
summary:
  Merge

files:
  configure    |  2 +-
  configure.ac |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -13557,7 +13557,7 @@
 py_cv_lib_readline=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline libs" >&5
 $as_echo_n "checking how to link readline libs... " >&6; }
-for py_libtermcap in "" ncursesw ncurses curses termcap; do
+for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
   if test -z "$py_libtermcap"; then
     READLINE_LIBS="-lreadline"
   else
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3904,7 +3904,7 @@
 # with setup.py.
 py_cv_lib_readline=no
 AC_MSG_CHECKING([how to link readline libs])
-for py_libtermcap in "" ncursesw ncurses curses termcap; do
+for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
   if test -z "$py_libtermcap"; then
     READLINE_LIBS="-lreadline"
   else

-- 
Repository URL: http://hg.python.org/cpython