X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=8076e94a5e90ee434ce421a105367c5943052662;hp=f050da72cb916d72eb9f5bd9ee587dbd90be5dc3;hb=785bb3cb4dd83ec1071998a64af74e333d076347;hpb=262e2af383382c02b8a3dda72168f6505ddae15f

diff --git a/configure.ac b/configure.ac
index f050da7..8076e94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,7 +442,6 @@ 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,
@@ -450,37 +449,6 @@ else
                  AC_DEFINE(HAVE_ICONV_T_DEF, 1,
                         [Define if <iconv.h> defines iconv_t.])],
                  AC_MSG_RESULT(no))])
-
-    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).
-    AC_CACHE_CHECK([whether this iconv is good enough], mutt_cv_iconv_good,
-                   LIBS="$LIBICONV"
-                   AC_TRY_RUN([
-#include <iconv.h>
-int main()
-{
-  iconv_t cd;
-changequote(, )dnl
-  char buf[4];
-changequote([, ])dnl
-  char *ob;
-  size_t obl;
-  ob = buf, obl = sizeof(buf);
-  return ((cd = iconv_open("UTF-8", "UTF-8")) != (iconv_t)(-1) &&
-          (iconv(cd, 0, 0, &ob, &obl) ||
-           !(ob == buf && obl == sizeof(buf)) ||
-           iconv_close(cd)));
-}
-                   ],
-                   mutt_cv_iconv_good=yes,
-                   mutt_cv_iconv_good=no,
-                   mutt_cv_iconv_good=yes)
-                   LIBS="")
-    if test "$mutt_cv_iconv_good" = no; then
-        AC_MSG_ERROR(Try using libiconv instead)
-    fi
-
 fi # libiconv
 
 dnl -- locales --
@@ -549,7 +517,6 @@ AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
 AC_OUTPUT(Makefile
           intl/Makefile
-          m4/Makefile
           po/Makefile.in
           apidoc/Makefile apidoc/doxygen.cfg
           lib-lib/Makefile
@@ -559,6 +526,5 @@ AC_OUTPUT(Makefile
           lib-sys/Makefile
           lib-ui/Makefile
           imap/Makefile
-          pop/Makefile
           nntp/Makefile
 )