Iconv patch from Lars Hecking. MAY NEED TO BE BACKPORTED.

diff --git a/charset.c b/charset.c
index 4b9272eae3f2239a84412bd1d8e1fb092ca1b961..b347773eb78a4cddfaebac6f5f5c099a6008246e 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -31,8 +31,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <iconv.h>
-
 #include "mutt.h"
 #include "charset.h"
 

diff --git a/gnupgparse.c b/gnupgparse.c
index 8b7bf4c3011f9987d81b9ac2ae6d3172012ef595..bf0e2e60212399906777b703e5ac7d8d6c9e25ed 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -44,7 +44,6 @@
 #include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
-#include "iconv.h"
 
 /* for hexval */
 #include "mime.h"

diff --git a/init.h b/init.h
index e4f8560513f689b612ccf82435c5aa12015f697d..fa1f65135362e9b874d2c158ad39a330469fac59 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2637,7 +2637,9 @@ struct command_t Commands[] = {
   { "fcc-save-hook",   mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
   { "folder-hook",     mutt_parse_hook,        M_FOLDERHOOK },
   { "hdr_order",       parse_list,             UL &HeaderOrderList },
+#ifdef HAVE_ICONV
   { "iconv-hook",      mutt_parse_hook,        M_ICONVHOOK }, 
+#endif
   { "ignore",          parse_ignore,           0 },
   { "lists",           parse_list,             UL &MailLists },
   { "macro",           mutt_parse_macro,       0 },

diff --git a/rfc2047.c b/rfc2047.c
index f706bafa84d1a573d0e107b09665bb4e2f29c581..f988c85d16c8f94caeb7c2180315ca464fbba220 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -24,7 +24,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <iconv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>