I asked about this when 1.3.25 came out and got the answer that
"this should be fixed" / "will be looking into it".  However, 1.3.28
still can't be configured without iconv.  Any chance for a change?

I've attached a patch that seems to work. It's a bit of hack, a
clean solution would be to have an iconv.h substitute that defines
the prototypes of the replacement functions which are in charset.c
and also defines iconv_t and EILSEQ. This would "localize" the
changes instead of spreading them out over many files.

diff -c -r mutt-1.3.28/charset.c mutt-1.3.28-/charset.c
*** mutt-1.3.28/charset.c       Tue Jan 22 17:02:39 2002
--- mutt-1.3.28-/charset.c      Sun Mar 17 15:53:57 2002
***************
*** 31,37 ****
--- 31,39 ----
  #include <unistd.h>
  #include <errno.h>
  
+ #ifdef HAVE_ICONV
  #include <iconv.h>
+ #endif
  
  #include "mutt.h"
  #include "charset.h"
diff -c -r mutt-1.3.28/charset.h mutt-1.3.28-/charset.h
*** mutt-1.3.28/charset.h       Tue Feb 13 14:06:14 2001
--- mutt-1.3.28-/charset.h      Sun Mar 17 15:46:58 2002
***************
*** 19,25 ****
--- 19,29 ----
  #ifndef _CHARSET_H
  #define _CHARSET_H
  
+ #if HAVE_ICONV
  #include <iconv.h>
+ #else
+ #define iconv_t int
+ #endif
  
  int mutt_convert_string (char **, const char *, const char *, int);
  
diff -c -r mutt-1.3.28/gnupgparse.c mutt-1.3.28-/gnupgparse.c
*** mutt-1.3.28/gnupgparse.c    Wed Aug  1 07:06:58 2001
--- mutt-1.3.28-/gnupgparse.c   Sun Mar 17 15:54:48 2002
***************
*** 44,50 ****
--- 44,52 ----
  #include "mutt.h"
  #include "pgp.h"
  #include "charset.h"
+ #ifdef HAVE_ICONV
  #include "iconv.h"
+ #endif
  
  /* for hexval */
  #include "mime.h"
diff -c -r mutt-1.3.28/rfc2047.c mutt-1.3.28-/rfc2047.c
*** mutt-1.3.28/rfc2047.c       Mon Oct 15 13:18:32 2001
--- mutt-1.3.28-/rfc2047.c      Sun Mar 17 15:50:10 2002
***************
*** 24,30 ****
--- 24,32 ----
  
  #include <ctype.h>
  #include <errno.h>
+ #if HAVE_ICONV
  #include <iconv.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
diff -c -r mutt-1.3.28/sendlib.c mutt-1.3.28-/sendlib.c
*** mutt-1.3.28/sendlib.c       Wed Nov  7 02:51:29 2001
--- mutt-1.3.28-/sendlib.c      Sun Mar 17 15:53:39 2002
***************
*** 649,654 ****
--- 649,657 ----
  }
  
  /* Define as 1 if iconv sometimes returns -1(EILSEQ) instead of transcribing. */
+ #ifndef EILSEQ
+ # define EILSEQ EINVAL
+ #endif
  #define BUGGY_ICONV 1
  
  /*

Reply via email to