From f4f14ccbde58261c031c33636be38cca21b269a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Wed, 6 Oct 2010 18:22:39 +0000
Subject: [PATCH] - as-needed tinfo

Changed files:
    mutt-ac.patch -> 1.1
    mutt.spec -> 1.232
---
 mutt-ac.patch | 19 +++++++++++++++++++
 mutt.spec     |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 mutt-ac.patch

diff --git a/mutt-ac.patch b/mutt-ac.patch
new file mode 100644
index 0000000..9520b18
--- /dev/null
+++ b/mutt-ac.patch
@@ -0,0 +1,19 @@
+--- mutt-1.5.21/configure.ac~	2010-10-06 19:50:24.570430998 +0200
++++ mutt-1.5.21/configure.ac	2010-10-06 20:17:25.192640340 +0200
+@@ -270,12 +270,13 @@
+ 
+ 	AC_CHECK_FUNC(initscr,,[
+ 	cf_ncurses="ncurses"
+-	for lib in ncurses ncursesw
++	cf_tinfo="tinfo"
++	for lib in "" w
+ 	do
+-		AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
++		AC_CHECK_LIB(ncurses$lib, waddnwstr, [cf_ncurses="ncurses$lib"; cf_tinfo="tinfo$lib"; break])
+ 	done
+         AC_CHECK_LIB($cf_ncurses, initscr,
+-                [MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
++                [MUTTLIBS="$MUTTLIBS -l$cf_ncurses -l$cf_tinfo"
+ 		
+                 if test "$cf_ncurses" = ncursesw; then
+ 			AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
diff --git a/mutt.spec b/mutt.spec
index 1fc3833..988625b 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -57,6 +57,7 @@ Patch18:	%{name}-folder_columns.patch
 Patch19:	%{name}-imap_recent.patch
 Patch20:	%{name}-Muttrc.head.patch
 Patch21:	%{name}-smime.rc.patch
+Patch22:	%{name}-ac.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -162,6 +163,7 @@ Mutt - це невеликий, але потужний повноекранни
 %{?with_imap_recent:%patch19 -p1}
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
-- 
2.44.0