Fix a bunch of warnings in imap code
[apps/madmutt.git] / configure.ac
index 2f71dfd..0cb3f9f 100644 (file)
@@ -6,10 +6,8 @@ dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED            !!!
 AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(madmutt, `cat "$srcdir/VERSION.in"`)
 
-mutt_cv_version=`cat "$srcdir/VERSION.in"`
-
-AM_INIT_AUTOMAKE(madmutt, $mutt_cv_version)
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
 
 AC_GNU_SOURCE
@@ -26,13 +24,18 @@ else
 fi
 AC_MSG_RESULT($mutt_cv_prefix)
 
-AC_PROG_CC
-AC_ISC_POSIX
+AC_PROG_CPP
+AC_PROG_CC_C99
+
 AM_C_PROTOTYPES
+AC_C_INLINE
+AC_C_CONST
 if test "x$U" != "x"; then
     AC_MSG_ERROR(Compiler not ANSI compliant)
 fi
-AC_PROG_CPP
+AC_ISC_POSIX
+AC_HEADER_STDC
+
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
@@ -40,29 +43,10 @@ AC_PROG_GPERF
 PKG_PROG_PKG_CONFIG
 AC_CHECK_TOOL(AR, ar, ar)
 
-AC_C_INLINE
-AC_C_CONST
-
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_SIZEOF(off_t)
 
-AC_PATH_PROG(DBX, dbx, no)
-AC_PATH_PROG(GDB, gdb, no)
-AC_PATH_PROG(SDB, sdb, no)
-
-if test $GDB != no ; then
-    DEBUGGER=$GDB
-elif test $DBX != no ; then
-    DEBUGGER=$DBX
-elif test $SDB != no ; then
-    DEBUGGER=$SDB
-else
-    DEBUGGER=no
-fi
-
-AC_SUBST([DEBUGGER])
-
 AH_TEMPLATE([sig_atomic_t],
             [Define to 'int' if <signal.h> doesn't define.])
 AH_TEMPLATE([HAVE_START_COLOR],
@@ -95,35 +79,29 @@ ac_aux_path_sendmail=/usr/sbin:/usr/lib
 AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail)
 AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ])
 
-
 OPS='$(srcdir)/OPS'
 
 dnl ---------------- gpgme ----------------
 
-    AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),
-    [   if test x$enableval = xyes; then
-            have_gpgme=yes
-        fi
-    ])
-    if test x$have_gpgme = xyes; then
+AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[
+    if test x$enableval = xyes; then
         AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
         MUTTLIBS="$MUTTLIBS $GPGME_LIBS"
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
         AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
+        AM_CONDITIONAL(BUILD_GPGME, true)
+    else
+        AM_CONDITIONAL(BUILD_GPGME, false)
     fi
+])
 
 dnl ---------------- mixmaster ----------------
 
-    AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
-    [  if test -x "$withval" ; then
-            MIXMASTER="$withval"
-        else
-            MIXMASTER="mixmaster"
-        fi
-        OPS="$OPS \$(srcdir)/OPS.MIX"
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o"
-        AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER", [ Where to find mixmaster on your system. ])
-    ])
+AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), [
+    MIXMASTER=${withval:-"mixmaster"}
+    OPS="$OPS \$(srcdir)/OPS.MIX"
+    MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o"
+    AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER",[Where to find mixmaster on your system.])
+])
 
 # We now require all OPS
 OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "
@@ -131,7 +109,7 @@ AC_SUBST([OPS])
 
 AC_PATH_PROG(ISPELL, ispell, no)
 if test $ISPELL != no; then
-    AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ])
+    AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[Where to find ispell on your system.])
 fi
 
 AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]),
@@ -187,61 +165,54 @@ main ()
         fi
         AC_DEFINE(USE_SLANG_CURSES,1, [ Define if you compile with SLang instead of curses/ncurses. ])
         AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o"
 
         dnl --- now that we've found it, check the link
 
         AC_CHECK_LIB(slang, SLtt_get_terminfo,
             [MUTTLIBS="$MUTTLIBS -lslang -lm"],
             [AC_MSG_ERROR(unable to compile.  check config.log)], -lm)
-        ],
+    ],
+    [   mutt_cv_curses=/usr
+        AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), [
+            if test $withval != yes; then
+                mutt_cv_curses=$withval
+            fi
+            if test x$mutt_cv_curses != x/usr; then
+                LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS"
+                CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
+            fi
+        ])
 
-        [   mutt_cv_curses=/usr
-            AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]),
-            [   if test $withval != yes; then
-                    mutt_cv_curses=$withval
-                fi
-                if test x$mutt_cv_curses != x/usr; then
-                    LDFLAGS="-L${mutt_cv_curses}/lib $LDFLAGS"
-                    CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
+        AC_CHECK_FUNC(initscr,,[
+        cf_ncurses="ncurses"
+        for lib in ncursesw ncurses; do
+            AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
+        done
+        AC_CHECK_LIB($cf_ncurses, initscr,
+            [   MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
+                if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then
+                    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
                 fi
-            ])
 
-            AC_CHECK_FUNC(initscr,,[
-            cf_ncurses="ncurses"
-            for lib in ncursesw ncurses; do
-                AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
-            done
-            AC_CHECK_LIB($cf_ncurses, initscr,
-                [   MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
-                    if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then
-                        CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
-                    fi
-
-                    if test "$cf_ncurses" = ncursesw; then
-                        AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"])
-                        AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
-                    else
-                        AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
-                    fi
-                ],
-                [CF_CURSES_LIBS])
-            ])
-
-            old_LIBS="$LIBS"
-            LIBS="$LIBS $MUTTLIBS"
-            CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
-                               [start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])
-            if test "$ac_cv_func_decl_start_color" = yes; then
-                AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
-            fi
-            if test "$ac_cv_func_decl_resizeterm" = yes; then
-                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o"
-            fi
-            LIBS="$old_LIBS"
+                if test "$cf_ncurses" = ncursesw; then
+                    AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"])
+                    AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
+                else
+                    AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
+                fi
+            ],
+            [CF_CURSES_LIBS])
         ])
 
-AC_HEADER_STDC
+        old_LIBS="$LIBS"
+        LIBS="$LIBS $MUTTLIBS"
+        CF_CHECK_FUNCDECLS([#include <${cf_cv_ncurses_header-curses.h}>],
+                           [start_color typeahead bkgdset curs_set meta use_default_colors resizeterm])
+        if test "$ac_cv_func_decl_start_color" = yes; then
+            AC_DEFINE(HAVE_COLOR,1,[ Define if your curses library supports color. ])
+        fi
+        LIBS="$old_LIBS"
+    ])
 
 AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h)
 AC_CHECK_HEADERS(sys/time.h sys/resource.h)
@@ -283,30 +254,11 @@ if test $ac_cv_func_getopt = yes; then
     AC_CHECK_HEADERS(getopt.h)
 fi
 
-AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]),
-        [mutt_cv_regex=yes],
-        [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
-
-if test $mutt_cv_regex = no ; then
-    AC_CACHE_CHECK([whether your system's regexp library is completely broken],
-        [mutt_cv_regex_broken],
-        AC_TRY_RUN([
-#include <unistd.h>
-#include <regex.h>
-main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
-        mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes))
-    if test $mutt_cv_regex_broken = yes ; then
-        echo "Using the included GNU regex instead." >&AC_FD_MSG
-        mutt_cv_regex=yes
-    fi
-fi
-
-if test $mutt_cv_regex = yes; then
-    AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
-    LIBOBJS="$LIBOBJS regex.o"
+AC_CHECK_FUNC(regcomp)
+if test $ac_cv_func_regcomp = yes; then
+   AC_CHECK_HEADERS(regex.h)
 fi
 
-
 AC_ARG_WITH(homespool,
             AC_HELP_STRING([--with-homespool[=FILE]],
                            [File in user's directory where new mail is spooled]),
@@ -360,7 +312,6 @@ int main (int argc, char **argv)
         if test $mutt_cv_worldwrite = yes; then
                 AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
         else
-
                 AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/stat.h>
 
@@ -402,8 +353,8 @@ AC_SUBST(DOTLOCK_PERMISSION)
 
 dnl -- socket dependencies --
 
-AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
-[   if test x$enableval = xyes ; then
+AC_ARG_ENABLE(nntp, AC_HELP_STRING([--enable-nntp],[Enable NNTP support]),[
+    if test x$enableval = xyes ; then
         AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ])
         LIBNNTP="-Lnntp -lnntp"
         LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a"
@@ -450,95 +401,75 @@ AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
 dnl -- end imap dependencies --
 
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]),
-[       if test "$with_ssl" != "no"
-        then
-          if test "$with_ssl" != "yes"
-          then
-           LDFLAGS="$LDFLAGS -L$withval/lib"
-           CPPFLAGS="$CPPFLAGS -I$withval/include"
-          fi
-          saved_LIBS="$LIBS"
-
-          AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library]))
-          AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto)
+[   if test "$with_ssl" != "no"; then
+        if test "$with_ssl" != "yes"; then
+            LDFLAGS="$LDFLAGS -L$withval/lib"
+            CPPFLAGS="$CPPFLAGS -I$withval/include"
+        fi
+        saved_LIBS="$LIBS"
 
-          AC_CHECK_FUNCS(RAND_status RAND_egd)
+        AC_CHECK_LIB(crypto, X509_new,, AC_MSG_ERROR([Unable to find SSL library]))
+        AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), -lcrypto)
 
-          AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
-          LIBS="$saved_LIBS"
-          MUTTLIBS="$MUTTLIBS -lssl -lcrypto"
-          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o"
-          need_ssl=yes
+        AC_CHECK_FUNCS(RAND_status RAND_egd)
 
-        fi
+        AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
+        LIBS="$saved_LIBS"
+        MUTTLIBS="$MUTTLIBS -lssl -lcrypto"
+        need_ssl=yes
+    fi
 ])
 
-AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]),
-    [gnutls_prefix="$withval"], [gnutls_prefix="no"])
-if test "$gnutls_prefix" != "no"
-then
-  if test x"$need_ssl" = x"yes"
-  then
-    AC_MSG_ERROR([Only either OpenSSL or GNUTLS may be used])
-  fi
-  MUTT_AM_PATH_GNUTLS([$gnutls_prefix],
-    [dnl GNUTLS found
-    CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
-    MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
-    AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.])
-
-    MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
-    need_ssl=yes],
-    [dnl GNUTLS not found
-      AC_MSG_ERROR([could not find libgnutls])
+AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls], [Enable SSL support using gnutls]),
+            [gnutls_prefix="$withval"], [gnutls_prefix="no"])
+if test "$gnutls_prefix" != "no"; then
+    if test x"$need_ssl" = x"yes"; then
+        AC_MSG_ERROR([Only either OpenSSL or GNUTLS may be used])
+    fi
+    AM_PATH_LIBGNUTLS(,[
+        CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
+        MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
+        AC_DEFINE(USE_GNUTLS, 1, [Define if you want support for SSL via the gnutls library.])
+        need_ssl=yes],
+        [AC_MSG_ERROR([could not find libgnutls])
     ])
 fi
-
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
+AC_SUBST(MUTT_SSL_OBJECTS)
 
 AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]],
-            [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
-        [
-        if test "$with_sasl2" != "no"
-        then
-          if test "$with_sasl2" != "yes"
-          then
+            [Use Cyrus SASL library version 2 for POP/IMAP authentication]),[
+    if test "$with_sasl2" != "no"; then
+        if test "$with_sasl2" != "yes"; then
             CPPFLAGS="$CPPFLAGS -I$with_sasl2/include"
             LDFLAGS="$LDFLAGS -L$with_sasl2/lib"
-          fi
+        fi
 
-          saved_LIBS="$LIBS"
+        saved_LIBS="$LIBS"
 
-          AC_CHECK_LIB(sasl2, sasl_client_init,,
-            AC_MSG_ERROR([could not find libsasl2]),)
+        AC_CHECK_LIB(sasl2, sasl_client_init,,AC_MSG_ERROR([could not find libsasl2]))
 
-          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
-          MUTTLIBS="$MUTTLIBS -lsasl2"
-          LIBS="$saved_LIBS"
-          AC_DEFINE(USE_SASL,1,
-                  [ Define if want to use version 2 of the Cyrus SASL library. ])
-          need_sasl=yes
-        fi
-        ])
+        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
+        MUTTLIBS="$MUTTLIBS -lsasl2"
+        LIBS="$saved_LIBS"
+        AC_DEFINE(USE_SASL,1,
+                  [Define if want to use version 2 of the Cyrus SASL library.])
+        need_sasl=yes
+    fi
+])
 AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes)
 
-AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),
-                [
-                 if test "$with_idn" != "no" ; then
-                       if test "$with_idn" != "yes" ; then
-                          CPPFLAGS="$CPPFLAGS -I$with_idn/include"
-                          LDFLAGS="$LDFLAGS -L$with_idn/lib"
-                       fi
-                 fi
-                ]
-)
-
-if test "x$with_idn" != "xno"; then
-    AC_CHECK_LIB(idn, stringprep_check_version)
-    AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
-    AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
-    AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
-fi
+AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),[
+    if test x$with_idn != xno ; then
+        PKG_CHECK_MODULES(IDN,libidn,[
+            if $PKG_CONFIG --atleast-version=0.6; then
+                AC_MSG_ERROR([libidn is too old, want 0.6 at least])
+            fi
+            CPPFLAGS="$CPPFLAGS $IDN_CFLAGS"
+            LDFLAGS="$LDFLAGS $IDN_LIBS"
+        ],[AC_MSG_ERROR([could not find libidn])])
+    fi
+])
 
 dnl -- end socket --
 
@@ -770,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
@@ -789,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>],
@@ -967,11 +823,12 @@ AC_SUBST(HTMLCLEAN_CMD)
 
 AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         po/Makefile.in doc/Makefile contrib/Makefile
-        muttbug.sh
         lib-lib/Makefile
         lib-mime/Makefile
         lib-crypt/Makefile
         lib-hash/Makefile
+        lib-sys/Makefile
+        lib-ui/Makefile
         lib/Makefile
         imap/Makefile
         pop/Makefile