Re-apply the iconv patch from vvv.

diff --git a/configure.in b/configure.in
index 743b5b3f7dbab69b6e82fe6a47f85e153ee9247f..f816bafccee8c685aecbe7b528c03f782d39a608 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -400,7 +400,7 @@ AC_ARG_WITH(iconv, [  --with-iconv=DIR           Where libiconv is installed ],
        if test "$mutt_cv_iconv" != yes -a \
                "$mutt_cv_iconv" != no -a \
                "$mutt_cv_iconv" != /usr; then
-               CPPFLAGS="$CPPFLAGS -I${mutt_cv_iconv}/include"
+               CPPFLAGS="-I${mutt_cv_iconv}/include $CPPFLAGS"
                LDFLAGS="-L${mutt_cv_iconv}/lib $LDFLAGS"
        fi])