--- mutt-1.4/m4/iconv.m4.orig	2002-04-21 01:40:52 +0400
+++ mutt-1.4/m4/iconv.m4	2002-10-31 16:14:17 +0300
@@ -11,8 +11,10 @@
 [  --with-iconv[=DIR]  search for libiconv in DIR/include and DIR/lib], [
     if test "$withval" != no ; then
     for dir in `echo "$withval" | tr : ' '`; do
+      if x$dir != x/usr; then 
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+      fi
     done
     else
       use_iconv=no
--- mutt-1.4/Makefile.am.orig	2002-10-31 17:03:38 +0300
+++ mutt-1.4/Makefile.am	2002-10-31 17:07:08 +0300
@@ -55,7 +55,7 @@
 
 INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
 
-CPPFLAGS=@CPPFLAGS@ -I$(includedir)
+CPPFLAGS=@CPPFLAGS@
 
 non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c \
 	pgpmicalg.c gnupgparse.c sha1.h \