Thomas Roessler writes: > Mutt-1.4 has been released. You can download it from the following > location: <ftp://ftp.mutt.org/pub/mutt/>. > - Mutt now uses the iconv interface for character set conversions. > This means that you need either a very modern libc, or Bruno > Haible's libiconv, which is available from > <http://www.gnu.org/software/libiconv/>. Here is my patch for configuring mutt without iconv, which unfortunately didn't make it into 1.4. It features
o --disable-iconv configure option o correction of INSTALL instructions The patch does not include auto* generated files. To use it, you will have to have GNU autoconf and GNU automake installed. I am not subscribed to mutt-users. If you have any problems with this patch, search the mutt-dev list archives, and post to mutt-dev (in this order).
diff -ur mutt-1.4.orig/INSTALL mutt-1.4/INSTALL
--- mutt-1.4.orig/INSTALL 2002-04-20 22:40:52.000000000 +0100
+++ mutt-1.4/INSTALL 2002-05-29 14:01:17.509294748 +0100
@@ -237,7 +237,7 @@
/usr/local/etc.
-If you really want to, you can configure Mutt --without-iconv, but
+If you really want to, you can configure Mutt --disable-iconv, but
there will then be no character set conversion.
diff -ur mutt-1.4.orig/PATCHES mutt-1.4/PATCHES
--- mutt-1.4.orig/PATCHES 2002-04-02 19:48:57.000000000 +0100
+++ mutt-1.4/PATCHES 2002-05-29 14:11:36.235171096 +0100
@@ -0,0 +1 @@
+patch-1.4.lh.noiconv.1
diff -ur mutt-1.4.orig/charset.h mutt-1.4/charset.h
--- mutt-1.4.orig/charset.h 2002-04-20 08:25:49.000000000 +0100
+++ mutt-1.4/charset.h 2002-05-29 14:01:17.509294748 +0100
@@ -28,8 +28,9 @@
#endif
#ifndef HAVE_ICONV
+#define ICONV_CONST /**/
iconv_t iconv_open (const char *, const char *);
-size_t iconv (iconv_t, const char **, size_t *, char **, size_t *);
+size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
int iconv_close (iconv_t);
#endif
diff -ur mutt-1.4.orig/configure.in mutt-1.4/configure.in
--- mutt-1.4.orig/configure.in 2002-05-29 10:29:26.000000000 +0100
+++ mutt-1.4/configure.in 2002-05-29 14:01:17.519297335 +0100
@@ -665,7 +665,19 @@
dnl -- iconv/gettext --
+AC_ARG_ENABLE(iconv, [ --disable-iconv Disable iconv support],
+[ if test x$enableval = xno ; then
+ am_cv_func_iconv=no
+ fi
+])
+
MUTT_AM_GNU_GETTEXT
+
+if test "$am_cv_func_iconv" != "yes"
+then
+ AC_MSG_WARN([Configuring without iconv support. See INSTALL for details])
+else
+
AC_CHECK_HEADERS(iconv.h,
[AC_MSG_CHECKING(whether iconv.h defines iconv_t)
AC_EGREP_HEADER([typedef.*iconv_t],iconv.h,
@@ -674,12 +686,6 @@
[Define if <iconv.h> defines iconv_t.])],
AC_MSG_RESULT(no))])
-if test "$am_cv_func_iconv" != "yes"
-then
-# AC_MSG_ERROR([Unable to find an iconv function. See INSTALL for help])
- AC_MSG_WARN([Unable to find an iconv function. See INSTALL for help])
-else
-
dnl (1) Some implementations of iconv won't convert from UTF-8 to UTF-8.
dnl (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and
dnl obl when args 2 and 3 are 0 (fixed in glibc-2.1.3).
diff -ur mutt-1.4.orig/m4/iconv.m4 mutt-1.4/m4/iconv.m4
--- mutt-1.4.orig/m4/iconv.m4 2002-04-20 22:40:52.000000000 +0100
+++ mutt-1.4/m4/iconv.m4 2002-05-29 14:01:23.299261521 +0100
@@ -7,19 +7,14 @@
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
- AC_ARG_WITH([iconv],
-[ --with-iconv[=DIR] search for libiconv in DIR/include and DIR/lib], [
- if test "$withval" != no ; then
+ AC_ARG_WITH([libiconv-prefix],
+[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
done
- else
- use_iconv=no
- fi
- ],use_iconv=yes)
+ ])
- if test "$use_iconv" = yes ; then
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
@@ -71,6 +66,4 @@
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
-
- fi # use_iconv
])
msg28368/pgp00000.pgp
Description: PGP signature
