Index: INSTALL
===================================================================
RCS file: /home/roessler/cvs/mutt/INSTALL,v
retrieving revision 2.15.2.3
diff -u -r2.15.2.3 INSTALL
--- INSTALL	20 Apr 2002 21:38:41 -0000	2.15.2.3
+++ INSTALL	23 Apr 2002 13:06:35 -0000
@@ -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.
 
 
Index: charset.h
===================================================================
RCS file: /home/roessler/cvs/mutt/charset.h,v
retrieving revision 2.19.2.4
diff -u -r2.19.2.4 charset.h
--- charset.h	20 Apr 2002 07:26:09 -0000	2.19.2.4
+++ charset.h	23 Apr 2002 13:06:35 -0000
@@ -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
 
Index: configure.in
===================================================================
RCS file: /home/roessler/cvs/mutt/configure.in,v
retrieving revision 2.129.2.7
diff -u -r2.129.2.7 configure.in
--- configure.in	20 Apr 2002 21:38:41 -0000	2.129.2.7
+++ configure.in	23 Apr 2002 13:06:35 -0000
@@ -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,
@@ -673,12 +685,6 @@
                  AC_DEFINE(HAVE_ICONV_T_DEF, 1,
                         [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
Index: m4/iconv.m4
===================================================================
RCS file: /home/roessler/cvs/mutt/m4/iconv.m4,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 iconv.m4
--- m4/iconv.m4	20 Apr 2002 21:38:47 -0000	1.3.2.4
+++ m4/iconv.m4	23 Apr 2002 13:06:35 -0000
@@ -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
 ])