X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=0cb3f9f93b4f9e5ad7df404f395e755de9818704;hp=2a615d1e0b3a535230c30ac44a36b1a145f25c2e;hb=10e80e482eff3762b0b8d41b0c7795b76704479c;hpb=c8102caaf1221828c06752f9ac69271fb999c145

diff --git a/configure.ac b/configure.ac
index 2a615d1..0cb3f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,18 +701,18 @@ changequote([, ])dnl
                 mutt_cv_iconv_nontrans=no)
         LIBS="$mutt_save_LIBS")
 if test "$mutt_cv_iconv_nontrans" = yes; then
-  AC_DEFINE(ICONV_NONTRANS, 1)
+    AC_DEFINE(ICONV_NONTRANS, 1)
 else
-  AC_DEFINE(ICONV_NONTRANS, 0)
+    AC_DEFINE(ICONV_NONTRANS, 0)
 fi
 
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
 
 if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then
-  AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET,1,
-          [ Define if your gettext has bind_textdomain_codeset. ])
+    AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET,1,
+              [ Define if your gettext has bind_textdomain_codeset. ])
 else
-  AC_CHECK_FUNCS(bind_textdomain_codeset)
+    AC_CHECK_FUNCS(bind_textdomain_codeset)
 fi
 
 fi # libiconv
@@ -720,86 +720,11 @@ fi # libiconv
 dnl -- locales --
 
 AC_CHECK_HEADERS(wchar.h)
-
-AC_CACHE_CHECK([for wchar_t], mutt_cv_wchar_t,
-        AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#ifdef HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-                ],
-                [ wchar_t wc; return 0; ],
-                mutt_cv_wchar_t=yes,
-                mutt_cv_wchar_t=no))
-
-if test "$mutt_cv_wchar_t" = no; then
-        AC_DEFINE(wchar_t,int,[ Define to 'int' if system headers don't define. ])
-fi
-
-AC_CACHE_CHECK([for wint_t], mutt_cv_wint_t,
-        AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#ifdef HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-                ],
-                [ wint_t wc; return 0; ],
-                mutt_cv_wint_t=yes,
-                mutt_cv_wint_t=no))
-
-if test "$mutt_cv_wint_t" = no; then
-        AC_DEFINE(wint_t,int,[ Define to 'int' if system headers don't define. ])
-fi
-
 AC_CHECK_HEADERS(wctype.h)
 AC_CHECK_FUNCS(iswalnum iswalpha  iswcntrl iswdigit)
 AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
 AC_CHECK_FUNCS(iswxdigit towupper towlower)
-
-AC_CACHE_CHECK([for mbstate_t], mutt_cv_mbstate_t,
-        AC_TRY_COMPILE([
-#include <stddef.h>
-#include <stdlib.h>
-#ifdef HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-                ],
-                [ mbstate_t s; return 0; ],
-                mutt_cv_mbstate_t=yes,
-                mutt_cv_mbstate_t=no))
-
-if test "$mutt_cv_mbstate_t" = no; then
-        AC_DEFINE(mbstate_t,int,[ Define to 'int' if system headers don't define. ])
-fi
-
-wc_funcs=maybe
-AC_ARG_WITH(wc-funcs, AC_HELP_STRING([--without-wc-funcs], [Do not use the system's wchar_t functions]),
-        wc_funcs=$withval)
-
-if test "$wc_funcs" != yes -a "$wc_funcs" != no; then
-        AC_CACHE_CHECK([for wchar_t functions], mutt_cv_wc_funcs,
-                mutt_cv_wc_funcs=no
-                AC_TRY_LINK([
-#define _XOPEN_SOURCE 1
-#include <stddef.h>
-#include <stdlib.h>
-#ifdef HAVE_WCTYPE_H
-#include <wctype.h>
-#endif
-#ifdef HAVE_WCHAR_H
-#include <wchar.h>
-#endif],
-                        [mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0);
-        iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)],
-                        mutt_cv_wc_funcs=yes))
-        wc_funcs=$mutt_cv_wc_funcs
-fi
-
-if test $wc_funcs = yes; then
-        AC_DEFINE(HAVE_WC_FUNCS,1,[ Define if you are using the system's wchar_t functions. ])
-fi
+AC_TYPE_MBSTATE_T
 
 AC_CACHE_CHECK([for nl_langinfo and CODESET], mutt_cv_langinfo_codeset,
   [AC_TRY_LINK([#include <langinfo.h>],