X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=42dff961b8c84220fbc796a08bb108a01da88dd9;hp=2da58af8319ab55cd35e06c29ba451fa5c5c328e;hb=9afa66139f6099fc06d9866d4283191e43b0e17a;hpb=8dea1e97637d64ca1bd59251720e1c790237c8a8 diff --git a/configure.in b/configure.in index 2da58af..42dff96 100644 --- a/configure.in +++ b/configure.in @@ -3,14 +3,16 @@ dnl Process this file with autoconf to produce a configure script. dnl !!! WHEN ADDING NEW CONFIGURE TESTS, PLEASE ADD CODE TO MAIN.C !!! dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED !!! -AC_PREREQ(2.12) -AC_INIT(mutt.h) +AC_PREREQ([2.50]) +AC_INIT([mutt.h]) AM_CONFIG_HEADER(config.h) -mutt_cv_version=`cat $srcdir/VERSION` - +mutt_cv_version=`cat "$srcdir/VERSION.in"` AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) +AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in']) + +dnl AC_GNU_SOURCE ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])]) @@ -18,7 +20,7 @@ ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv d AC_CANONICAL_HOST -AC_MSG_CHECKING(for prefix) +AC_MSG_CHECKING([for prefix]) if test x$prefix = xNONE; then mutt_cv_prefix=$ac_default_prefix else @@ -41,6 +43,8 @@ AC_CHECK_TOOL(AR, ar, ar) AC_C_INLINE AC_C_CONST +AC_SYS_LARGEFILE + AC_PATH_PROG(DBX, dbx, no) AC_PATH_PROG(GDB, gdb, no) AC_PATH_PROG(SDB, sdb, no) @@ -55,47 +59,69 @@ else DEBUGGER=no fi -AC_SUBST(DEBUGGER) - -# The following templates should be used with newer automakes -# instead of acconfig.h -# -#AH_TEMPLATE([sig_atomic_t], -# [/* Define to `int' if doesn't define.]) -#AH_TEMPLATE([HAVE_START_COLOR], -# [Define if you have start_color, as a function or macro.]) -#AH_TEMPLATE([HAVE_TYPEAHEAD], -# [Define if you have typeahead, as a function or macro.]) -#AH_TEMPLATE([HAVE_BKGDSET], -# [Define if you have bkgdset, as a function or macro.]) -#AH_TEMPLATE([HAVE_CURS_SET], -# [Define if you have curs_set, as a function or macro.]) -#AH_TEMPLATE([HAVE_META], -# [Define if you have meta, as a function or macro.]) -#AH_TEMPLATE([HAVE_USE_DEFAULT_COLORS], -# [Define if you have use_default_colors, as a function or macro.]) -#AH_TEMPLATE([HAVE_RESIZETERM], -# [Define if you have resizeterm, as a function or macro.]) -#AH_TEMPLATE([SIG_ATOMIC_VOLATILE_T], -# [Some systems declare sig_atomic_t as volatile, some others -- no. -# This define will have value `sig_atomic_t' or -# `volatile sig_atomic_t' accordingly.]) -#AH_TEMPLATE([ICONV_NONTRANS], -# [Define as 1 if iconv() only converts exactly and we should treat -# all return values other than (size_t)(-1) as equivalent.]) - +AC_SUBST([DEBUGGER]) + +AH_TEMPLATE([sig_atomic_t], + [/* Define to `int' if doesn't define.]) +AH_TEMPLATE([HAVE_START_COLOR], + [Define if you have start_color, as a function or macro.]) +AH_TEMPLATE([HAVE_TYPEAHEAD], + [Define if you have typeahead, as a function or macro.]) +AH_TEMPLATE([HAVE_BKGDSET], + [Define if you have bkgdset, as a function or macro.]) +AH_TEMPLATE([HAVE_CURS_SET], + [Define if you have curs_set, as a function or macro.]) +AH_TEMPLATE([HAVE_META], + [Define if you have meta, as a function or macro.]) +AH_TEMPLATE([HAVE_USE_DEFAULT_COLORS], + [Define if you have use_default_colors, as a function or macro.]) +AH_TEMPLATE([HAVE_RESIZETERM], + [Define if you have resizeterm, as a function or macro.]) +AH_TEMPLATE([SIG_ATOMIC_VOLATILE_T], + [Some systems declare sig_atomic_t as volatile, some others -- no. + This define will have value `sig_atomic_t' or + `volatile sig_atomic_t' accordingly.]) +AH_TEMPLATE([ICONV_NONTRANS], + [Define as 1 if iconv() only converts exactly and we should treat + all return values other than (size_t)(-1) as equivalent.]) + +MUTT_C99_INTTYPES 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' -if test -f $srcdir/EXPORTABLE ; then - SUBVERSION="us" -else - SUBVERSION="i" - AC_ARG_ENABLE(pgp, [ --disable-pgp Disable PGP support], + AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]), + [ if test x$enableval = xyes; then + have_gpgme=yes + fi + ]) + AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]), + gpgme_config_prefix="$withval", gpgme_config_prefix="") + + if test x$have_gpgme = xyes; then + if test x$gpgme_config_prefix != x; then + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" + else + AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) + fi + if test "x$GPGME_CONFIG" = "xno"; then + AC_MSG_ERROR([GPGME not found]) + else + LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags` + LIBGPGME_LIBS=`$GPGME_CONFIG --libs` + MUTTLIBS="$MUTTLIBS $LIBGPGME_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]) + fi + fi + AC_SUBST(LIBGPGME_CFLAGS) + AC_SUBST(LIBGPGME_LIBS) + + AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]), [ if test x$enableval = xno ; then have_pgp=no fi @@ -104,11 +130,11 @@ else if test x$have_pgp != xno ; then AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, [ Define if you want classic PGP support. ]) - PGPAUX_TARGET="pgpring pgpewrap" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o" + PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" fi - AC_ARG_ENABLE(smime, [ --disable-smime Disable SMIME support], + AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]), [ if test x$enableval = xno ; then have_smime=no fi @@ -117,11 +143,11 @@ else if test x$have_smime != xno ; then AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o " - SMIMEAUX_TARGET="smime_keys" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" + SMIMEAUX_TARGET="smime_keysng" fi - AC_ARG_WITH(mixmaster, [ --with-mixmaster[=PATH] Include Mixmaster support], + AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), [if test -x "$withval" ; then MIXMASTER="$withval" else @@ -133,24 +159,20 @@ else [ Where to find mixmaster on your system. ]) ]) -fi # We now require all OPS OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT " -AC_SUBST(OPS) +AC_SUBST([OPS]) AC_SUBST(PGPAUX_TARGET) AC_SUBST(SMIMEAUX_TARGET) -AC_DEFINE_UNQUOTED(SUBVERSION,"$SUBVERSION",[ Is this the international version? ]) -AC_SUBST(SUBVERSION) - AC_PATH_PROG(ISPELL, ispell, no) if test $ISPELL != no; then AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ]) fi -AC_ARG_WITH(slang, [ --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 @@ -170,13 +192,13 @@ main () if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else if test -d $mutt_cv_prefix/include/slang; then - CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang" + CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang" elif test -d /usr/include/slang; then - CPPFLAGS="$CPPFLAGS -I/usr/include/slang" + CFLAGS="$CFLAGS -I/usr/include/slang" fi mutt_cv_slang=yes fi @@ -184,15 +206,15 @@ main () dnl ---Check to see if $withval is a source directory if test -f $withval/src/slang.h; then mutt_cv_slang=$withval/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else dnl ---Must be installed somewhere mutt_cv_slang=$withval if test -d $withval/include/slang; then - CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" + CFLAGS="$CFLAGS -I${withval}/include/slang" elif test -d $withval/include; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" + CFLAGS="$CFLAGS -I${withval}/include" fi LDFLAGS="$LDFLAGS -L${withval}/lib" fi @@ -215,7 +237,7 @@ main () ], [mutt_cv_curses=/usr - AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ], + AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), [if test $withval != yes; then mutt_cv_curses=$withval fi @@ -226,7 +248,7 @@ main () AC_CHECK_FUNC(initscr,,[ cf_ncurses="ncurses" - for lib in ncurses ncursesw + for lib in ncursesw ncurses do AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) done @@ -237,6 +259,7 @@ main () 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"]) @@ -297,34 +320,8 @@ fi AC_DECL_SYS_SIGLIST -dnl For MD5 and SHA1 on 64-bit systems -AC_C_BIGENDIAN -AC_CHECK_HEADERS(inttypes.h stdint.h) -dnl This is the method autoconf-2.50's new AC_CHECK_TYPE macro uses. -dnl We need to be backwards compatible to autoconf 2.13, though. -lh -AC_MSG_CHECKING(for uint32_t) -AC_TRY_COMPILE([ -#include -#if HAVE_INTTYPES_H -#include -#else -#if HAVE_STDINT_H -#include -#endif -#endif], -[if ((uint32_t *) 0) - return 0; -if (sizeof (uint32_t)) - return 0; -],[ - AC_DEFINE(HAVE_UINT32_T,1,[ Define if you have the uint32_t type. ]) - AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no) -) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) - AC_TYPE_PID_T +dnl AC_CHECK_TYPE(ssize_t, int) AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror) @@ -352,7 +349,7 @@ AC_CHECK_FUNCS(strftime, , [AC_CHECK_LIB(intl, strftime)]) dnl AIX may not have fchdir() AC_CHECK_FUNCS(fchdir, , [mutt_cv_fchdir=no]) -AC_ARG_WITH(regex, [ --with-regex Use the GNU regex library ], +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)]) @@ -376,7 +373,8 @@ if test $mutt_cv_regex = yes; then fi -AC_ARG_WITH(homespool, [ --with-homespool[=FILE] File in user's directory where new mail is spooled], with_homespool=${withval}) +AC_ARG_WITH(homespool, + 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 @@ -390,7 +388,7 @@ if test x$with_homespool != x; then AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ]) mutt_cv_setgid=no else - AC_ARG_WITH(mailpath, [ --with-mailpath=DIR Directory where spool mailboxes are located], + AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]), [mutt_cv_mailpath=$withval], [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath, [mutt_cv_mailpath=no @@ -446,7 +444,7 @@ int main (int argc, char **argv) fi fi -AC_ARG_ENABLE(external_dotlock, [ --enable-external-dotlock Force use of an external dotlock program], +AC_ARG_ENABLE(external_dotlock, AC_HELP_STRING([--enable-external-dotlock], [Force use of an external dotlock program]), [mutt_cv_external_dotlock="$enableval"]) if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ @@ -462,9 +460,9 @@ AC_SUBST(DOTLOCK_TARGET) AC_MSG_CHECKING(where to put the documentation) -AC_ARG_WITH(docdir, [ --with-docdir=PATH Specify where to put the documentation], +AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]), [mutt_cv_docdir=$withval], - [mutt_cv_docdir="$mutt_cv_prefix/doc/muttng"]) + [mutt_cv_docdir="${prefix}/doc/muttng"]) AC_MSG_RESULT($mutt_cv_docdir) docdir=$mutt_cv_docdir @@ -480,25 +478,30 @@ fi AC_SUBST(DOTLOCK_GROUP) AC_SUBST(DOTLOCK_PERMISSION) -AC_ARG_WITH(domain, [ --with-domain=DOMAIN Specify your DNS domain name], +AC_ARG_WITH(domain, AC_HELP_STRING([--with-domain=DOMAIN], [Specify your DNS domain name]), [if test $withval != yes; then - AC_DEFINE_UNQUOTED(DOMAIN,"$withval",[ Define your domain name. ]) + if test $withval != no; then + AC_DEFINE_UNQUOTED(DOMAIN,"$withval",[ Define your domain name. ]) + fi fi]) need_socket="no" dnl -- socket dependencies -- -AC_ARG_ENABLE(pop, [ --enable-pop Enable POP3 support], +AC_ARG_ENABLE(pop, AC_HELP_STRING([--enable-pop], [Enable POP3 support]), [ if test x$enableval = xyes ; then AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o" + LIBPOP="-Lpop -lpop" + LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a" need_socket="yes" + need_pop="yes" need_md5="yes" fi ]) +AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes) -AC_ARG_ENABLE(imap, [ --enable-imap Enable IMAP support], +AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]), [ if test x$enableval = xyes ; then AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ]) LIBIMAP="-Limap -limap" @@ -513,10 +516,13 @@ AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes) AC_ARG_ENABLE(nntp, [ --enable-nntp Enable NNTP support], [ if test x$enableval = xyes ; then AC_DEFINE(USE_NNTP) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o" + LIBNNTP="-Lnntp -lnntp" + LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a" + need_nntp="yes" need_socket="yes" fi ]) +AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes) dnl -- end socket dependencies -- @@ -537,7 +543,7 @@ fi dnl -- imap dependencies -- -AC_ARG_WITH(gss, [ --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 @@ -567,7 +573,7 @@ AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes) dnl -- end imap dependencies -- -AC_ARG_WITH(ssl, [ --with-ssl[=PFX] Compile in SSL support for POP/IMAP], +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 "$need_socket" != "yes"; then @@ -594,95 +600,39 @@ AC_ARG_WITH(ssl, [ --with-ssl[=PFX] Compile in SSL support for POP/IM fi ]) -AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) - -AC_ARG_WITH(gnutls, [ --with-gnutls[=PFX] Compile in GNU TLS support for POP/IMAP], -[ if test "$need_ssl" = "yes" - then - AC_MSG_ERROR([In order to compile in GNU TLS support, you must first disable SSL support]) - fi - if test "$with_gnutls" != "no" - then - if test "$need_socket" != "yes"; then - AC_MSG_ERROR([GNU TLS support is only useful with POP or IMAP support]) - fi - if test "$with_gnutls" != "yes" - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - fi -#saved_LIBS="$LIBS" - - AC_CHECK_LIB([gnutls], [gnutls_init],, AC_MSG_ERROR(Unable to find GNU TLS library)) - - AC_DEFINE(USE_GNUTLS,1,[ Define if you want support for GNU TLS. ]) -#LIBS="$saved_LIBS" -#MUTTLIBS="$MUTTLIBS -lgnutls" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o" - need_gnutls=yes - fi -]) -AM_CONDITIONAL(USE_GNUTLS, test x$need_gnutls = xyes) - -dnl SSL support via NSS -AC_ARG_WITH(nss, [ --with-nss[=PFX] Compile in SSL support for POP/IMAP via NSS], -[ if test "$with_nss" != no - then - if test "$need_socket" != "yes"; then - AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) - fi - - if test "$with_nss" != "yes" - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/public/security" - fi - - AC_DEFINE(USE_NSS,1,[ Define if you want support for SSL via the NSS library. ]) - MUTTLIBS="$MUTTLIBS -lssl -lnss -lcertdb -lcerthi -lcryptohi" - MUTTLIBS="$MUTTLIBS -lpk11wrap -lsoftoken -lsecutil -ldbm -lplds4 -lplc4 -lfreebl" - MUTTLIBS="$MUTTLIBS -lnspr4" - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_nss.o" - need_ssl=yes - fi -]) -AC_ARG_WITH(sasl, [ --with-sasl[=PFX] Use Cyrus SASL library for POP/IMAP authentication], - [ - if test "$need_socket" != "yes" - then - AC_MSG_ERROR([SASL support is only useful with POP or IMAP support]) - fi - - if test "$with_sasl" != "no" - then - if test "$with_sasl" != "yes" - then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" - LDFLAGS="$LDFLAGS -L$with_sasl/lib" - fi - - saved_LIBS="$LIBS" - - AC_CHECK_LIB(sasl, sasl_client_init,, - AC_MSG_ERROR([could not find libsasl]),) +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 "$need_socket" != "yes" + then + AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) + fi + 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]) + ]) +fi - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" - MUTTLIBS="$MUTTLIBS -lsasl" - LIBS="$saved_LIBS" - AC_DEFINE(USE_SASL,1, - [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ]) - need_sasl=yes - fi - ]) -AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) +AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) -AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for POP/IMAP authentication], +AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]), [ - if test "$need_socket" != "yes" + if test "$with_sasl2" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes" then - AC_MSG_ERROR([SASL support is only useful with POP or IMAP support]) + AC_MSG_ERROR([SASL2 support is only useful with POP or IMAP support]) fi if test "$with_sasl2" != "no" @@ -696,21 +646,19 @@ AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version saved_LIBS="$LIBS" AC_CHECK_LIB(sasl2, sasl_client_init,, - AC_MSG_ERROR([could not find libsasl]),) + 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 the Cyrus SASL library for POP/IMAP authentication. ]) - AC_DEFINE(USE_SASL2,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, [ --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 @@ -730,27 +678,37 @@ fi dnl -- end socket -- -AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support], +AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]), [ if test x$enableval = xyes ; then AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ]) fi ]) -AC_ARG_ENABLE(flock, [ --enable-flock Use flock() to lock files], +AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]), [if test $enableval = yes; then AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ]) fi]) mutt_cv_fcntl=yes -AC_ARG_ENABLE(fcntl, [ --disable-fcntl Do NOT use fcntl() to lock files ], +AC_ARG_ENABLE(fcntl, AC_HELP_STRING([--disable-fcntl], [Do NOT use fcntl() to lock files]), [if test $enableval = no; then mutt_cv_fcntl=no; fi]) if test $mutt_cv_fcntl = yes; then AC_DEFINE(USE_FCNTL,1, [ Define to use fcntl() to lock folders. ]) fi +dnl This may look cumbersome -- please keep it that way, so we can +dnl quickly change the default to "yes" again. +mutt_cv_inodesort=no +AC_ARG_ENABLE(inodesort, AC_HELP_STRING([--enable-inodesort], [Read files in maildir folders sorted by inode.]), + [if test x$enableval = xyes ; then mutt_cv_inodesort=yes; fi]) + +if test $mutt_cv_inodesort = yes; then + AC_DEFINE(USE_INODESORT, 1, [ Define to sort files in a maildir by inode number. ]) +fi + mutt_cv_warnings=yes -AC_ARG_ENABLE(warnings, [ --disable-warnings Turn off compiler warnings (not recommended)], +AC_ARG_ENABLE(warnings, AC_HELP_STRING([--disable-warnings], [Turn off compiler warnings (not recommended)]), [if test $enableval = no; then mutt_cv_warnings=no fi]) @@ -759,7 +717,7 @@ if test x$GCC = xyes -a $mutt_cv_warnings = yes; then CFLAGS="-Wall -pedantic $CFLAGS" fi -AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], +AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix], [Work around an NFS with broken attributes caching]), [if test x$enableval = xyes; then AC_DEFINE(NFS_ATTRIBUTE_HACK,1, [Define if you have problems with mutt not detecting @@ -767,12 +725,12 @@ AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with bro incorrectly cache the attributes of small files.]) fi]) -AC_ARG_ENABLE(buffy-size, [ --enable-buffy-size Use file size attribute instead of access time ], +AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size attribute instead of access time]), [if test x$enableval = xyes; then AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ]) fi]) -AC_ARG_ENABLE(mailtool, [ --enable-mailtool Enable Sun mailtool attachments support ], +AC_ARG_ENABLE(mailtool, AC_HELP_STRING([--enable-mailtool], [Enable Sun mailtool attachments support ]), [if test x$enableval = xyes; then AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) fi]) @@ -782,12 +740,12 @@ AC_ARG_ENABLE(compressed, [ --enable-compressed Enable compressed folder AC_DEFINE(USE_COMPRESSED) fi]) -AC_ARG_ENABLE(locales-fix, [ --enable-locales-fix The result of isprint() is unreliable ], +AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable ]), [if test x$enableval = xyes; then AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) -AC_ARG_WITH(exec-shell, [ --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken)], +AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), [if test $withval != yes; then AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", [program to use for shell commands]) @@ -796,16 +754,8 @@ AC_ARG_WITH(exec-shell, [ --with-exec-shell=SHELL Specify alternate shell (O fi], [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")]) -AC_ARG_ENABLE(exact-address, [ --enable-exact-address Enable regeneration of email addresses], - [if test $enableval = yes; then - AC_DEFINE(EXACT_ADDRESS,1, - [Enable exact regeneration of email addresses as parsed? - NOTE: this requires significant more memory when defined.]) - - fi]) - dnl -- start cache -- -AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], +AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]), [if test x$enableval = xyes; then AC_DEFINE(USE_HCACHE, 1, [Enable header caching]) @@ -813,22 +763,57 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], OLDLIBS="$LIBS" need_md5="yes" + + ac_prefer_qdbm=yes + AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]), + ac_prefer_qdbm=$withval) + if test x$ac_prefer_qdbm != xno; then + ac_cv_vlopen=no + QDBM_DIRS="$mutt_cv_prefix /usr/local /usr" + AC_MSG_CHECKING([for vlopen]) + for d in $QDBM_DIRS; do + if test x$ac_cv_vlopen = xno && test -d "$d/include" && test -d "$d/lib"; then + QDBM_INC="-I$d/include" + QDBM_LIB="-L$d/lib" + CPPFLAGS="$OLDCPPFLAGS $QDBM_INC" + LIBS="$OLDLIBS $QDBM_LIB -lqdbm" + AC_TRY_LINK([#include ],[vlopen(0,0,0);],[ac_cv_vlopen=yes]) + fi + done + if test x$ac_cv_vlopen = xyes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + fi + ac_prefer_gdbm=yes - AC_ARG_WITH(gdbm, [ --without-gdbm Get rid of gdbm even if it is available ], + AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]), ac_prefer_gdbm=$withval) - if test x$ac_prefer_gdbm != xno; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; - AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[ - ac_cv_gdbmopen=no + if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then + ac_cv_gdbmopen=no + GDBM_DIRS="$mutt_cv_prefix /usr/local /usr" + AC_MSG_CHECKING([for gdbm_open]) + for d in $GDBM_DIRS; do + if test x$ac_cv_gdbmopen = xno && test -d "$d/include" && test -d "$d/lib"; then + GDBM_INC="-I$d/include" + GDBM_LIB="-L$d/lib" + CPPFLAGS="$OLDCPPFLAGS $GDBM_INC" + LIBS="$OLDLIBS $GDBM_LIB -lgdbm" AC_TRY_LINK([#include ],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes]) - ]) + fi + done + if test x$ac_cv_gdbmopen = xyes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi fi - + ac_bdb_prefix=yes - AC_ARG_WITH(bdb, [ --with-bdb[=DIR] Use BerkeleyDB4 if gdbm is not available ], + AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available ]), ac_bdb_prefix=$withval) - if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then + if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" for d in $ac_bdb_prefix; do bdbpfx="$bdbpfx $d" @@ -861,7 +846,7 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], break ]) done - test x$ac_dbcreate = xyes && break + test x$ac_cv_dbcreate = xyes && break fi fi done @@ -874,33 +859,36 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], fi fi - if test x$ac_cv_gdbmopen = xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; + if test x$ac_cv_vlopen = xyes; then + CPPFLAGS="$OLDCPPFLAGS $QDBM_INC" + LIBS="$OLDLIBS $QDBM_LIB -lqdbm" + AC_DEFINE(HAVE_QDBM, 1, [QDBM Support]) + elif test x$ac_cv_gdbmopen = xyes; then + CPPFLAGS="$OLDCPPFLAGS $GDBM_INC" + LIBS="$OLDLIBS $GDBM_LIB -lgdbm"; AC_DEFINE(HAVE_GDBM, 1, [GDBM Support]) elif test x$ac_cv_dbcreate = xyes; then CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support]) else - AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache) + AC_MSG_ERROR([You need one of: QDBM, GDBM or Sleepycat DB4 for --enable-hcache]) fi fi]) dnl -- end cache -- -if test "$need_md5" = "yes" -then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o" -fi - AC_SUBST(MUTTLIBS) AC_SUBST(MUTT_LIB_OBJECTS) AC_SUBST(LIBIMAP) AC_SUBST(LIBIMAPDEPS) +AC_SUBST(LIBPOP) +AC_SUBST(LIBPOPDEPS) +AC_SUBST(LIBNNTP) +AC_SUBST(LIBNNTPDEPS) dnl -- iconv/gettext -- -AC_ARG_ENABLE(iconv, [ --disable-iconv Disable iconv support], +AC_ARG_ENABLE(iconv, AC_HELP_STRING([--disable-iconv], [Disable iconv support]), [if test x$enableval = xno ; then am_cv_func_iconv=no fi @@ -1055,7 +1043,7 @@ if test "$mutt_cv_mbstate_t" = no; then fi wc_funcs=maybe -AC_ARG_WITH(wc-funcs, [ --without-wc-funcs Do not use the system's wchar_t functions], +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 @@ -1112,9 +1100,76 @@ if test x$use_libesmtp = xyes; then fi dnl -- end libesmtp -- +dnl -- sgml tools -- + +dnl Documentation tools +have_openjade="no" +AC_PATH_PROG([OSPCAT], [ospcat], [none]) +if test "$OSPCAT" != "none" +then + AC_MSG_CHECKING([for openjade docbook stylesheets]) + dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` + DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\(@<:@^'@:>@*\)\/catalog'.*/\1/p"` + # ospcat may spit out an absolute path without an SOIBASE + if test -z "$DSLROOT" + then + DSLROOT=`echo $dslosfile | sed -e 's|\(.*\)/print/docbook.dsl|\1|'` + fi + if test -f $DSLROOT/print/docbook.dsl + then + AC_MSG_RESULT([in $DSLROOT]) + have_openjade="yes" + else + AC_MSG_RESULT([not found: PDF documentation will not be built.]) + fi +fi +AC_SUBST(DSLROOT) + +AC_MSG_CHECKING([for elinks]) +AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none]) +if test x"$HTML2TXT_CMD" = x"none" +then + AC_MSG_CHECKING([for lynx]) + AC_PATH_PROG([HTML2TXT_CMD], [lynx], [none]) +fi +if test x"$HTML2TXT_CMD" = x"none" +then + AC_MSG_CHECKING([for w3m]) + AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none]) +fi +case "$HTML2TXT_CMD" in + *elinks*) + HTML2TXT_CMD="$HTML2TXT_CMD -dump -no-numbering -no-references \$^ > \$@" + ;; + *lynx*) + HTML2TXT_CMD="$HTML2TXT_CMD -dump -nolist -with_backspaces \$^ > \$@" + ;; + *w3m*) + HTML2TXT_CMD="$HTML2TXT_CMD -dump \$^ > \$@" + ;; + *) + HTML2TXT_CMD="true" + ;; +esac +AC_SUBST(HTML2TXT_CMD) + +AC_MSG_CHECKING([for tidy]) +AC_PATH_PROG([HTMLCLEAN_CMD], [tidy], [none]) + +if test x"$HTMLCLEAN_CMD" != x"none" +then + HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 " +else + HTMLCLEAN_CMD="echo " +fi +AC_SUBST(HTMLCLEAN_CMD) + AC_OUTPUT(Makefile intl/Makefile m4/Makefile po/Makefile.in doc/Makefile contrib/Makefile muttbug.sh + lib/Makefile imap/Makefile + pop/Makefile + nntp/Makefile Muttngrc.head doc/instdoc.sh)