X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=3f9cba1f19da92a2a8df456d57b1629c5343a680;hp=b70d5546c8529dfb2229c8a011b6fd903e5f8af1;hb=f2c6ea5470ab89bf4fd14958cc1090bedbb5b2e8;hpb=3d937534e7b1ee723f86594b5e4c64c95158a933 diff --git a/configure.in b/configure.in index b70d554..3f9cba1 100644 --- a/configure.in +++ b/configure.in @@ -3,13 +3,12 @@ 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` - AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) dnl AC_GNU_SOURCE @@ -19,7 +18,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 @@ -42,6 +41,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) @@ -56,35 +57,33 @@ 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) @@ -96,7 +95,34 @@ if test -f $srcdir/EXPORTABLE ; then 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` + 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 @@ -105,11 +131,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" + PGPAUX_TARGET="pgpringng pgpewrapng" 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 @@ -119,10 +145,10 @@ else AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ]) MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" - SMIMEAUX_TARGET="smime_keys" + 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 @@ -137,21 +163,21 @@ else 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_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 @@ -171,13 +197,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 @@ -185,15 +211,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 @@ -216,7 +242,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 @@ -298,33 +324,6 @@ 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) @@ -354,7 +353,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)]) @@ -378,7 +377,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 @@ -392,7 +392,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 @@ -448,7 +448,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" \ @@ -464,7 +464,7 @@ 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"]) AC_MSG_RESULT($mutt_cv_docdir) @@ -482,7 +482,7 @@ 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. ]) fi]) @@ -491,7 +491,7 @@ 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" @@ -501,7 +501,7 @@ AC_ARG_ENABLE(pop, [ --enable-pop Enable POP3 support], fi ]) -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" @@ -540,7 +540,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 @@ -570,7 +570,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 @@ -599,36 +599,8 @@ AC_ARG_WITH(ssl, [ --with-ssl[=PFX] Compile in SSL support for POP/IM ]) 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], +AC_ARG_WITH(nss, AC_HELP_STRING([--with-nss[=PFX]], [Compile in SSL support for POP/IMAP via NSS]), [ if test "$with_nss" != no then if test "$need_socket" != "yes"; then @@ -651,7 +623,28 @@ AC_ARG_WITH(nss, [ --with-nss[=PFX] Compile in SSL support for POP/IM fi ]) -AC_ARG_WITH(sasl, [ --with-sasl[=PFX] Use Cyrus SASL library for POP/IMAP authentication], +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 + 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 + +AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]), [ if test "$with_sasl" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes" then @@ -681,7 +674,7 @@ AC_ARG_WITH(sasl, [ --with-sasl[=PFX] Use Cyrus SASL library for POP/I ]) AM_CONDITIONAL(USE_SASL, test x$need_sasl = 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 "$with_sasl2" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes" then @@ -713,7 +706,7 @@ AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version ]) 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 @@ -733,35 +726,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 -mutt_cv_inodesort=yes -AC_ARG_ENABLE(inodesort, [ --disable-inodesort Do NOT read files in maildir folders sorted by inode. ], - [if test $enableval = no ; then mutt_cv_inodesort=no; 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]) @@ -770,7 +765,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 @@ -778,12 +773,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]) @@ -793,12 +788,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]) @@ -807,7 +802,7 @@ 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], +AC_ARG_ENABLE(exact-address, AC_HELP_STRING([--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? @@ -816,91 +811,7 @@ AC_ARG_ENABLE(exact-address, [ --enable-exact-address Enable regeneration o fi]) dnl -- start cache -- -AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], -[if test x$enableval = xyes; then - AC_DEFINE(USE_HCACHE, 1, [Enable header caching]) - - OLDCPPFLAGS="$CPPFLAGS" - OLDLIBS="$LIBS" - - need_md5="yes" - ac_prefer_gdbm=yes - AC_ARG_WITH(gdbm, [ --without-gdbm Get rid of 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 - AC_TRY_LINK([#include ],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes]) - ]) - fi - - ac_bdb_prefix=yes - AC_ARG_WITH(bdb, [ --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 - 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" - for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do - bdbpfx="$bdbpfx $d/$v" - done - done - BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" - AC_MSG_CHECKING([for BerkeleyDB > 4.0]) - for d in $bdbpfx; do - BDB_INCLUDE_DIR="" - BDB_LIB_DIR="" - for v in / $BDB_VERSIONS; do - if test -r "$d/include/$v/db.h"; then - BDB_INCLUDE_DIR="$d/include/$v" - if test -d "$d/lib/$v"; then - BDB_LIB_DIR="$d/lib/$v" - for l in `echo $BDB_VERSIONS`; do - CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" - AC_TRY_LINK([ - #include - #include - ],[ - DB *db = NULL; - db->open(db,NULL,NULL,NULL,0,0,0); - ],[ - ac_cv_dbcreate=yes - BDB_LIB="$l" - break - ]) - done - test x$ac_dbcreate = xyes && break - fi - fi - done - test x$BDB_LIB != x && break - done - if test x$ac_cv_dbcreate = xyes; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - - if test x$ac_cv_gdbmopen = xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -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) - fi -fi]) -dnl -- end cache -- - -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]) @@ -909,7 +820,7 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], need_md5="yes" 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" @@ -921,7 +832,7 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], 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 test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" @@ -990,7 +901,7 @@ AC_SUBST(LIBIMAPDEPS) 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 @@ -1145,7 +1056,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