AH_BOTTOM([/* fseeko portability defines */
#ifdef HAVE_FSEEKO
# define LOFF_T off_t
-# if SIZEOF_OFF_T == 8
-# define OFF_T_FMT "%lld"
+# if HAVE_C99_INTTYPES && HAVE_INTTYPES_H
+# if SIZEOF_OFF_T == 8
+# define OFF_T_FMT "%" PRId64
+# else
+# define OFF_T_FMT "%" PRId32
+# endif
# else
-# define OFF_T_FMT "%ld"
+# if (SIZEOF_OFF_T == 8) && (SIZEOF_LONG == 4)
+# define OFF_T_FMT "%lld"
+# else
+# define OFF_T_FMT "%ld"
+# endif
# endif
#else
# define LOFF_T long
#endif
])
MUTT_C99_INTTYPES
+AC_TYPE_LONG_LONG_INT
ac_aux_path_sendmail=/usr/sbin:/usr/lib
AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail)
SMIMEAUX_TARGET="smime_keys"
fi
-AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
+AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster@<:@=PATH@:>@], [Include Mixmaster support]),
[if test "$withval" != no
then
if test -x "$withval"
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]),
+AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang@<:@=DIR@:>@], [Use S-Lang instead of ncurses]),
[AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
[AC_TRY_RUN([#include <sys/param.h>
#include <stdlib.h>
AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror)
-AC_REPLACE_FUNCS([setenv strcasecmp strdup strsep strtok_r])
+AC_REPLACE_FUNCS([setenv strcasecmp strdup strsep strtok_r wcscasecmp])
+AC_REPLACE_FUNCS([strcasestr mkdtemp])
AC_CHECK_FUNC(getopt)
if test $ac_cv_func_getopt = yes; then
AC_ARG_WITH(homespool,
- AC_HELP_STRING([--with-homespool[=FILE]], [File in user's directory where new mail is spooled]), with_homespool=${withval})
+ AC_HELP_STRING([--with-homespool@<:@=FILE@:>@], [File in user's directory where new mail is spooled]), with_homespool=${withval})
if test x$with_homespool != x; then
if test $with_homespool = yes; then
with_homespool=mailbox
[mutt_cv_docdir=$withval],
[mutt_cv_docdir='${datarootdir}/doc/mutt'])
AC_MSG_RESULT($mutt_cv_docdir)
-
-docdir=$mutt_cv_docdir
+if test -z "$docdir" -o -n "$with_docdir"
+then
+ docdir=$mutt_cv_docdir
+fi
AC_SUBST(docdir)
if test x$mutt_cv_setgid = xyes; then
dnl -- imap dependencies --
-AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentication for IMAP]),
+AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss@<:@=PFX@:>@], [Compile in GSSAPI authentication for IMAP]),
gss_prefix="$withval", gss_prefix="no")
if test "$gss_prefix" != "no"
then
dnl -- end imap dependencies --
-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP/SMTP using OpenSSL]),
+AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Enable TLS support using OpenSSL]),
[ if test "$with_ssl" != "no"
then
if test "$need_socket" != "yes"; then
fi
])
-AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Compile in SSL support for POP/IMAP/SMTP using gnutls]),
+AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [enable TLS support using gnutls]),
[gnutls_prefix="$withval"], [gnutls_prefix="no"])
if test "$gnutls_prefix" != "no" && test x"$need_ssl" != xyes
then
then
AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support])
else
- MUTT_AM_PATH_GNUTLS([$gnutls_prefix],
+ if test "$gnutls_prefix" != "yes"
+ then
+ LDFLAGS="$LDFLAGS -L$gnutls_prefix/lib"
+ CPPFLAGS="$CPPFLAGS -I$gnutls_prefix/include"
+ fi
+ saved_LIBS="$LIBS"
+
+ AC_CHECK_LIB(gnutls, gnutls_check_version,
[dnl GNUTLS found
- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
- MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
+ AC_CHECK_DECLS([GNUTLS_VERIFY_DISABLE_TIME_CHECKS], [], [],
+ [[#include <gnutls/x509.h>]])
- AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
- AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via GNUTLS. ])
+ LIBS="$saved_LIBS"
+ MUTTLIBS="$MUTTLIBS -lgnutls"
+
+ AC_DEFINE(USE_SSL, 1, [ Define if you want support for SSL. ])
+ AC_DEFINE(USE_SSL_GNUTLS, 1, [ Define if you want support for SSL via GNUTLS. ])
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_MSG_ERROR([could not find libgnutls])])
fi
fi
+
AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
-AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL 2 network security library]),
+AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use SASL network security library]),
[
if test "$with_sasl" != "no"
then
fi
saved_LIBS="$LIBS"
+ LIBS=
- AC_CHECK_LIB(sasl2, sasl_client_init,,
- AC_MSG_ERROR([could not find libsasl2]),)
+ # OpenSolaris provides a SASL2 interface in libsasl
+ sasl_libs="sasl2 sasl"
+ AC_SEARCH_LIBS(sasl_encode64, [$sasl_libs],,
+ AC_MSG_ERROR([could not find sasl lib]),)
+ MUTTLIBS="$MUTTLIBS $LIBS"
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 the Cyrus SASL library for POP/IMAP authentication. ])
+ [ Define if want to use the SASL library for POP/IMAP authentication. ])
need_sasl=yes
fi
])
fi])
if test x$GCC = xyes && test $mutt_cv_warnings = yes; then
- CFLAGS="-Wall -pedantic $CFLAGS"
+ CFLAGS="-Wall -pedantic -Wno-long-long $CFLAGS"
fi
AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix], [Work around an NFS with broken attributes caching]),
fi])
dnl -- start cache --
-use_qdbm=no
+db_found=no
+db_requested=auto
AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache],
[Enable header caching]))
+AC_ARG_WITH(tokyocabinet, AC_HELP_STRING([--without-tokyocabinet],
+ [Don't use tokyocabinet even if it is available]))
AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm],
[Don't use qdbm even if it is available]))
AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm],
[Don't use gdbm even if it is available]))
-AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]],
+AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb@<:@=DIR@:>@],
[Use BerkeleyDB4 if gdbm is not available]))
+db_found=no
if test x$enable_hcache = xyes
then
AC_DEFINE(USE_HCACHE, 1, [Enable header caching])
need_md5="yes"
- dnl hcachever.sh tool for calculating struct digest
- AC_CHECK_PROGS([MD5], [md5 md5sum openssl], [none])
+ if test -n "$with_tokyocabinet" && test "$with_tokyocabinet" != "no"
+ then
+ db_requested=tc
+ fi
+ if test -n "$with_qdbm" && test "$with_qdbm" != "no"
+ then
+ if test "$db_requested" != "auto"
+ then
+ AC_MSG_ERROR([more than one header cache engine requested.])
+ else
+ db_requested=qdbm
+ fi
+ fi
+ if test -n "$with_gdbm" && test "$with_gdbm" != "no"
+ then
+ if test "$db_requested" != "auto"
+ then
+ AC_MSG_ERROR([more than one header cache engine requested.])
+ else
+ db_requested=gdbm
+ fi
+ fi
+ if test -n "$with_bdb" && test "$with_bdb" != "no"
+ then
+ if test "$db_requested" != "auto"
+ then
+ AC_MSG_ERROR([more than one header cache engine requested.])
+ else
+ db_requested=bdb
+ fi
+ fi
+
+ dnl -- Tokyo Cabinet --
+ if test "$with_tokyocabinet" != "no" \
+ && test "$db_requested" = auto -o "$db_requested" = tc
+ then
+ if test -n "$with_tokyocabinet" && test "$with_tokyocabinet" != "yes"
+ then
+ CPPFLAGS="$CPPFLAGS -I$with_tokyocabinet/include"
+ LDFLAGS="$LDFLAGS -L$with_tokyocabinet/lib"
+ fi
+
+ AC_CHECK_HEADER(tcbdb.h,
+ AC_CHECK_LIB(tokyocabinet, tcbdbopen,
+ [MUTTLIBS="$MUTTLIBS -ltokyocabinet"
+ AC_DEFINE(HAVE_TC, 1, [Tokyo Cabinet Support])
+ db_found=tc],
+ [CPPFLAGS="$OLDCPPFLAGS"
+ LDFLAGS="$OLDLDFLAGS"]))
+ if test "$db_requested" != auto && test "$db_found" != "$db_requested"
+ then
+ AC_MSG_ERROR([Tokyo Cabinet could not be used. Check config.log for details.])
+ fi
+ fi
dnl -- QDBM --
- if test "$with_qdbm" != "no"
+ if test "$with_qdbm" != "no" && test $db_found = no \
+ && test "$db_requested" = auto -o "$db_requested" = qdbm
then
if test -n "$with_qdbm" && test "$with_qdbm" != "yes"
then
AC_CHECK_LIB(qdbm, vlopen,
[MUTTLIBS="$MUTTLIBS -lqdbm"
AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
- use_qdbm=yes],
+ db_found=qdbm],
[CPPFLAGS="$OLDCPPFLAGS"
LDFLAGS="$OLDLDFLAGS"])
LIBS="$saved_LIBS"
- if test -n "$with_qdbm" && test "$use_qdbm" != yes
+ if test "$db_requested" != auto && test "$db_found" != "$db_requested"
then
AC_MSG_ERROR([QDBM could not be used. Check config.log for details.])
fi
fi
dnl -- GDBM --
- if test x$with_gdbm != xno && test $use_qdbm != yes
+ if test x$with_gdbm != xno && test $db_found = no \
+ && test "$db_requested" = auto -o "$db_requested" = gdbm
then
if test "$with_gdbm" != "yes"
then
then
AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
MUTTLIBS="$MUTTLIBS -lgdbm"
- elif test -n "$with_gdbm"
+ db_found=gdbm
+ fi
+ if test "$db_requested" != auto && test "$db_found" != "$db_requested"
then
AC_MSG_ERROR([GDBM could not be used. Check config.log for details.])
fi
dnl -- BDB --
ac_bdb_prefix="$with_bdb"
- if test x$ac_bdb_prefix != xno && test x$ac_cv_gdbmopen != xyes && test $use_qdbm != yes
+ if test x$ac_bdb_prefix != xno && test $db_found = no
then
if test x$ac_bdb_prefix = xyes || test x$ac_bdb_prefix = x
then
CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
AC_DEFINE(HAVE_DB4, 1, [Berkeley DB4 Support])
+ db_found=bdb
else
AC_MSG_RESULT(no)
fi
fi
- if test x$use_qdbm != xyes && test x$ac_cv_gdbmopen != xyes && test x$ac_cv_dbcreate != xyes
+ if test $db_found = no
then
- AC_MSG_ERROR([You need QDBM, GDBM or Berkeley DB4 for hcache])
+ AC_MSG_ERROR([You need Tokyo Cabinet, QDBM, GDBM or Berkeley DB4 for hcache])
fi
fi
dnl -- end cache --
+AM_CONDITIONAL(BUILD_HCACHE, test x$db_found != xno)
+
if test "$need_md5" = "yes"
then
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o"
fi
+if test x$db_found != xno ; then
+ MUTT_MD5="mutt_md5$EXEEXT"
+fi
+AC_SUBST(MUTT_MD5)
+
AC_SUBST(MUTTLIBS)
AC_SUBST(MUTT_LIB_OBJECTS)
AC_SUBST(LIBIMAP)
dnl -- IDN depends on iconv
-AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),
+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
AC_MSG_ERROR([IDN requested but iconv is disabled or unavailable])
fi
else
- AC_CHECK_LIB(idn, stringprep_check_version)
+ AC_SEARCH_LIBS([stringprep_check_version], [idn], [
+ AC_DEFINE([HAVE_LIBIDN], 1, [Define to 1 if you have the `idn' library])
+ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_idna.o"
+ ])
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_CHECK_HEADERS(wctype.h)
-AC_CHECK_FUNCS(iswalnum iswalpha iswcntrl iswdigit)
+AC_CHECK_FUNCS(iswalnum iswalpha iswblank iswcntrl iswdigit)
AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
AC_CHECK_FUNCS(iswxdigit towupper towlower)
AC_CACHE_CHECK([for wchar_t functions], mutt_cv_wc_funcs,
mutt_cv_wc_funcs=no
AC_TRY_LINK([
-#define _XOPEN_SOURCE 1
+#define _XOPEN_SOURCE 600
#include <stddef.h>
#include <stdlib.h>
-#ifdef HAVE_WCTYPE_H
-#include <wctype.h>
-#endif
#ifdef HAVE_WCHAR_H
#include <wchar.h>
+#endif
+#ifdef HAVE_WCTYPE_H
+#include <wctype.h>
#endif],
[mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0);
iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)],
fi
AC_SUBST(DSLROOT)
+AC_ARG_ENABLE(full_doc,
+ AC_HELP_STRING([--disable-full-doc], [Omit disabled variables]),
+[ if test x$enableval = xno ; then
+ full_doc=no
+ fi
+])
+if test x$full_doc != xno ; then
+ AC_DEFINE(MAKEDOC_FULL,1, [Define if you want complete documentation.])
+fi
+
AC_OUTPUT(Makefile contrib/Makefile doc/Makefile imap/Makefile
intl/Makefile m4/Makefile po/Makefile.in
hcachever.sh muttbug.sh doc/instdoc.sh)
projects / software / mutt-debian.git / blobdiff