diff -Nru mutt-1.5.21/account.c mutt-1.5.20/account.c --- mutt-1.5.21/account.c 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/account.c 2008-11-11 19:55:46.000000000 +0000 @@ -155,8 +155,6 @@ else if ((account->type == M_ACCT_TYPE_POP) && PopUser) strfcpy (account->user, PopUser, sizeof (account->user)); #endif - else if (option (OPTNOCURSES)) - return -1; /* prompt (defaults to unix username), copy into account->user */ else { @@ -217,8 +215,6 @@ else if ((account->type == M_ACCT_TYPE_SMTP) && SmtpPass) strfcpy (account->pass, SmtpPass, sizeof (account->pass)); #endif - else if (option (OPTNOCURSES)) - return -1; else { snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), diff -Nru mutt-1.5.21/aclocal.m4 mutt-1.5.20/aclocal.m4 --- mutt-1.5.21/aclocal.m4 2010-08-25 16:31:46.000000000 +0000 +++ mutt-1.5.20/aclocal.m4 2009-06-09 06:50:40.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,121 +13,36 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# longlong.m4 serial 13 -dnl Copyright (C) 1999-2007 Free Software Foundation, Inc. +# isc-posix.m4 serial 2 (gettext-0.11.2) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl From Paul Eggert. +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -# Define HAVE_LONG_LONG_INT if 'long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. - -# Note: If the type 'long long int' exists but is only 32 bits large -# (as on some very old compilers), HAVE_LONG_LONG_INT will not be -# defined. In this case you can treat 'long long int' like 'long int'. - -AC_DEFUN([AC_TYPE_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. - dnl If cross compiling, assume the bug isn't important, since - dnl nobody cross compiles for this platform as far as we know. - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[@%:@include - @%:@ifndef LLONG_MAX - @%:@ define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - @%:@ define LLONG_MAX (HALF - 1 + HALF) - @%:@endif]], - [[long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0;]])], - [ac_cv_type_long_long_int=yes], - [ac_cv_type_long_long_int=no], - [ac_cv_type_long_long_int=yes])], - [ac_cv_type_long_long_int=no])]) - if test $ac_cv_type_long_long_int = yes; then - AC_DEFINE([HAVE_LONG_LONG_INT], 1, - [Define to 1 if the system has the type `long long int'.]) - fi -]) - -# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. - -# Note: If the type 'unsigned long long int' exists but is only 32 bits -# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT -# will not be defined. In this case you can treat 'unsigned long long int' -# like 'unsigned long int'. - -AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for unsigned long long int], - [ac_cv_type_unsigned_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [ac_cv_type_unsigned_long_long_int=yes], - [ac_cv_type_unsigned_long_long_int=no])]) - if test $ac_cv_type_unsigned_long_long_int = yes; then - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, - [Define to 1 if the system has the type `unsigned long long int'.]) - fi -]) - -# Expands to a C program that can be used to test for simultaneous support -# of 'long long' and 'unsigned long long'. We don't want to say that -# 'long long' is available if 'unsigned long long' is not, or vice versa, -# because too many programs rely on the symmetry between signed and unsigned -# integer types (excluding 'bool'). -AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], -[ - AC_LANG_PROGRAM( - [[/* Test preprocessor. */ - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - error in preprocessor; - #endif - #if ! (18446744073709551615ULL <= -1ull) - error in preprocessor; - #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63;]], - [[/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull));]]) -]) +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # @@ -144,7 +59,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -160,7 +75,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru mutt-1.5.21/attach.c mutt-1.5.20/attach.c --- mutt-1.5.21/attach.c 2010-04-05 18:47:13.000000000 +0000 +++ mutt-1.5.20/attach.c 2009-05-28 05:11:16.000000000 +0000 @@ -169,7 +169,7 @@ /* Remove headers by copying out data to another file, then * copying the file back */ fseeko (fp, b->offset, 0); - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if ((tfp = safe_fopen (tempfile, "w")) == NULL) { mutt_perror _("Failure to open file to strip headers."); @@ -508,7 +508,7 @@ mutt_adv_mktemp (pagerfile, sizeof(pagerfile)); } else - mutt_mktemp (pagerfile, sizeof (pagerfile)); + mutt_mktemp (pagerfile); } if (use_mailcap) @@ -938,7 +938,7 @@ /* Ok, the difference between send and receive: * recv: BODY->filename is a suggested name, and Context|HEADER points - * to the attachment in mailbox which is encoded + * to the attachment in mailbox which is encooded * send: BODY->filename points to the un-encoded file which contains the * attachment */ @@ -1043,7 +1043,7 @@ ifp = NULL; fpout = NULL; - mutt_mktemp (newfile, sizeof (newfile)); + mutt_mktemp (newfile); if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) { diff -Nru mutt-1.5.21/bcache.c mutt-1.5.20/bcache.c --- mutt-1.5.21/bcache.c 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/bcache.c 2009-01-27 03:40:54.000000000 +0000 @@ -1,6 +1,6 @@ /* * Copyright (C) 2006-7 Brendan Cully - * Copyright (C) 2006, 2009 Rocco Rutte + * Copyright (C) 2006 Rocco Rutte * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,6 @@ char *dst, size_t dstlen) { char host[STRING]; - char path[_POSIX_PATH_MAX]; ciss_url_t url; int len; @@ -63,14 +62,12 @@ return -1; } - mutt_encode_path (path, sizeof (path), NONULL (mailbox)); + dprint (3, (debugfile, "bcache_path: URL: '%s'\n", host)); len = snprintf (dst, dstlen-1, "%s/%s%s%s", MessageCachedir, - host, path, - (*path && path[mutt_strlen (path) - 1] == '/') ? "" : "/"); - - dprint (3, (debugfile, "bcache_path: rc: %d, path: '%s'\n", len, dst)); - + host, NONULL(mailbox), + (mailbox && *mailbox && + mailbox[mutt_strlen(mailbox) - 1] == '/') ? "" : "/"); if (len < 0 || len >= dstlen-1) return -1; diff -Nru mutt-1.5.21/browser.c mutt-1.5.20/browser.c --- mutt-1.5.21/browser.c 2010-08-25 16:31:40.000000000 +0000 +++ mutt-1.5.20/browser.c 2009-06-11 17:52:54.000000000 +0000 @@ -40,7 +40,6 @@ #include #include #include -#include static struct mapping_t FolderHelp[] = { { N_("Exit"), OP_EXIT }, @@ -162,27 +161,11 @@ break; case 'd': - case 'D': if (folder->ff->st != NULL) { - int do_locales = TRUE; - - if (op == 'D') { - t_fmt = NONULL(DateFmt); - if (*t_fmt == '!') { - ++t_fmt; - do_locales = FALSE; - } - } else { - tnow = time (NULL); - t_fmt = tnow - folder->ff->st->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d %Y"; - } - if (do_locales) - setlocale(LC_TIME, NONULL (Locale)); /* use environment if $locale is not set */ - else - setlocale(LC_TIME, "C"); + tnow = time (NULL); + t_fmt = tnow - folder->ff->st->st_mtime < 31536000 ? "%b %d %H:%M" : "%b %d %Y"; strftime (date, sizeof (date), t_fmt, localtime (&folder->ff->st->st_mtime)); - mutt_format_s (dest, destlen, fmt, date); } else @@ -1085,6 +1068,7 @@ if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) { regerror (err, rx, buf, sizeof (buf)); + regfree (rx); FREE (&rx); mutt_error ("%s", buf); } diff -Nru mutt-1.5.21/buffy.c mutt-1.5.20/buffy.c --- mutt-1.5.21/buffy.c 2010-09-13 17:19:55.000000000 +0000 +++ mutt-1.5.20/buffy.c 2009-06-02 17:16:26.000000000 +0000 @@ -45,8 +45,6 @@ static short BuffyCount = 0; /* how many boxes with new mail */ static short BuffyNotify = 0; /* # of unnotified new boxes */ -static BUFFY* buffy_get (const char *path); - /* Find the last message in the file. * upon success return 0. If no message found - return -1 */ @@ -193,23 +191,6 @@ return; } -static BUFFY *buffy_new (const char *path) -{ - BUFFY* buffy; - - buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY)); - strfcpy (buffy->path, path, sizeof (buffy->path)); - buffy->next = NULL; - buffy->magic = 0; - - return buffy; -} - -static void buffy_free (BUFFY **mailbox) -{ - FREE (mailbox); /* __FREE_CHECKED__ */ -} - int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *err) { BUFFY **tmp,*tmp1; @@ -228,7 +209,7 @@ for (tmp = &Incoming; *tmp;) { tmp1=(*tmp)->next; - buffy_free (tmp); + FREE (tmp); /* __FREE_CHECKED__ */ *tmp=tmp1; } return 0; @@ -255,15 +236,23 @@ { if(*tmp) { + FREE (&((*tmp)->path)); tmp1=(*tmp)->next; - buffy_free (tmp); + FREE (tmp); /* __FREE_CHECKED__ */ *tmp=tmp1; } continue; } if (!*tmp) - *tmp = buffy_new (buf); + { + *tmp = (BUFFY *) safe_calloc (1, sizeof (BUFFY)); + strfcpy ((*tmp)->path, buf, sizeof ((*tmp)->path)); + (*tmp)->next = NULL; + /* it is tempting to set magic right here */ + (*tmp)->magic = 0; + + } (*tmp)->new = 0; (*tmp)->notified = 1; @@ -285,96 +274,20 @@ return 0; } -/* returns 1 if maildir has new mail */ -static int buffy_maildir_hasnew (BUFFY* mailbox) -{ - char path[_POSIX_PATH_MAX]; - DIR *dirp; - struct dirent *de; - char *p; - int rc = 0; - struct stat sb; - - snprintf (path, sizeof (path), "%s/new", mailbox->path); - - /* when $mail_check_recent is set, if the new/ directory hasn't been modified since - * the user last exited the mailbox, then we know there is no recent mail. - */ - if (option(OPTMAILCHECKRECENT)) - { - if (stat(path, &sb) == 0 && sb.st_mtime < mailbox->last_visited) - return 0; - } - - if ((dirp = opendir (path)) == NULL) - { - mailbox->magic = 0; - return 0; - } - - while ((de = readdir (dirp)) != NULL) - { - if (*de->d_name == '.') - continue; - - if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) - { - if (option(OPTMAILCHECKRECENT)) - { - char msgpath[_POSIX_PATH_MAX]; - - snprintf(msgpath, sizeof(msgpath), "%s/%s", path, de->d_name); - /* ensure this message was received since leaving this mailbox */ - if (stat(msgpath, &sb) == 0 && (sb.st_ctime <= mailbox->last_visited)) - continue; - } - /* one new and undeleted message is enough */ - mailbox->new = 1; - rc = 1; - break; - } - } - - closedir (dirp); - - return rc; -} - -/* returns 1 if mailbox has new mail */ -static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) -{ - int rc = 0; - int statcheck; - - if (option (OPTCHECKMBOXSIZE)) - statcheck = sb->st_size > mailbox->size; - else - statcheck = sb->st_mtime > sb->st_atime - || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); - if (statcheck) - { - if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) - { - rc = 1; - mailbox->new = 1; - } - } - else if (option(OPTCHECKMBOXSIZE)) - { - /* some other program has deleted mail from the folder */ - mailbox->size = (off_t) sb->st_size; - } - if (mailbox->newly_created && - (sb->st_ctime != sb->st_mtime || sb->st_ctime != sb->st_atime)) - mailbox->newly_created = 0; - - return rc; -} +/* people use check_mbox_size on systems where modified time attributes are + * BADLY broken. Ignore them. + */ +#define STAT_CHECK_SIZE (sb.st_size > tmp->size) +#define STAT_CHECK_TIME (sb.st_mtime > sb.st_atime || (tmp->newly_created && sb.st_ctime == sb.st_mtime && sb.st_ctime == sb.st_atime)) +#define STAT_CHECK (option(OPTCHECKMBOXSIZE) ? STAT_CHECK_SIZE : STAT_CHECK_TIME) int mutt_buffy_check (int force) { BUFFY *tmp; struct stat sb; + struct dirent *de; + DIR *dirp; + char path[_POSIX_PATH_MAX]; struct stat contex_sb; time_t t; @@ -401,11 +314,14 @@ #ifdef USE_IMAP BuffyCount += imap_buffy_check (force); -#endif + if (!Context || Context->magic != M_IMAP) +#endif +#ifdef USE_POP + if (!Context || Context->magic != M_POP) +#endif /* check device ID and serial number instead of comparing paths */ - if (!Context || Context->magic == M_IMAP || Context->magic == M_POP - || stat (Context->path, &contex_sb) != 0) + if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0) { contex_sb.st_dev=0; contex_sb.st_ino=0; @@ -413,44 +329,99 @@ for (tmp = Incoming; tmp; tmp = tmp->next) { +#ifdef USE_IMAP + if (tmp->magic != M_IMAP) +#endif + tmp->new = 0; + +#ifdef USE_IMAP if (tmp->magic != M_IMAP) { - tmp->new = 0; +#endif #ifdef USE_POP - if (mx_is_pop (tmp->path)) - tmp->magic = M_POP; - else + if (mx_is_pop (tmp->path)) + tmp->magic = M_POP; + else #endif - if (stat (tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) || - (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) - { - /* if the mailbox still doesn't exist, set the newly created flag to - * be ready for when it does. */ - tmp->newly_created = 1; - tmp->magic = 0; - tmp->size = 0; - continue; - } + if (stat (tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) || + (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) + { + /* if the mailbox still doesn't exist, set the newly created flag to + * be ready for when it does. */ + tmp->newly_created = 1; + tmp->magic = 0; + tmp->size = 0; + continue; + } +#ifdef USE_IMAP } +#endif /* check to see if the folder is the currently selected folder * before polling */ if (!Context || !Context->path || - (( tmp->magic == M_IMAP || tmp->magic == M_POP ) - ? mutt_strcmp (tmp->path, Context->path) : - (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino))) +#if defined USE_IMAP || defined USE_POP + (( +#ifdef USE_IMAP + tmp->magic == M_IMAP +#endif +#ifdef USE_POP +#ifdef USE_IMAP + || +#endif + tmp->magic == M_POP +#endif + ) ? mutt_strcmp (tmp->path, Context->path) : +#endif + (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino) +#if defined USE_IMAP || defined USE_POP + ) +#endif + ) + { switch (tmp->magic) { case M_MBOX: case M_MMDF: - if (buffy_mbox_hasnew (tmp, &sb) > 0) + + if (STAT_CHECK) + { BuffyCount++; + tmp->new = 1; + } + else if (option(OPTCHECKMBOXSIZE)) + { + /* some other program has deleted mail from the folder */ + tmp->size = (off_t) sb.st_size; + } + if (tmp->newly_created && + (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) + tmp->newly_created = 0; + break; case M_MAILDIR: - if (buffy_maildir_hasnew (tmp) > 0) - BuffyCount++; + + snprintf (path, sizeof (path), "%s/new", tmp->path); + if ((dirp = opendir (path)) == NULL) + { + tmp->magic = 0; + break; + } + while ((de = readdir (dirp)) != NULL) + { + char *p; + if (*de->d_name != '.' && + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { + /* one new and undeleted message is enough */ + BuffyCount++; + tmp->new = 1; + break; + } + } + closedir (dirp); break; case M_MH: @@ -477,11 +448,13 @@ BUFFY *tmp; char path[_POSIX_PATH_MAX]; char buffylist[2*STRING]; - size_t pos = 0; - int first = 1; + int pos; + int first; int have_unnotified = BuffyNotify; + pos = 0; + first = 1; buffylist[0] = 0; pos += strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ for (tmp = Incoming; tmp; tmp = tmp->next) @@ -493,7 +466,7 @@ strfcpy (path, tmp->path, sizeof (path)); mutt_pretty_mailbox (path, sizeof (path)); - if (!first && (COLS - 7 >= 0) && (pos + strlen (path) >= (size_t)COLS - 7)) + if (!first && pos + strlen (path) >= COLS - 7) break; if (!first) @@ -525,18 +498,6 @@ return (0); } -void mutt_buffy_setnotified (const char *path) -{ - BUFFY *buffy; - - buffy = buffy_get(path); - if (!buffy) - return; - - buffy->notified = 1; - time(&buffy->last_visited); -} - int mutt_buffy_notify (void) { if (mutt_buffy_check (0) && BuffyNotify) @@ -581,30 +542,3 @@ /* no folders with new mail */ *s = '\0'; } - -/* fetch buffy object for given path, if present */ -static BUFFY* buffy_get (const char *path) -{ - BUFFY *cur; - char *epath; - - if (!path) - return NULL; - - epath = safe_strdup(path); - mutt_expand_path(epath, mutt_strlen(epath)); - - for (cur = Incoming; cur; cur = cur->next) - { - /* must be done late because e.g. IMAP delimiter may change */ - mutt_expand_path (cur->path, sizeof (cur->path)); - if (!mutt_strcmp(cur->path, path)) - { - FREE (&epath); - return cur; - } - } - - FREE (&epath); - return NULL; -} diff -Nru mutt-1.5.21/buffy.h mutt-1.5.20/buffy.h --- mutt-1.5.21/buffy.h 2010-09-13 17:19:55.000000000 +0000 +++ mutt-1.5.20/buffy.h 2009-04-30 05:36:16.000000000 +0000 @@ -29,7 +29,6 @@ short notified; /* user has been notified */ short magic; /* mailbox type */ short newly_created; /* mbox or mmdf just popped into existence */ - time_t last_visited; /* time of last exit from this mailbox */ } BUFFY; @@ -44,6 +43,3 @@ /* fixes up atime + mtime after mbox/mmdf mailbox was modified according to stat() info taken before a modification */ void mutt_buffy_cleanup (const char *buf, struct stat *st); - -/* mark mailbox just left as already notified */ -void mutt_buffy_setnotified (const char *path); diff -Nru mutt-1.5.21/ChangeLog mutt-1.5.20/ChangeLog --- mutt-1.5.21/ChangeLog 2010-09-15 17:09:58.000000000 +0000 +++ mutt-1.5.20/ChangeLog 2009-06-14 18:53:55.000000000 +0000 @@ -1,1154 +1,4 @@ -2010-09-15 10:05 -0700 Michael Elkins (54e3139a0362) - - * safe_asprintf.c: suppress check_sec errors - -2010-09-13 17:25 -0700 Michael Elkins (20b2d496349f) - - * init.h: make $mail_check_recent set by default - -2010-09-13 19:00 +0100 Emanuele Giaquinta (fea3860ff672) - - * imap/command.c: Restore the previous behaviour of checking for new - messages in imap folders when mail_check_recent is set. - -2010-09-12 19:54 -0700 Michael Elkins (a51df78218e8) - - * buffy.c, buffy.h, imap/command.c, init.h, mbox.c, mutt.h: add - $mail_check_recent boolean to control whether Mutt will notify about - all new mail, or just new mail received since the last visit to a - mailbox - - closes #3271 - - partly addresses #3310 - - * smime.c: fix crash when index contains 0 keys - -2010-09-11 07:34 -0700 Michael Elkins (0f962f1a6bbb) - - * send.c: Allow setting message security in send2-hook - - This patch delays checking the message security options until after - the user has an initial chance to edit the message. This allows the - security options to be set in a send2-hook when using $edit_headers. - Without this patch, the user has no way of automatically setting - security based on recipients since the to/cc prompts are bypassed. - - The other change in behavior is if the user happened to use a - send2-hook to see if the message had security applied *prior* to - editing the message, that no longer works. - - * keymap.c, keymap.h, main.c: support for ncurses extension allowing - binding to function keys with modifiers - - * keymap.c: allow octal codes with more than three digits - - * crypt-gpgme.c, mime.h, pgp.c, recvattach.c, sendlib.c: add DISPNONE - to mean no preferred Content-Disposition; make pgp-signature parts - DISPNONE for multipart/signed - - * recvcmd.c: fix problem with reply-hook not working when a - message/rfc822 attachment is selected - - * rfc2047.c: more lenient RFC2047 decoding: accept illegal spaces and - bare question marks in encoded words - - * curs_main.c, mx.c: fix crash when new mail is received during IMAP - IDLE - - closes #3335 - -2010-08-25 00:30 +0100 Emanuele Giaquinta (5302767aa6aa) - - * rfc2047.c: Use mutt_substrdup in rfc2047_decode_word - -2010-08-24 16:40 -0700 Michael Elkins (92b02f77e780) - - * rfc2047.c: detect failure to decode word and copy raw string - instead; avoids calling strlen() on uninitialized memory - - closes #2923 - -2010-08-24 18:39 +0100 Emanuele Giaquinta (ebd4beafe5eb) - - * mutt_ssl.c: Fix typo. - - * browser.c, hook.c, init.c, menu.c, mutt_ssl_gnutls.c, pager.c: Do - not call regfree if regcomp fails. The content of the regex_t - structure is undefined in this case. - - * curs_lib.c, mutt_ssl_gnutls.c: use REGCOMP() macro - -2010-08-24 10:03 -0700 Michael Elkins (5d59c8b737ba) - - * init.c: add REG_ICASE accidentally removed in changeset 1a35f096c8cb - - * muttlib.c: do not print debug message on ENOENT - -2010-08-14 09:18 -0700 Michael Elkins (04fd8ddea579) - - * url.c: avoid c99 syntax for backwards compat - -2010-08-06 21:52 +0200 Matthias Andree (24a7b1aa2e55) - - * buffy.c: Fix comparison signedness warnings. - -2010-08-12 16:04 -0700 Michael Elkins (ced5d3dca974) - - * imap/util.c: Fix bug in imap_keepalive() which erroneously free - Context when the IMAP connection is shut down by the server. - - Closes #3410 - - * url.c: url_parse_mailto should return 0 on success - - fix memory leak errors when unable to parse mailto: URL - - closes #3441 - - * mh.c: always update message body size when parsing a maildir message - - * safe_asprintf.c: call va_end() even when vasprintf returns <0 - -2010-08-09 20:48 -0700 Michael Elkins (6572e8bcd723) - - * Makefile.am, imap/message.c, lib.c, lib.h, safe_asprintf.c: rename - mutt_sprintf() to safe_asprintf() to match the GNU extension that - performs a similar task - -2010-08-09 10:27 -0700 Vincent Lefevre (e86ee9991dc3) - - * postpone.c: In postpone.c, function mutt_num_postponed, the old - {{{OldPostponed}}} is never freed. - - closes #3442 - -2010-08-09 09:38 -0700 Michael Elkins (8051fc8b631c) - - * send.c: clear the real name when $reverse_realname is unset and a - match is hit so that $realname can be set in a reply- or send-hook - - closes #3427 - - * doc/manual.xml.head: fix example of mailto: use on the command line - - * pager.c: fix buffer underrun when processing ANSI escape sequences - - closes #3371 - -2010-08-08 12:29 -0700 Michael Elkins (4dcf19c58139) - - * doc/manual.xml.head, doc/mutt.man: document support for mailto: URLs - on the command line - - closes #3400 - - * imap/message.c: avoid error when the user has requested many extra - headers via IMAP - - closes #3435 - - * lib.c, lib.h: add a malloc+sprintf combo function - -2010-08-08 10:21 -0700 Fabian Groffen (d4d703e21cdd) - - * pattern.c: fix crash in limit when user enters invalid regexp - - closes #3417 - -2010-08-07 06:44 -0700 Michael Elkins (cc881d855f05) - - * mutt_ssl.c: Fix comparison signedness warnings - - * pop_lib.c: add comment about safety of cast - -2010-08-06 21:58 +0200 Matthias Andree (55f50b2db1f8) - - * pop_lib.c: Fix comparison signedness warning. - - * status.c: Fix signedness warning. - - * .hgignore: Ignore backup files ending in a tilde character. - - * url.c: Fix comparison signedness warnings. - - * gnupgparse.c, pop_auth.c: Fix comparison signedness warnings. - - * lib.h: Resolve if/else empty body ambiguity/warnings when compiling - without DEBUG. - -2010-08-06 17:08 -0700 Michael Elkins (5b15d4d96277) - - * configure.ac, init.c, protos.h: detect availablity of 'long long' - - cast time_t to 'long long' prior to bitshifting since it can be a - float value according to POSIX.1-2008 - - closes #3439 - -2010-08-06 21:22 +0200 Matthias Andree (bf13863e682e) - - * md5.c: Drop declaration for unused argv/argc parameters. - - Fixes GCC warning with -Wextra. - -2010-08-06 13:11 -0700 Michael Elkins (998ca956b41b) - - * init.c, muttlib.c: use a 64-bit random value in temporary filenames. - - closes #3158 - - * browser.c: avoid using C99 bool - - * browser.c, init.h: add %D format string to $folder_format to expand - the time based on $date_format. - - properly set the locale for LC_TIME prior to calling strftime() - closes #1734 closes #3406 - - * mutt_ssl.c: fix compiler warning about wrong type for - SslSessionCerts - -2010-08-06 09:58 +0200 Matthias Andree (473fbe29f626) - - * mutt_ssl.c: Unbreak X.509 SubjAltName checks, - - regression in 6016:dc09812e63a3 that calls strlen on an SSL sk - rather than its string payload. - - closes #3426 - -2010-08-06 07:12 -0700 Michael Elkins (4ae33a8a1391) - - * configure.ac: properly set _XOPEN_SOURCE to 600 (POSIX.1-2004) when - detecting th wc*() functions - - closes #3341 - -2010-08-05 21:57 -0700 Michael Elkins (bc5fb152e2ba) - - * mbox.c: when parsing From_ lines in mmdf/mbox, the TZ should be - computed based on the time in the string rather than the current - time, otherwise DST issues cause the computed time to be wrong. - - closes #2177 - - * thread.c: explanatory comments - -2010-08-05 17:03 -0700 andreas (0666d9588eac) - - * curs_main.c, functions.h: do not leave pager when changing sort - order. - - closes #2143 - -2010-08-05 16:47 -0700 Michael Elkins (57d4b3839172) - - * curs_main.c: do not leave pager when using read-thread and read- - subthread - - closes #2137 - -2010-08-04 17:04 -0700 Petr Písař (59ca5d7b1656) - - * ChangeLog, po/cs.po: Updated Czech translation - -2010-08-04 06:37 -0700 Vincent Lefevre (a7f05f29d9bc) - - * po/fr.po: updated French translation - -2010-08-03 10:10 -0700 Michael Elkins (2c42f4760c8f) - - * browser.c: add locale.h for compililng with -std=c99 - - * main.c: adjust help for -a to make it clearer that -- is required - terminator - -2010-07-31 08:21 -0700 Michael Elkins (7cd85c18bfaf) - - * muttlib.c: Fix buffer underflow in expansion of format pipes. Add - better error detection. - - Closes #3432. - -2010-07-18 14:24 -0700 Michael Elkins (1a35f096c8cb) - - * init.c: use REGCOMP() macro - -2010-07-18 22:09 +0100 Emanuele Giaquinta (d0e0d174d620) - - * init.c: Skip 'attachments' directive if minor type is not a valid - regexp - -2010-07-09 11:07 -0700 Joel Dahl (6b13e8319c1f) - - * po/sv.po: fix misspelling in Swedish translation - -2010-05-18 08:39 -0700 Michael Elkins (29e37994a536) - - * send.c: Consider any negative return value from send_message() to be - an error and allow the user to resend. - - Closes #3411. - -2010-04-24 16:10 -0700 Brendan Cully (4cd2daafd03b) - - * mutt_ssl.c: openssl: only call SSL_shutdown during clean - shutdown (closes #3407) - -2010-04-22 09:14 -0700 Vincent Lefevre (6ebdfd09abc1) - - * po/fr.po: updated French translation - -2010-04-14 15:47 -0700 Michael Elkins (15b9d6f3284f) - - * pgp.c: remove toggle and replace with format in pgp-menu - -2010-04-12 15:13 -0500 David Champion (41a46373ddd9) - - * compose.c: Improve clarity/uniformity in compose menu's crypto - display - - Incorporates feedback on "Security: None" key hints. - -2010-04-13 06:49 -0700 Michael Elkins (4d798ee2898e) - - * muttlib.c: fix bug handling wide pad char in soft-fill mode - -2010-04-11 20:00 -0700 Michael Elkins (2cd62f40d840) - - * compose.c: increase size of buffer used for displaying addresses in - the compose menu to avoid truncating on widescreen displays - - * curs_lib.c: clear prompt when user cancels with ^G from a yes/no - prompt - - * muttlib.c: Fix bug in soft-fill (%*) in $index_format not accounting - for 'set arrow_cursor' - - * pgp.c: Remove the (i) option from the PGP-menu when encryption or - signing is not yet selected. The toggle between PGP/MIME and - Traditional doesn't make sense unless some type of security has been - requested. - - Closes #3402. - -2010-04-06 09:47 -0700 Michael Elkins (889aa698cc49) - - * configure.ac, muttlib.c: fix for compiling Mutt with clang: check - for wchar_h prior to wctype_h in check for wc funcs - -2010-04-05 11:12 -0700 Michael Elkins (844174efa648) - - * doc/manual.xml.head: [doc] Remove bogus -group parameter from - unlists and unsubscribe commands; add links to address group section - for context. - -2010-04-03 20:34 -0700 Michael Elkins (cf97505addf8) - - * init.c: prevent user from setting $charset to an empty string since - other code requires it to be set to a valid string - - closes #3326 - - * pager.c: allow regexps to match on continuation header lines in - 'color header' commands. - - closes #3373 - - * pattern.c: Fix crash on invalid regexp in search string due to - uninitialized BUFFER variable. - - Closes #3401 - -2010-04-01 10:10 -0700 Simon Ruderich (b9baa0234846) - - * attach.c, commands.c, filter.c, muttlib.c, send.c: fix comment typos - -2010-04-01 09:59 -0700 Michael Elkins (96ed7cdacdc6) - - * init.h: Improve documentation for $query_command to note that Mutt - automatically adds quotes according to shell quoting rules (thx: - Simon Ruderich). - - * doc/manual.xml.head: Clarify the documentation on what the line- - editor is (thx: Simon Ruderich) - -2010-03-31 08:50 -0700 Michael Elkins (7e9e31b1bd7b) - - * muttlib.c: avoid buffer overflow when expanding the format string - associated with a 'spam' command. - - closes #3397 - -2010-03-23 16:03 -0700 Michael Elkins (fe29d691deff) - - * doc/muttrc.man.head: remove errant commands in secton on setting - alternates - -2010-03-22 22:16 -0700 Brendan Cully (69e9a1a0ba2f) - - * sendlib.c: Fix a format string warning - -2010-03-22 20:02 -0700 Marcel Telka (f544730656c1) - - * compose.c: redraw entire screen when exiting editor after re-editing - the message body in the send menu. - - closes #3393. - -2010-03-21 09:52 -0700 Michael Elkins (0a29e3f4f4b9) - - * sendlib.c: Do not assume whitespace follows the colon in a header - field. - - Closes #3385. - -2010-03-08 15:13 -0800 Brendan Cully (ad6d799951cb) - - * configure.ac: Comment about search libsasl for sasl2 functions - -2010-03-08 14:04 -0600 Will Fiveash (b92b9c6a1c85) - - * configure.ac: OpenSolaris sasl fix for configure.ac - -2010-03-08 15:00 -0800 Brendan Cully (05cec973f0d9) - - * pattern.c: When regexp compilation fails, report actual pattern - along with error. - - * muttlib.c: mutt_buffer_printf: NULL dptr means use data - - * pattern.c: If regcomp fails, assume rx has not been allocated. Fixes - a core dump for save-hook '~f foo\.bar@(something|other)\.com' =foo. - -2010-03-02 11:31 -0800 TAKAHASHI Tamotsu (fec2720ff6ef) - - * rfc822.c: Fix #2014. Thanks to Vincent Lefevre for help - with this one. - -2010-03-02 11:16 -0800 Brendan Cully (41cf44ddbb4c) - - * copy.c: Fix thinko in [cc02f079b1b9] - -2010-03-01 22:40 -0800 Brendan Cully (cc02f079b1b9) - - * copy.c: Guard dequote with NULL check on personal field - - * copy.c, rfc822.c, rfc822.h: Another attempt to dequote - RFC2047-encoded address comments (see #2014) - - * rfc822.c: Backed out changeset 2a4ca6917fd0. It is incompatible with - $assumed_charset (see #2014). - -2010-02-28 23:03 -0800 Brendan Cully (2a4ca6917fd0) - - * rfc822.c: RFC-2047 decode address text before dequoting it (see - #2014) - - * doc/manual.xml.head: Fix next-unread-mailbox name in - documentation. Closes #3319. - -2010-02-28 17:23 -0800 Antonio Radici (25459cbb132a) - - * po/de.po: Fix German translation of "No undeleted messages." (closes - #3372) - - * pop_lib.c: pop: allow user-specified port to override - default in URL. Closes #3322. - -2010-02-28 17:00 -0800 ludwig (2c78b28027cc) - - * crypt-gpgme.c: GPGME: Sender verification should be canse- - insensitive for domain names. Closes #2180 - -2010-02-26 18:18 -0800 Brendan Cully (40eca68c394a) - - * UPDATING, init.h: Make $thorough_search default to yes - (closes #3386) - -2010-02-23 12:42 -0800 Brendan Cully (57124ea5592e) - - * commands.c: Don't use freed ctx.path when updating utime of target - mailbox in save-message. Thanks to Sean Boudreau for the bug report. - -2010-02-22 23:01 -0800 Vincent Lefevre (f17302c10229) - - * po/fr.po: Updated French translation. - -2010-02-21 13:16 -0800 Brendan Cully (a6fddecdc5f5) - - * curs_lib.c: Make mutt_yesorno use mutt_message to print query. - Closes #3352. - -2010-02-20 21:56 -0800 Gregory Shapiro (f723e07c8e6d) - - * OPS, UPDATING, curs_main.c, functions.h: Add imap-logout- - all to log out of all IMAP connections. Closes #2880. - -2010-02-17 00:47 -0800 Simon Ruderich (260d39279161) - - * doc/manual.xml.head: Document 'n' and 'o' flags in index - - * doc/devel-notes.txt, doc/muttrc.man.head, init.h, - rfc1524.c: Spelling fixes - -2010-02-10 23:29 -0800 Brendan Cully (b7ec848af36b) - - * doc/manual.xml.head: Fix a typo (closes #3379) - -2010-02-01 23:40 -0800 Antonio Radici (e9965b78e92d) - - * po/sv.po: The Swedish translation has a suboptimal - translation of the word "Bad" in several places. The proposed patch - substitutes Dålig (which implies bad "as in quality", and not bad - "as in error") for Felaktig (erroneous). - - Closes #3370. - - * init.h: Small fix to the muttrc manpage. Closes #3374 - -2010-01-13 19:12 +0100 Matthias Andree (e2c60de29015) - - * configure.ac: Fix hcache build on systems with $(EXEEXT), include it - in mutt_md5. - -2009-12-29 00:33 -0500 Brendan Cully (31881f38ca1e) - - * curs_lib.c: Hack mutt_wstr_trunc to treat M_TREE characters as 1 - cell. Closes #3364. - -2009-12-28 22:13 -0500 Brendan Cully (359de549b2d1) - - * doc/manual.xml.head: Remove spurious quotes from query_command - example. Closes #3365. - -2009-12-14 10:24 -0800 Brendan Cully (736b6af3c5f1) - - * rfc1524.c: Fix off-by-one errors in mailcap parser. - Closes #3362 - -2009-12-10 22:52 -0800 Daniel Jacobowitz (b7d2cb7c7ce1) - - * hcache.c: Do not store header color in hcache. If the color - directive is removed from muttrc, the cached value from the last - directive would otherwise still be in effect. - -2009-12-07 23:08 -0800 Patrick Welche (1cf34ea1f128) - - * mutt_ssl.c: STACK* is not defined with newer SSL, use - STACK_OF instead. Closes #3356. - -2009-12-07 22:46 -0800 Peter Rosin (fc9563de3dcb) - - * snprintf.c: Output %p as unsigned in the bundled snprintf - -2009-11-14 14:31 -0800 Brendan Cully (6928f522ac48) - - * curs_main.c: Back out e67f4c347bb4. - - I could not reproduce the problem, and the change makes it - impossible to change to a real folder when no folder is currently - open. - -2009-10-28 23:03 -0700 Brendan Cully (89fb586edda2) - - * sendlib.c: Unfold headers to wrap length in pager, when weed is set. - - From Rocco's patch queue. - -2009-09-22 23:29 -0700 Antonio Radici (5037c59a589e) - - * po/it.po: Correct Italian translation of y/n/a prompt. - Closes #3336 - -2009-08-27 22:10 -0700 Petr Písař (605559e4f88f) - - * po/cs.po: Updated Czech translation. - -2009-08-20 11:34 +0200 René Clerc (6b48ff4e69a3) - - * doc/manual.xml.head: No-brain documentation typo fix - -2009-08-20 11:33 +0200 Rocco Rutte (e196cfc00105) - - * doc/manual.xml.head: Backed out changeset c9dd93b09ce7 - -2009-08-20 11:25 +0200 René Clerc (c9dd93b09ce7) - - * doc/manual.xml.head: No-brain documentation typo fix Hi Rocco, - - Attached a patch for the documentation that fixes a small typo I - stumbled upon. If you'd rather have me opening a trac ticket, - please say so; since this is such a no-brainer I figured I'd e-mail - you directly. - -2009-08-17 17:07 +0200 Rocco Rutte (d0fce0eec0b3) - - * doc/manual.xml.head, doc/muttrc.man.head, init.h: Doc: fix more - typos - - * doc/Makefile.am, doc/mutt.pwl: Doc: fix aspell calls, add - custom mutt-only wordlist - - * curs_main.c: Require already opened folder when using templates for - change-folder. - - For example, start with -y and type a wrong IMAP password so that no - mailbox is open. Trying to change folders resulted in a crash. - -2009-08-14 21:29 +0200 Rocco Rutte (6a08a5244d60) - - * pattern.c: Clear last search pattern if it's invalid. - Closes #3315. - - We keep both, the string version and compiled version around for - search-next; however, in case of parsing errors we dropped only the - compiled version and not the string one making the code attempting - to perform a search using a NULL pattern. - - * pattern.c: Bail on missing pattern modifiers at end of pattern. - Closes #3314. - -2009-08-13 23:49 +0200 Rocco Rutte (f8d50e968853) - - * doc/Muttrc.head, doc/manual.xml.head, init.h: Docs: fix - typos/style - -2009-08-11 12:22 -0700 Tomas Hoger (dc09812e63a3) - - * mutt_ssl.c: Catch SSL null prefix attach (openssl) - -2009-08-09 14:45 -0700 Brendan Cully (002b4676d502) - - * buffy.c: Add buffy_new and buffy_free abstractions. - -2009-08-09 14:53 +0200 Christian Ebert (0153dbc12dc4) - - * doc/manual.xml.head: manual: fix wrong spell checker assumptions - -2009-08-09 14:35 +0200 Rocco Rutte (59b4c73e7254) - - * doc/manual.xml.head: Manual: Fix typos, consequently use - en_US spelling - -2009-08-08 22:50 -0700 Brendan Cully (d4ea7f571f10) - - * buffy.c: Split out mailbox-specific code in mutt_buffy_check - - * buffy.c, muttlib.c, mx.c, mx.h, status.c: Unconditionally define - M_IMAP, M_POP. These aren't bloat, and not having them creates a lot - of #ifdef clutter. - - * curs_lib.c: Abort prompt on ^C, as was the case prior to - 12a6de725483 - -2009-08-04 10:47 -0700 Vincent Lefevre (15a695678b7b) - - * po/fr.po: Updated French translation. - -2009-08-04 12:34 +0200 Rocco Rutte (25c2d70f2f00) - - * doc/manual.xml.head: Manual: Add some words of warning to really - remove IRT header when intended - - * doc/manual.xml.head: Manual: Put mailbox shortcuts into - table for readability - - * doc/manual.xml.head: Manual: Fix docs for push/exec - -2009-08-04 12:08 +0200 Johan D (14bb498c6a1c) - - * mh.c: Fix MH parsing, fixes [0698e8195545]. Closes #3312 - -2009-08-01 15:16 +0200 Rocco Rutte (29727d19634a) - - * doc/manual.xml.head: Manual: use full names for é and - è entities. Closes #3286. - - This is necessary because we want to install a us-ascii manual.txt - that would contain only "e" instead of accented characters. - -2009-07-30 17:56 +0200 Rocco Rutte (4a572310c3b5) - - * main.c: Fix mutt -h output for -a/-- options - -2009-07-29 13:26 -0700 Brendan Cully (a2a4286491b4) - - * hcache.c, hcache.h, imap/util.c: Harmonize hcache uidvalidity size - to unsigned int (per IMAP RFC). Closes #3296. - -2009-07-28 23:16 +0200 Rocco Rutte (153eac9e03e7) - - * Makefile.am: Add group.h to distribution - - * group.c, group.h, init.c, rfc822.c: Fix some issues with - ungroup [...] * - -2009-07-27 21:14 -0700 Kees Cook (2fc9348684fe) - - * mh.c: Properly propagate mh_read_sequences result. Closes #3308. - -2009-07-27 20:49 -0700 Brendan Cully (5c076ed18883) - - * configure.ac: Do not overwrite docdir unless --with- - docdir was explicitly given. This allows --docdir from autoconf - 2.60+ to work, though if given --with-docdir will silently override - --docdir. Closes #3282. - -2009-07-24 14:30 +0200 Rocco Rutte (86e066a206ac) - - * po/de.po: Update German translation - - * init.c: Fix check_sec.sh warning - -2009-07-23 23:36 -0400 Aron Griffis (0ee27568ad09) - - * init.c: fix :reset to work with empty strings - - Signed-off-by: Aron Griffis - -2009-07-23 23:32 -0700 Vincent Lefevre (223020f50cb7) - - * po/fr.po: Updated French translation. - -2009-07-23 23:51 +0200 Matthias Andree (1e77b368ef55) - - * charset.h, rfc2047.c: Use proper prototype for - mutt_get_default_charset(), fix fallout. - - * bcache.c, charset.c: Fix two warnings "the address of 'foo' will - always evaluate as 'true'". - -2009-07-23 17:28 +0200 Rocco Rutte (1597c2074a52) - - * doc/manual.xml.head: Manual: better document what address - groups are (for) - - * group.c, group.h, init.c, init.h, pattern.c, protos.h, rfc822.c, - rfc822.h: Implement ungroup command. Closes #3304. - - * init.c, mutt.h, muttlib.c: Move remove_from_rx_list() to muttlib.c, - name it mutt_remove_from_rx_list() - -2009-07-22 15:25 +0200 Fabian Groffen (d41e043fa775) - - * keymap.c: Use CRYPT_BACKEND_GPGME instead of non-existent - HAVE_GPGME - -2009-07-22 14:43 +0200 kees (848f08512bf3) - - * hcache.c, rfc822.h: Properly restore addresses from hcache using - rfc822_new_address(). Closes #3302. - - * mh.c: Don't leak mhs flags in mh_buffy(). Closes #3303. - -2009-07-17 17:57 -0400 Aron Griffis (a3c4b605cfad) - - * UPDATING: add batch mode send-hooks note to UPDATING - -2009-07-14 20:25 -0700 Aron Griffis (084fb086a0e7) - - * send.c: Make send-hooks work for batch mode. Closes - #3219. - - Handle SENDBATCH inline with the normal sending code, instead of - handling it separately. This allows send-hooks to run, along with - removing a number of unnecessarily lines of code. - -2009-07-11 14:52 +0200 Rocco Rutte (6f942afe60b5) - - * charset.c, mbyte.c: Recognize charset extensions, see #3150. - - With utf-8//TRANSLIT, we internally didn't recognize it as utf-8. - This leads to badly broken behaviour if --without-wc-funcs is used - for some reason. In that case, if we have utf-8 as charset, we - implement our own wide char functions; for all other charsets, we - use the system single-byte locale functions. And using these with - utf-8 is broken. - - * curs_lib.c: Render blanks to spaces in index, fixes - [298194c414f0] - - wcwidth() returns -1 so 'foobar' was rendered to 'foobar', - and now to 'foo bar'. Closes #3270 again. - -2009-07-08 13:37 +0200 Rocco Rutte (f22b71d8005a) - - * mbyte.c: Fix compiler warning - -2009-07-07 15:03 +0200 Rocco Rutte (d5e03a46518c) - - * TODO: Update TODO - -2009-07-07 10:49 +0200 Matthias Andree (cc4d6044b31e) - - * INSTALL: GNU-make based VPATH builds work. - -2009-07-07 13:16 +0200 Rocco Rutte (f161c2f00d84) - - * UPDATING, bcache.c, doc/manual.xml.head, hcache.c, - muttlib.c, protos.h: Make hcache+bcache paths always UTF-8. Closes - #3284. - - * UPDATING, globals.h, init.h, sendlib.c: Add $wrap_headers. Closes - #3135 - - * doc/manual.xml.head: Manual: mention terminal setup for - charsets, more unicode pros. - - Closes #3292. - -2009-07-06 15:28 +0200 Rocco Rutte (ccab6c56b557) - - * doc/manual.xml.head: Manual: Add a note about when/why to use utf-8 - -2009-07-05 18:36 -0700 Brendan Cully (118b8fef8aae) - - * buffy.c, buffy.h, mx.c: Suppress new mail notification - from mailbox just left. Closes #3290. - -2009-07-02 20:42 +0200 Rocco Rutte (042f2ce0b870) - - * doc/manual.xml.head: Manual: minor fixes - - * doc/manual.xml.head, doc/mutt.css: Manual: Render - comments in examples a lighter for readability - - * doc/manual.xml.head, doc/manual.xml.tail: Manual: Reformat - paragraphs, fix ˜ -> ~ breakage - - * doc/manual.xml.head: Manual: rework MIME chapter a bit - - * doc/gen-map-doc, doc/manual.xml.tail, functions.h: Manual: Generate - more pretty titles/ids for key binding tables - - * doc/manual.xml.head: Manual: fix supported version - numbers for mixmaster - -2009-07-02 00:06 -0700 Brendan Cully (029ba140fb48) - - * curs_main.c: Handle keepalive failure when changing folders. There - are probably many other places where this kind of thing could happen - though. See #3028. - -2009-07-01 18:13 -0700 Rocco Rutte (f6c6066a5925) - - * account.c, mutt_sasl.c, smtp.c: Make getuser/pass abort - if input is required in batch mode. Replaces [0a3de4d9a009]. See - #3289. - - * doc/manual.xml.head: Manual: Add detailed section on charset - handling - - * smtp.c: SMTP: use $smtp_pass in batch mode. Closes #3289. - - mutt_account_getpass() copying the password from $smtp_pass into the - account structure is only called from the SASL callback we only use - if we're sure we don't need curses (i.e. have the pass already). - -2009-06-30 17:32 +0200 Rocco Rutte (f4baa2f1251a) - - * pgpewrap.c: Add missing config.h include to pgpewrap.c - - It technically doesn't need it, but pgpewrap should be rebuilt after - configure ran, too. - - * doc/Makefile.am: Manual: Run lynx with --display_charset - =us-ascii, see #3286. - -2009-06-29 18:20 +0000 Rocco Rutte (03c65df651e0) - - * UPDATING, doc/manual.xml.head: Manual: Move new mail detection into - its own section - - This also updates some parts of docs and adds missing ones. It also - adds a note about the recent changes, also to UPDATING. - -2009-06-29 18:03 +0200 Rocco Rutte (d3a7e0334e5d) - - * url.c, url.h: Revert URL path encoding for now - - It breaks gmail url display and makes bcache use different paths. - Still we need to think about whether we want to allow any character - in bcache paths (possibly multibyte, possibly depending on - $charset). - -2009-06-28 20:49 -0700 Brendan Cully (298194c414f0) - - * configure.ac, curs_lib.c: Allow tabs in index subject. Closes #3270. - - * imap/util.c: Allow ImapDelimChars to be unset - - * mutt.h: Rename struct thread to struct mutt_thread. Closes #3279. - - * imap/command.c: Not being able to start an IMAP command - is a fatal error. Closes #3155. - - * imap/auth_login.c: IMAP LOGIN does not support separate user and - login accounts. Use the user account for both. Closes #3240. - -2009-06-28 22:40 +0200 Rocco Rutte (71a84cf22c42) - - * url.c, url.h: Fix URL parser to encode paths - -2009-06-28 15:42 +0200 Deng Xiyue (fe688db8099a) - - * po/zh_CN.po: Update Simplified Chinese translation. Closes #3281. - -2009-06-27 17:07 +0200 Rocco Rutte (7ca8d09f7d2c) - - * hg-commit: hg-commit: drop changelog entries from hg log - - * doc/makedoc.c, doc/manual.xml.head: Manual: stop using DocBook - entities mapping to ascii chars - - There's no real benefit, it only makes reading/writing the manual - harder. All entities that potentially map to non-ascii characters - (&mdash, ä, etc.) are left so that manual.xml remains pure - ascii. - -2009-06-26 21:47 -0700 Brendan Cully (b2b97c7a2ae6) - - * imap/imap_private.h, imap/message.c, imap/util.c: Set - internaldate of messages appended to IMAP mailboxes - -2009-06-26 20:27 +0200 Rocco Rutte (156e6d6e34fc) - - * doc/manual.xml.head: Manual: try to explain that and why - copiousoutput should come last - - * po/de.po: Update German translation - -2009-06-25 21:46 +0200 Rocco Rutte (c5d0252e8f72) - - * rfc3676.c: Fix f=f corner case with DelSp=yes abuse - - * sendlib.c: header folding: treat From_ specially, never wrap on - sending side - - * sendlib.c: Add Date: header to postponed messages - - * sendlib.c: Only add Status: header (fcc/postpone) when - saving to mbox/mmdf - - * compose.c: Treat messages written with as fcc, not - postponed. - -2009-06-23 10:13 -0700 Vincent Lefevre (bc2463863c15) - - * po/fr.po: Updated French translation. - -2009-06-23 16:56 +0200 Rocco Rutte (d152033cf967) - - * doc/manual.xml.head: Manual: Simply type conversion section wording. - - * Makefile.am, configure.ac: Don't build hcversion.h and mutt_md5 - without hcache - - * handler.c, mutt.h, muttlib.c: Implement state_putws() and - state_putwc(), see #3148. - - This is needed to unbreak text/enriched rendering on Linux. - - * commands.c: Only use keypad() when curses is running - -2009-06-23 00:28 -0700 Vincent Lefevre (642987450d83) - - * curs_lib.c: Only beep when displaying error messages (unbreaks - [54bc1ef602e7]) - -2009-06-23 00:20 -0700 Brendan Cully (f5849c72a274) - - * crypt-gpgme.c: Update crypt-gpgme for mutt_mktemp change - in [ed7eb5de7536] - -2009-06-22 17:36 +0200 Rocco Rutte (54bc1ef602e7) - - * curs_lib.c: Make mutt_curses_(error|message) format message to COLS - chars. Closes #3278. - - While I'm at it, fold both functions into one. - -2009-06-22 17:21 +0200 Alexey Tourbin (e378bbdc3f0f) - - * smime_keys.pl: smime_keys: use Time::Local module. Closes #3277. - -2009-06-22 17:17 +0200 Rocco Rutte (4899f140ec25) - - * mbyte.c: Fix included iswupper(). Closes #3276. - - * lib.c: Catch range errors when converting to long. - -2009-06-21 21:57 +0200 Rocco Rutte (ed7eb5de7536) - - * attach.c, commands.c, crypt.c, editmsg.c, handler.c, headers.c, - help.c, history.c, imap/message.c, main.c, mbox.c, muttlib.c, mx.c, - pattern.c, pgp.c, pgpkey.c, pgpmicalg.c, pop.c, protos.h, - recvattach.c, recvcmd.c, rfc3676.c, send.c, sendlib.c, smime.c: Pass - buffer size to mutt_mktemp() - - * handler.c, rfc3676.c: Port f=f and text/plain handlers to - mutt_read_line() - - * lib.c: mutt_read_line(): make line counting ptr optional - - * sendlib.c: Silently drop headers not in "key: value" - format. Fixes out-of-memory exits. - -2009-06-20 23:09 +0200 Rocco Rutte (6447ebe80797) - - * handler.c: f=f: Don't kill signature separator when stripping - trailing spaces. Closes #3275. - - * curs_main.c: Disallow breaking threads for messages not part of - a thread - -2009-06-20 15:22 +0200 Rocco Rutte (580ab0256c49) - - * doc/manual.xml.head: Manual: Clarify and extend variable type - conversion section - -2009-06-19 19:56 -0400 Aron Griffis (ee3d174297bb) - - * rfc822.c: remove bogus FREE - - It's impossible for cur->personal to be non-NULL at this point, - since cur was calloc'd just a couple lines prior. - - Signed-off-by: Aron Griffis - -2009-06-19 22:49 +0200 Rocco Rutte (9ae13dedb5ed) - - * mbox.c, mx.c, mx.h: Fixup atime for mbox/mmdf also when mailbox is - unchanged but has new mail. See #1362. - - * mbox.c: Don't mangle atime/mtime for mbox folders without new - mail upon sync. Closes #1362, #3271. - - * doc/manual.xml.head: Manual: Add note and example for type - conversions with my_vars - - * sendlib.c: Enforce 998 char length limit on header lines when - sending. - -2009-06-18 15:06 +0200 Antonio Radici (c6fe0bb8cf11) - - * doc/Makefile.am, doc/smime_keys.man: Provide - smime_keys(1). Closes #3272. - -2009-06-18 14:56 +0200 Rocco Rutte (508bfe4a2e23) - - * mbox.c: Backout experimental patch - - * UPDATING, mbox.c: UPDATING: add note about -a and -- - -2009-06-17 16:19 -0700 Antonio Radici (25e46aad362b) - - * buffy.c: Do not free statically-allocated buffy buffer. Unbreaks - unmailboxes, closes #3273. - -2009-06-17 15:23 -0700 Petr Písař (fe94f01b369a) - - * ChangeLog, po/cs.po: Updated Czech translation. - -2009-06-17 13:58 -0700 Ivan Vilata i Balaguer (ef9b67c7ebc4) - - * po/ca.po: Updated Catalan translation. - -2009-06-17 13:57 -0700 Vincent Lefevre (62471a5d3186) - - * po/fr.po: Updated French translation. - -2009-06-17 20:42 +0200 Rocco Rutte (33376ae23d8f) - - * doc/devel-notes.txt: Mention check_sec.sh in doc/devel-notes.txt - -2009-06-17 11:09 -0700 Brendan Cully (7f37d0a57d83) - - * crypt-gpgme.c, pgp.c: Display unsigned part of traditional PGP - messages. Unbreaks [e2780a423d96], closes #3269 - -2009-06-17 19:29 +0200 Antonio Radici (a2a868fc40ea) - - * mx.c: Leave error handling of mx_get_magic() up to the - caller. Closes #3268. - -2009-06-17 18:02 +0200 Rocco Rutte (4b5326d8d2ee) - - * UPDATING, muttlib.c: Always display text/* parts inline, - overrideable by auto_view. Closes #3246. - -2009-06-15 22:05 +0200 Rocco Rutte (f40de578e8ed) - - * handler.c: Unbreak header weeding for message/rfc822 - parts. Closes #3265. - - * init.c, lib.c, lib.h: Print timestamps in debug files. Closes #3263. - - * doc/manual.xml.head, doc/muttrc.man.head: bind: Clarify function - argument usage - - * doc/manual.xml.head, init.h, url.c: Fixup URL parser - - The fixes are: 1) allow / in usernames for IMAP (by %-encoding /, : - and % when pretty-printing urls), 2) for POP/SMTP the trailing / is - no longer mandatory, 3) more strict %-decoding to avoid unexpected - results - -2009-06-15 17:49 +0200 Bertrand Janin (abc8fa0abeee) - - * UPDATING: Fix UPDATING - -2009-06-15 17:06 +0200 Rocco Rutte (d6f88fbf8387) - - * url.c: Don't parse URL port as signed short, but to int and cast to - unsigned short. Closes #3264. - - * doc/manual.xml.head: Manual: Add a short note about new header - folding - - ...so we don't get bug reports for tab folding. - - * init.h: Clarify what $wrap=0 does - - * doc/mutt.css: CSS update for newer docbook xslt versions - - * pager.c: pager: intermediate fix for wrapping long header lines with - $smart_wrap set - - The header folding algorithm outputs a word without spaces and - longer than $wrap as-is. The pager however tries to break it. With - $smart_wrap unset, it simply breaks at $wrap regardless if there's a - space or not. With $smart_wrap set it tried to find a space and - break if the next word is too long. This logic doesn't work for - folded header lines which always start with space. Thus, the output - would always contain the folding whitespace on a line by itself - detaching the header value from the header name. - - As an intermediate fix we don't try to be smart if the line begins - with space or tab. - - * pager.c, sendlib.c: pager: Ignore $wrap for attachment markers - -2009-06-14 20:57 -0700 Brendan Cully (d2e0b495b148) - - * build-release: Remove duplicate update-changelog call. - -2009-06-14 20:51 -0700 Antonio Radici (fef17099376d) - - * doc/mutt.man: Escape hyphens in man page. Closes #1937 again. - -2009-06-14 12:29 -0700 Brendan Cully (7f8a2ba64516) - - * UPDATING: Update UPDATING - - * VERSION, po/bg.po, po/ca.po, po/cs.po, po/da.po, po/de.po, - po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po, po/fr.po, - po/ga.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, - po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, - po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po: - automatic post-release commit for mutt-1.5.20 +2009-06-14 10:43 -0700 Brendan Cully (a18e286f4365) * imap/imap.c: Save a dereference, and close #3226 with voodoo. diff -Nru mutt-1.5.21/charset.c mutt-1.5.20/charset.c --- mutt-1.5.21/charset.c 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/charset.c 2009-01-04 22:36:15.000000000 +0000 @@ -239,42 +239,36 @@ #endif -/* this first ties off any charset extension such as //TRANSLIT, - canonicalizes the charset and re-adds the extension */ void mutt_canonical_charset (char *dest, size_t dlen, const char *name) { size_t i; - char *p, *ext; - char in[LONG_STRING], scratch[LONG_STRING]; - - strfcpy (in, name, sizeof (in)); - if ((ext = strchr (in, '/'))) - *ext++ = 0; + char *p; + char scratch[LONG_STRING]; - if (!ascii_strcasecmp (in, "utf-8") || !ascii_strcasecmp (in, "utf8")) + if (!ascii_strcasecmp (name, "utf-8") || !ascii_strcasecmp (name, "utf8")) { strfcpy (dest, "utf-8", dlen); - goto out; + return; } /* catch some common iso-8859-something misspellings */ - if (!ascii_strncasecmp (in, "8859", 4) && in[4] != '-') - snprintf (scratch, sizeof (scratch), "iso-8859-%s", in +4); - else if (!ascii_strncasecmp (in, "8859-", 5)) - snprintf (scratch, sizeof (scratch), "iso-8859-%s", in + 5); - else if (!ascii_strncasecmp (in, "iso8859", 7) && in[7] != '-') - snprintf (scratch, sizeof (scratch), "iso_8859-%s", in + 7); - else if (!ascii_strncasecmp (in, "iso8859-", 8)) - snprintf (scratch, sizeof (scratch), "iso_8859-%s", in + 8); + if (!ascii_strncasecmp (name, "8859", 4) && name[4] != '-') + snprintf (scratch, sizeof (scratch), "iso-8859-%s", name +4); + else if (!ascii_strncasecmp (name, "8859-", 5)) + snprintf (scratch, sizeof (scratch), "iso-8859-%s", name + 5); + else if (!ascii_strncasecmp (name, "iso8859", 7) && name[7] != '-') + snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 7); + else if (!ascii_strncasecmp (name, "iso8859-", 8)) + snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8); else - strfcpy (scratch, in, sizeof (scratch)); + strfcpy (scratch, NONULL(name), sizeof (scratch)); for (i = 0; PreferredMIMENames[i].key; i++) if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) || !mutt_strcasecmp (scratch, PreferredMIMENames[i].key)) { strfcpy (dest, PreferredMIMENames[i].pref, dlen); - goto out; + return; } strfcpy (dest, scratch, dlen); @@ -282,33 +276,16 @@ /* for cosmetics' sake, transform to lowercase. */ for (p = dest; *p; p++) *p = ascii_tolower (*p); - -out: - if (ext && *ext) - { - safe_strcat (dest, dlen, "/"); - safe_strcat (dest, dlen, ext); - } } int mutt_chscmp (const char *s, const char *chs) { char buffer[STRING]; - int a, b; if (!s) return 0; - /* charsets may have extensions mutt_canonical_charset() - leaves intact; we expect `chs' to originate from mutt - code, not user input (i.e. `chs' does _not_ have any - extension) - we simply check if the shorter string is a prefix for - the longer */ mutt_canonical_charset (buffer, sizeof (buffer), s); - a = mutt_strlen (buffer); - b = mutt_strlen (chs); - return !ascii_strncasecmp (a > b ? buffer : chs, - a > b ? chs : buffer, MIN(a,b)); + return !ascii_strcasecmp (buffer, chs); } char *mutt_get_default_charset () diff -Nru mutt-1.5.21/charset.h mutt-1.5.20/charset.h --- mutt-1.5.21/charset.h 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/charset.h 2009-01-04 22:35:38.000000000 +0000 @@ -47,7 +47,7 @@ void fgetconv_close (FGETCONV **); void mutt_set_langinfo_charset (void); -char *mutt_get_default_charset (void); +char *mutt_get_default_charset (); /* flags for charset.c:mutt_convert_string(), fgetconv_open(), and * mutt_iconv_open(). Note that applying charset-hooks to tocode is diff -Nru mutt-1.5.21/commands.c mutt-1.5.20/commands.c --- mutt-1.5.21/commands.c 2010-04-05 18:47:13.000000000 +0000 +++ mutt-1.5.20/commands.c 2009-06-12 23:38:52.000000000 +0000 @@ -72,7 +72,7 @@ mutt_parse_mime_message (Context, cur); mutt_message_hook (Context, cur, M_MESSAGEHOOK); - /* see if crypto is needed for this message. if so, we should exit curses */ + /* see if crytpo is needed for this message. if so, we should exit curses */ if (WithCrypto && cur->security) { if (cur->security & ENCRYPT) @@ -109,7 +109,7 @@ } - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if ((fpout = safe_fopen (tempfile, "w")) == NULL) { mutt_error _("Could not create temporary file!"); @@ -222,8 +222,7 @@ if ((r = mutt_system (buf)) == -1) mutt_error (_("Error running \"%s\"!"), buf); unlink (tempfile); - if (!option (OPTNOCURSES)) - keypad (stdscr, TRUE); + keypad (stdscr, TRUE); if (r != -1) mutt_set_flag (Context, cur, M_READ, 1); if (r != -1 && option (OPTPROMPTAFTER)) @@ -863,7 +862,7 @@ mx_close_mailbox (&ctx, NULL); if (need_buffy_cleanup) - mutt_buffy_cleanup (buf, &st); + mutt_buffy_cleanup (ctx.path, &st); mutt_clear_error (); return (0); diff -Nru mutt-1.5.21/compose.c mutt-1.5.20/compose.c --- mutt-1.5.21/compose.c 2010-04-14 18:50:19.000000000 +0000 +++ mutt-1.5.20/compose.c 2009-03-31 06:52:43.000000000 +0000 @@ -112,13 +112,21 @@ { int off = 0; - mvaddstr (HDR_CRYPT, 0, "Security: "); - - if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) - { - addstr(_("Not supported")); - return; + if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) + { + if (!msg->security) + mvaddstr (HDR_CRYPT, 0, "Security: "); + else if (msg->security & APPLICATION_SMIME) + mvaddstr (HDR_CRYPT, 0, " S/MIME: "); + else if (msg->security & APPLICATION_PGP) + mvaddstr (HDR_CRYPT, 0, " PGP: "); } + else if ((WithCrypto & APPLICATION_SMIME)) + mvaddstr (HDR_CRYPT, 0, " S/MIME: "); + else if ((WithCrypto & APPLICATION_PGP)) + mvaddstr (HDR_CRYPT, 0, " PGP: "); + else + return; if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN)) addstr (_("Sign, Encrypt")); @@ -127,26 +135,21 @@ else if (msg->security & SIGN) addstr (_("Sign")); else - addstr (_("None")); + addstr (_("Clear")); - if ((msg->security & (ENCRYPT | SIGN))) - { - if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP)) + if ((WithCrypto & APPLICATION_PGP)) + if ((msg->security & APPLICATION_PGP) + && (msg->security & (ENCRYPT | SIGN))) { if ((msg->security & INLINE)) - addstr (_(" (inline PGP)")); + addstr (_(" (inline)")); else - addstr (_(" (PGP/MIME)")); + addstr (_(" (PGP/MIME)")); } - else if ((WithCrypto & APPLICATION_SMIME) && - (msg->security & APPLICATION_SMIME)) - addstr (_(" (S/MIME)")); - } - clrtoeol (); + move (HDR_CRYPTINFO, 0); clrtoeol (); - if ((WithCrypto & APPLICATION_PGP) && msg->security & APPLICATION_PGP && msg->security & SIGN) printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("")); @@ -238,7 +241,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr) { - char buf[LONG_STRING]; + char buf[STRING]; buf[0] = 0; rfc822_write_address (buf, sizeof (buf), addr, 1); @@ -578,7 +581,7 @@ { mutt_edit_file (Editor, msg->content->filename); mutt_update_encoding (msg->content); - menu->redraw = REDRAW_FULL; + menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; mutt_message_hook (NULL, msg, M_SEND2HOOK); break; } @@ -1203,7 +1206,7 @@ if (msg->content->next) msg->content = mutt_make_multipart (msg->content); - if (mutt_write_fcc (fname, msg, NULL, 0, NULL) < 0) + if (mutt_write_fcc (fname, msg, NULL, 1, NULL) < 0) msg->content = mutt_remove_multipart (msg->content); else mutt_message _("Message written."); diff -Nru mutt-1.5.21/config.guess mutt-1.5.20/config.guess --- mutt-1.5.21/config.guess 2008-03-19 20:12:14.000000000 +0000 +++ mutt-1.5.20/config.guess 2008-11-11 19:56:09.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,7 +161,6 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -781,7 +780,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -791,15 +790,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -954,9 +950,6 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1215,15 +1208,6 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff -Nru mutt-1.5.21/config.h.in mutt-1.5.20/config.h.in --- mutt-1.5.21/config.h.in 2010-08-25 16:32:03.000000000 +0000 +++ mutt-1.5.20/config.h.in 2009-06-09 06:51:15.000000000 +0000 @@ -178,9 +178,6 @@ /* Define to 1 if you have the `iswalpha' function. */ #undef HAVE_ISWALPHA -/* Define to 1 if you have the `iswblank' function. */ -#undef HAVE_ISWBLANK - /* Define to 1 if you have the `iswcntrl' function. */ #undef HAVE_ISWCNTRL @@ -226,6 +223,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL +/* Define to 1 if you have the `sasl2' library (-lsasl2). */ +#undef HAVE_LIBSASL2 + /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET @@ -244,9 +244,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -/* Define to 1 if the system has the type `long long int'. */ -#undef HAVE_LONG_LONG_INT - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -492,9 +489,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -565,7 +559,8 @@ /* Define if you want support for the POP3 protocol. */ #undef USE_POP -/* Define if want to use the SASL library for POP/IMAP authentication. */ +/* Define if want to use the Cyrus SASL library for POP/IMAP authentication. + */ #undef USE_SASL /* Define if mutt should run setgid "mail". */ diff -Nru mutt-1.5.21/config.sub mutt-1.5.20/config.sub --- mutt-1.5.21/config.sub 2008-03-19 20:12:14.000000000 +0000 +++ mutt-1.5.20/config.sub 2008-11-11 19:56:09.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,9 +925,6 @@ basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1222,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1417,9 +1414,6 @@ m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; diff -Nru mutt-1.5.21/configure mutt-1.5.20/configure --- mutt-1.5.21/configure 2010-08-25 16:31:47.000000000 +0000 +++ mutt-1.5.20/configure 2009-06-09 06:50:42.000000000 +0000 @@ -1,22 +1,18 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. -# +# Generated by GNU Autoconf 2.63. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# -# +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -24,15 +20,23 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; esac + fi + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + as_nl=' ' export as_nl @@ -40,13 +44,7 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +55,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in #( + case $arg in *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,6 +78,13 @@ } fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -89,15 +94,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in #(( +case $0 in *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done IFS=$as_save_IFS ;; @@ -109,16 +114,12 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 + { (exit 1); exit 1; } fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var done PS1='$ ' PS2='> ' @@ -130,299 +131,330 @@ LANGUAGE=C export LANGUAGE +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + # CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +$as_unset CDPATH + if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST + if (eval ":") 2>/dev/null; then + as_have_required=yes else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac + as_have_required=no fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes +if as_func_success; then + : else - as_have_required=no + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : +if as_func_ret_success; then + : else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( + case $as_dir in /*) for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" done;; esac - as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi -} # as_fn_mkdir_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append + exitcode=1 + echo as_func_ret_success failed. +fi -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith + exitcode=1 + echo positional parameters were not saved. +fi +test $exitcode = 0) || { (exit 1); exit 1; } -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. -as_fn_error () -{ - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 - fi - $as_echo "$as_me: error: $1" >&2 - as_fn_exit $as_status -} # as_fn_error +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : else - as_expr=false + exitcode=1 + echo as_func_success failed. fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : else - as_basename=false + exitcode=1 + echo as_func_ret_success failed. fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : else - as_dirname=false + exitcode=1 + echo positional parameters were not saved. fi -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. +} -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -439,7 +471,8 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -449,18 +482,29 @@ exit } -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; esac;; *) ECHO_N='-n';; esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -490,7 +534,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' + as_mkdir_p=: else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -509,10 +553,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in #( + case $1 in -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -526,8 +570,8 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -test -n "$DJDIR" || exec 7<&0 &1 + +exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -545,6 +589,7 @@ subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -552,7 +597,6 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -PACKAGE_URL= ac_unique_file="mutt.h" # Factoring default headers for most tests. @@ -591,7 +635,6 @@ # include #endif" -ac_header_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -624,8 +667,6 @@ MUTT_LIB_OBJECTS MUTTLIBS MUTT_MD5 -BUILD_HCACHE_FALSE -BUILD_HCACHE_TRUE USE_SASL_FALSE USE_SASL_TRUE USE_SSL_FALSE @@ -736,7 +777,6 @@ program_transform_name prefix exec_prefix -PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -908,7 +948,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -934,7 +975,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1138,7 +1180,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1154,7 +1197,8 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1184,17 +1228,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; - esac + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1211,13 +1255,15 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1240,7 +1286,8 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -1270,9 +1317,11 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } # Find the source files, if location was not specified. @@ -1311,11 +1360,13 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1456,7 +1507,7 @@ --with-gss[=PFX] Compile in GSSAPI authentication for IMAP --with-ssl[=PFX] Enable TLS support using OpenSSL --with-gnutls[=PFX] enable TLS support using gnutls - --with-sasl[=PFX] Use SASL network security library + --with-sasl[=PFX] Use Cyrus SASL 2 network security library --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) --without-tokyocabinet Don't use tokyocabinet even if it is available --without-qdbm Don't use qdbm even if it is available @@ -1474,14 +1525,13 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1545,1009 +1595,405 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.63 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval +It was created by $as_me, which was +generated by GNU Autoconf 2.63. Invocation command line was -} # ac_fn_c_try_compile + $ $0 $@ -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () +_ACEOF +exec 5>>config.log { - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` -} # ac_fn_c_try_cpp +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +_ASUNAME -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" +done +IFS=$as_save_IFS -} # ac_fn_c_check_header_mongrel +} >&5 -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >&5 <<_ACEOF - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval -} # ac_fn_c_try_run +## ----------- ## +## Core tests. ## +## ----------- ## -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_header_compile -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -} # ac_fn_c_try_link +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo -# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -# -------------------------------------------- -# Tries to find the compile-time value of EXPR in a program that includes -# INCLUDES, setting VAR accordingly. Returns whether the value could be -# computed -ac_fn_c_compute_int () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_lo=0 ac_mid=0 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=$ac_mid; break -else - as_fn_arith $ac_mid + 1 && ac_lo=$as_val - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=-1 ac_mid=-1 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_lo=$ac_mid; break -else - as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=$ac_mid -else - as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done -case $ac_lo in #(( -?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -'') ac_retval=1 ;; -esac - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } -#include -#include -int -main () -{ +ac_signal=0 - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (($2) < 0) - { - long int i = longval (); - if (i != ($2)) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ($2)) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - echo >>conftest.val; read $3 >confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -} # ac_fn_c_compute_int -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -} # ac_fn_c_check_type +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $2 +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_func +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $2 - (void) $2; -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi else - eval "$3=no" + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -} # ac_fn_c_check_decl -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was - $ $0 $@ -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -_ASUNAME -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS -} >&5 -cat >&5 <<_ACEOF -## ----------- ## -## Core tests. ## -## ----------- ## -_ACEOF -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo +ac_config_headers="$ac_config_headers config.h" - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -as_fn_append ac_header_list " stdlib.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_header_list " sys/param.h" -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_config_headers="$ac_config_headers config.h" - - -mutt_cv_version=`cat $srcdir/VERSION` -am__api_version='1.11' +mutt_cv_version=`cat $srcdir/VERSION` +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } fi # These three variables are undocumented and unsupported, @@ -2573,10 +2019,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if test "${ac_cv_path_install+set}" = set; then $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2584,11 +2030,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2625,7 +2071,7 @@ ;; esac - done +done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2641,1658 +2087,9685 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} + { (exit 1); exit 1; }; };; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} + { (exit 1); exit 1; }; };; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +$as_echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } +fi +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE=mutt + VERSION=$mutt_cv_version + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + + + +CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/VERSION' + + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi + +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } +fi + +ac_exeext=$ac_cv_exeext + +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + fi +fi +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +rm -f conftest$ac_cv_exeext +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + if test "${ac_cv_header_minix_config_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 +$as_echo_n "checking for minix/config.h... " >&6; } +if test "${ac_cv_header_minix_config_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 +$as_echo "$ac_cv_header_minix_config_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 +$as_echo_n "checking minix/config.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 +$as_echo_n "checking minix/config.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 +$as_echo_n "checking for minix/config.h... " >&6; } +if test "${ac_cv_header_minix_config_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_minix_config_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 +$as_echo "$ac_cv_header_minix_config_h" >&6; } + +fi +if test "x$ac_cv_header_minix_config_h" = x""yes; then + MINIX=yes +else + MINIX= +fi + + + if test "$MINIX" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define _POSIX_SOURCE 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _POSIX_1_SOURCE 2 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _MINIX 1 +_ACEOF + + fi + + + + { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_safe_to_define___extensions__=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_safe_to_define___extensions__=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + test $ac_cv_safe_to_define___extensions__ = yes && + cat >>confdefs.h <<\_ACEOF +#define __EXTENSIONS__ 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define _ALL_SOURCE 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define _POSIX_PTHREAD_SEMANTICS 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define _TANDEM_SOURCE 1 +_ACEOF + + + +ALL_LINGUAS="de eu ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg ga" + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +$as_echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +$as_echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + +{ $as_echo "$as_me:$LINENO: checking for prefix" >&5 +$as_echo_n "checking for prefix... " >&6; } +if test x$prefix = xNONE; then + mutt_cv_prefix=$ac_default_prefix +else + mutt_cv_prefix=$prefix +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_prefix" >&5 +$as_echo "$mutt_cv_prefix" >&6; } + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + + { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 +$as_echo_n "checking for strerror in -lcposix... " >&6; } +if test "${ac_cv_lib_cposix_strerror+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char strerror (); +int +main () +{ +return strerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_cposix_strerror=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_cposix_strerror=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 +$as_echo "$ac_cv_lib_cposix_strerror" >&6; } +if test "x$ac_cv_lib_cposix_strerror" = x""yes; then + LIBS="$LIBS -lcposix" +fi + + + +{ $as_echo "$as_me:$LINENO: checking for function prototypes" >&5 +$as_echo_n "checking for function prototypes... " >&6; } +if test "$ac_cv_prog_cc_c89" != no; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define PROTOTYPES 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define __PROTOTYPES 1 +_ACEOF + +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "$ac_cv_prog_cc_stdc" != no; then + U= ANSI2KNR= +else + U=_ ANSI2KNR=./ansi2knr +fi +# Ensure some checks needed by ansi2knr itself. + + +for ac_header in string.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +if test "x$U" != "x"; then + { { $as_echo "$as_me:$LINENO: error: Compiler not ANSI compliant" >&5 +$as_echo "$as_me: error: Compiler not ANSI compliant" >&2;} + { (exit 1); exit 1; }; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + +done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:$LINENO: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_AR" = x; then + AR="ar" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" +fi + + +{ $as_echo "$as_me:$LINENO: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if test "${ac_cv_c_inline+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_inline=$ac_kw +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + +{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_const=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_const=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +cat >>confdefs.h <<\_ACEOF +#define const /**/ +_ACEOF + +fi + + + { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + # Check for potential -arch flags. It is not universal unless + # there are some -arch flags. Note that *ppc* also matches + # ppc64. This check is also rather less than ideal. + case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( + *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; + esac +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + # It does; now see whether it defined to BIG_ENDIAN or not. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_bigendian=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_bigendian=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then + # Try to guess by grepping values from an object file. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_bigendian=no +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_bigendian=yes +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + cat >>confdefs.h <<\_ACEOF +#define WORDS_BIGENDIAN 1 +_ACEOF +;; #( + no) + ;; #( + universal) + +cat >>confdefs.h <<\_ACEOF +#define AC_APPLE_UNIVERSAL_BUILD 1 +_ACEOF + + ;; #( + *) + { { $as_echo "$as_me:$LINENO: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +$as_echo "$as_me: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; + esac + + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_largefile_CC=' -n32'; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then + $as_echo_n "(cached) " >&6 +else + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_file_offset_bits=no; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_file_offset_bits=64; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if test "${ac_cv_sys_large_files+set}" = set; then + $as_echo_n "(cached) " >&6 +else + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_large_files=no; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_large_files=1; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi +fi + +{ $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_source+set}" = set; then + $as_echo_n "(cached) " >&6 +else + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include /* for off_t */ + #include +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_sys_largefile_source=no; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _LARGEFILE_SOURCE 1 +#include /* for off_t */ + #include +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_sys_largefile_source=1; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown + break +done +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } +case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source +_ACEOF +;; +esac +rm -rf conftest* + +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +# in glibc 2.1.3, but that breaks too many other things. +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +if test $ac_cv_sys_largefile_source != unknown; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FSEEKO 1 +_ACEOF + +fi + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5 +$as_echo_n "checking size of off_t... " >&6; } +if test "${ac_cv_sizeof_off_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_off_t=$ac_lo;; +'') if test "$ac_cv_type_off_t" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (off_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_off_t=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (off_t)); } +static unsigned long int ulongval () { return (long int) (sizeof (off_t)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (off_t))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (off_t)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (off_t)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_off_t=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_off_t" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (off_t) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_off_t=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5 +$as_echo "$ac_cv_sizeof_off_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_OFF_T $ac_cv_sizeof_off_t +_ACEOF + + + +# Extract the first word of "dbx", so it can be a program name with args. +set dummy dbx; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_DBX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $DBX in + [\\/]* | ?:[\\/]*) + ac_cv_path_DBX="$DBX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_DBX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_DBX" && ac_cv_path_DBX="no" + ;; +esac +fi +DBX=$ac_cv_path_DBX +if test -n "$DBX"; then + { $as_echo "$as_me:$LINENO: result: $DBX" >&5 +$as_echo "$DBX" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "gdb", so it can be a program name with args. +set dummy gdb; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GDB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GDB in + [\\/]* | ?:[\\/]*) + ac_cv_path_GDB="$GDB" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GDB="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GDB" && ac_cv_path_GDB="no" + ;; +esac +fi +GDB=$ac_cv_path_GDB +if test -n "$GDB"; then + { $as_echo "$as_me:$LINENO: result: $GDB" >&5 +$as_echo "$GDB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "sdb", so it can be a program name with args. +set dummy sdb; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_SDB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $SDB in + [\\/]* | ?:[\\/]*) + ac_cv_path_SDB="$SDB" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SDB="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_SDB" && ac_cv_path_SDB="no" + ;; +esac +fi +SDB=$ac_cv_path_SDB +if test -n "$SDB"; then + { $as_echo "$as_me:$LINENO: result: $SDB" >&5 +$as_echo "$SDB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +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 + + + + + + + + + + + + + + + + + + + + + + + + + + + +for ac_header in inttypes.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5 +$as_echo_n "checking for uint32_t... " >&6; } +if test "${ac_cv_type_uint32_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_uint32_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof (uint32_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof ((uint32_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_uint32_t=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 +$as_echo "$ac_cv_type_uint32_t" >&6; } +if test "x$ac_cv_type_uint32_t" = x""yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_C99_INTTYPES 1 +_ACEOF + +fi + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of short" >&5 +$as_echo_n "checking size of short... " >&6; } +if test "${ac_cv_sizeof_short+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_short=$ac_lo;; +'') if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_short=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (short)); } +static unsigned long int ulongval () { return (long int) (sizeof (short)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (short))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (short)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (short)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_short=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_short=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +$as_echo "$ac_cv_sizeof_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if test "${ac_cv_sizeof_int+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_int=$ac_lo;; +'') if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_int=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (int)); } +static unsigned long int ulongval () { return (long int) (sizeof (int)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (int))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (int)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (int)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_int=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_int=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if test "${ac_cv_sizeof_long+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_long=$ac_lo;; +'') if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (long)); } +static unsigned long int ulongval () { return (long int) (sizeof (long)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (long))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (long)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (long)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if test "${ac_cv_sizeof_long_long+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_long_long=$ac_lo;; +'') if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (long long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long_long=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (long long)); } +static unsigned long int ulongval () { return (long int) (sizeof (long long)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (long long))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (long long)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (long long)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long_long=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (long long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long_long=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +_ACEOF + + + +ac_aux_path_sendmail=/usr/sbin:/usr/lib +# Extract the first word of "sendmail", so it can be a program name with args. +set dummy sendmail; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_SENDMAIL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $SENDMAIL in + [\\/]* | ?:[\\/]*) + ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:$ac_aux_path_sendmail" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_SENDMAIL" && ac_cv_path_SENDMAIL="/usr/sbin/sendmail" + ;; +esac +fi +SENDMAIL=$ac_cv_path_SENDMAIL +if test -n "$SENDMAIL"; then + { $as_echo "$as_me:$LINENO: result: $SENDMAIL" >&5 +$as_echo "$SENDMAIL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +cat >>confdefs.h <<_ACEOF +#define SENDMAIL "$ac_cv_path_SENDMAIL" +_ACEOF + + +OPS='$(srcdir)/OPS' + +{ $as_echo "$as_me:$LINENO: checking whether to build with GPGME support" >&5 +$as_echo_n "checking whether to build with GPGME support... " >&6; } +# Check whether --enable-gpgme was given. +if test "${enable_gpgme+set}" = set; then + enableval=$enable_gpgme; if test x$enableval = xyes; then + enable_gpgme=yes + fi + +fi + + +if test x"$enable_gpgme" = xyes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +# Check whether --with-gpgme-prefix was given. +if test "${with_gpgme_prefix+set}" = set; then + withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" +else + gpgme_config_prefix="" +fi + + if test "x$gpgme_config_prefix" != x ; then + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" + fi + # Extract the first word of "gpgme-config", so it can be a program name with args. +set dummy gpgme-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GPGME_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GPGME_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no" + ;; +esac +fi +GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG +if test -n "$GPGME_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $GPGME_CONFIG" >&5 +$as_echo "$GPGME_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test "$GPGME_CONFIG" != "no" ; then + gpgme_version=`$GPGME_CONFIG --version` + fi + gpgme_version_major=`echo $gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` + gpgme_version_minor=`echo $gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` + gpgme_version_micro=`echo $gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` + + tmp=1.0.0 + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_gpgme_api=0 + min_gpgme_version="$tmp" + fi + + { $as_echo "$as_me:$LINENO: checking for GPGME - version >= $min_gpgme_version" >&5 +$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } + ok=no + if test "$GPGME_CONFIG" != "no" ; then + req_major=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` + req_minor=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` + req_micro=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` + if test "$gpgme_version_major" -gt "$req_major"; then + ok=yes + else + if test "$gpgme_version_major" -eq "$req_major"; then + if test "$gpgme_version_minor" -gt "$req_minor"; then + ok=yes + else + if test "$gpgme_version_minor" -eq "$req_minor"; then + if test "$gpgme_version_micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + if test "$req_gpgme_api" -ne "$tmp" ; then + ok=no + fi + fi + fi + fi + if test $ok = yes; then + GPGME_CFLAGS=`$GPGME_CONFIG --cflags` + GPGME_LIBS=`$GPGME_CONFIG --libs` + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define CRYPT_BACKEND_GPGME 1 +_ACEOF + + else + GPGME_CFLAGS="" + GPGME_LIBS="" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + gpgme_found=no + fi + + + + if test x"$gpgme_found" = xno; then + { { $as_echo "$as_me:$LINENO: error: *** GPGME not found ***" >&5 +$as_echo "$as_me: error: *** GPGME not found ***" >&2;} + { (exit 1); exit 1; }; } + else + tmp=1.1.1 + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_gpgme_api=0 + min_gpgme_version="$tmp" + fi + + { $as_echo "$as_me:$LINENO: checking for GPGME - version >= $min_gpgme_version" >&5 +$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } + ok=no + if test "$GPGME_CONFIG" != "no" ; then + req_major=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` + req_minor=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` + req_micro=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` + if test "$gpgme_version_major" -gt "$req_major"; then + ok=yes + else + if test "$gpgme_version_major" -eq "$req_major"; then + if test "$gpgme_version_minor" -gt "$req_minor"; then + ok=yes + else + if test "$gpgme_version_minor" -eq "$req_minor"; then + if test "$gpgme_version_micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + if test "$req_gpgme_api" -ne "$tmp" ; then + ok=no + fi + fi + fi + fi + if test $ok = yes; then + GPGME_CFLAGS=`$GPGME_CONFIG --cflags` + GPGME_LIBS=`$GPGME_CONFIG --libs` + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GPGME_PKA_TRUST 1 +_ACEOF + + else + GPGME_CFLAGS="" + GPGME_LIBS="" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + : + fi + + + + #needed to get GPGME_LIBS and al correctly + tmp=1.0.0 + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_gpgme_api=0 + min_gpgme_version="$tmp" + fi + + { $as_echo "$as_me:$LINENO: checking for GPGME - version >= $min_gpgme_version" >&5 +$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } + ok=no + if test "$GPGME_CONFIG" != "no" ; then + req_major=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` + req_minor=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` + req_micro=`echo $min_gpgme_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` + if test "$gpgme_version_major" -gt "$req_major"; then + ok=yes + else + if test "$gpgme_version_major" -eq "$req_major"; then + if test "$gpgme_version_minor" -gt "$req_minor"; then + ok=yes + else + if test "$gpgme_version_minor" -eq "$req_minor"; then + if test "$gpgme_version_micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + if test "$req_gpgme_api" -ne "$tmp" ; then + ok=no + fi + fi + fi + fi + if test $ok = yes; then + GPGME_CFLAGS=`$GPGME_CONFIG --cflags` + GPGME_LIBS=`$GPGME_CONFIG --libs` + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define CRYPT_BACKEND_GPGME 1 +_ACEOF -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + else + GPGME_CFLAGS="" + GPGME_LIBS="" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + : + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -esac -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o" fi - - test "$2" = conftest.file - ) -then - # Ok. - : else - as_fn_error "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Check whether --enable-pgp was given. +if test "${enable_pgp+set}" = set; then + enableval=$enable_pgp; if test x$enableval = xno ; then + have_pgp=no + fi -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +if test x$have_pgp != xno ; then -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +cat >>confdefs.h <<\_ACEOF +#define CRYPT_BACKEND_CLASSIC_PGP 1 +_ACEOF + + PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(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 +# Check whether --enable-smime was given. +if test "${enable_smime+set}" = set; then + enableval=$enable_smime; if test x$enableval = xno ; then + have_smime=no + fi fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi +if test x$have_smime != xno ; then + +cat >>confdefs.h <<\_ACEOF +#define CRYPT_BACKEND_CLASSIC_SMIME 1 +_ACEOF + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" + SMIMEAUX_TARGET="smime_keys" fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS -fi +# Check whether --with-mixmaster was given. +if test "${with_mixmaster+set}" = set; then + withval=$with_mixmaster; if test "$withval" != no + then + if test -x "$withval" + then + MIXMASTER="$withval" + else + MIXMASTER="mixmaster" + fi + OPS="$OPS \$(srcdir)/OPS.MIX" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o" - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi +cat >>confdefs.h <<_ACEOF +#define MIXMASTER "$MIXMASTER" +_ACEOF + + fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +# We now require all OPS +OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT " + + + + + +# Extract the first word of "ispell", so it can be a program name with args. +set dummy ispell; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if test "${ac_cv_path_ISPELL+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $ISPELL in + [\\/]* | ?:[\\/]*) + ac_cv_path_ISPELL="$ISPELL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_ISPELL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS + test -z "$ac_cv_path_ISPELL" && ac_cv_path_ISPELL="no" + ;; +esac fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } +ISPELL=$ac_cv_path_ISPELL +if test -n "$ISPELL"; then + { $as_echo "$as_me:$LINENO: result: $ISPELL" >&5 +$as_echo "$ISPELL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$AWK" && break -done +if test $ISPELL != no; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +cat >>confdefs.h <<_ACEOF +#define ISPELL "$ISPELL" +_ACEOF + +fi + + +# Check whether --with-slang was given. +if test "${with_slang+set}" = set; then + withval=$with_slang; { $as_echo "$as_me:$LINENO: checking if this is a BSD system" >&5 +$as_echo_n "checking if this is a BSD system... " >&6; } +if test "${mutt_cv_bsdish+set}" = set; then $as_echo_n "(cached) " >&6 else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' + if test "$cross_compiling" = yes; then + mutt_cv_bsdish=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +main () +{ +#ifdef BSD + exit (0); +#else + exit (1); +#endif +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_bsdish=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ +( exit $ac_status ) +mutt_cv_bsdish=no fi -rmdir .tst 2>/dev/null - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi + fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_bsdish" >&5 +$as_echo "$mutt_cv_bsdish" >&6; } + { $as_echo "$as_me:$LINENO: checking for S-Lang" >&5 +$as_echo_n "checking for S-Lang... " >&6; } + if test $withval = yes; then + if test -d $srcdir/../slang; then + mutt_cv_slang=$srcdir/../slang/src + CPPFLAGS="$CPPFLAGS -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" + elif test -d /usr/include/slang; then + CPPFLAGS="$CPPFLAGS -I/usr/include/slang" + fi + mutt_cv_slang=yes + fi + else + if test -f $withval/src/slang.h; then + mutt_cv_slang=$withval/src + CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" + else + mutt_cv_slang=$withval + if test -d $withval/include/slang; then + CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" + elif test -d $withval/include; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + fi + LDFLAGS="$LDFLAGS -L${withval}/lib" + fi + fi + { $as_echo "$as_me:$LINENO: result: $mutt_cv_slang" >&5 +$as_echo "$mutt_cv_slang" >&6; } + if test $mutt_cv_bsdish = yes; then -# Define the identity of the package. - PACKAGE=mutt - VERSION=$mutt_cv_version +{ $as_echo "$as_me:$LINENO: checking for main in -ltermlib" >&5 +$as_echo_n "checking for main in -ltermlib... " >&6; } +if test "${ac_cv_lib_termlib_main+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltermlib $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" +int +main () +{ +return main (); + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_termlib_main=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_termlib_main=no +fi -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5 +$as_echo "$ac_cv_lib_termlib_main" >&6; } +if test "x$ac_cv_lib_termlib_main" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBTERMLIB 1 _ACEOF -# Some tools Automake needs. + LIBS="-ltermlib $LIBS" -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +fi + fi -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +cat >>confdefs.h <<\_ACEOF +#define USE_SLANG_CURSES 1 +_ACEOF -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +cat >>confdefs.h <<\_ACEOF +#define HAVE_COLOR 1 +_ACEOF + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + { $as_echo "$as_me:$LINENO: checking for SLtt_get_terminfo in -lslang" >&5 +$as_echo_n "checking for SLtt_get_terminfo in -lslang... " >&6; } +if test "${ac_cv_lib_slang_SLtt_get_terminfo+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lslang -lm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SLtt_get_terminfo (); +int +main () +{ +return SLtt_get_terminfo (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_slang_SLtt_get_terminfo=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + ac_cv_lib_slang_SLtt_get_terminfo=no +fi -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_slang_SLtt_get_terminfo" >&5 +$as_echo "$ac_cv_lib_slang_SLtt_get_terminfo" >&6; } +if test "x$ac_cv_lib_slang_SLtt_get_terminfo" = x""yes; then + MUTTLIBS="$MUTTLIBS -lslang -lm" +else + { { $as_echo "$as_me:$LINENO: error: unable to compile. check config.log" >&5 +$as_echo "$as_me: error: unable to compile. check config.log" >&2;} + { (exit 1); exit 1; }; } +fi -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +else + mutt_cv_curses=/usr + +# Check whether --with-curses was given. +if test "${with_curses+set}" = set; then + withval=$with_curses; if test $withval != yes; then + mutt_cv_curses=$withval + fi + if test x$mutt_cv_curses != x/usr; then + LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" + CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" + fi +fi + { $as_echo "$as_me:$LINENO: checking for initscr" >&5 +$as_echo_n "checking for initscr... " >&6; } +if test "${ac_cv_func_initscr+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define initscr to an innocuous variant, in case declares initscr. + For example, HP-UX 11i declares gettimeofday. */ +#define initscr innocuous_initscr +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/VERSION' +#ifdef __STDC__ +# include +#else +# include +#endif +#undef initscr -DEPDIR="${am__leading_dot}deps" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_initscr || defined __stub___initscr +choke me +#endif -ac_config_commands="$ac_config_commands depfiles" +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_initscr=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_initscr=no +fi -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_initscr" >&5 +$as_echo "$ac_cv_func_initscr" >&6; } +if test "x$ac_cv_func_initscr" = x""yes; then + : +else + cf_ncurses="ncurses" + for lib in ncurses ncursesw + do + as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_waddnwstr" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for waddnwstr in -l$lib" >&5 +$as_echo_n "checking for waddnwstr in -l$lib... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$lib $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char waddnwstr (); +int +main () +{ +return waddnwstr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_Lib=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; + eval "$as_ac_Lib=no" fi -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= +ac_res=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cf_ncurses="$lib"; break fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : + done + as_ac_Lib=`$as_echo "ac_cv_lib_$cf_ncurses''_initscr" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for initscr in -l$cf_ncurses" >&5 +$as_echo_n "checking for initscr in -l$cf_ncurses... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_ncurses $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_Lib=yes" else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_Lib=no" fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +ac_res=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + MUTTLIBS="$MUTTLIBS -l$cf_ncurses" + if test "$cf_ncurses" = ncursesw; then -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +for ac_header in ncursesw/ncurses.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_header_compiler=no fi - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - CC=$ac_ct_CC - fi +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - CC="$ac_cv_prog_CC" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + cf_cv_ncurses_header="ncursesw/ncurses.h" fi +done - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : + else + +for ac_header in ncurses/ncurses.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi + ac_header_compiler=no fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + cf_cv_ncurses_header="ncurses/ncurses.h" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe +for ac_header in ncurses.h do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - test -n "$ac_ct_CC" && break -done +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; + ;; esac - CC=$ac_ct_CC - fi +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + cf_cv_ncurses_header="ncurses.h" +fi +done -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } done -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + fi +else + +{ $as_echo "$as_me:$LINENO: checking for initscr" >&5 +$as_echo_n "checking for initscr... " >&6; } +if test "${ac_cv_func_initscr+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define initscr to an innocuous variant, in case declares initscr. + For example, HP-UX 11i declares gettimeofday. */ +#define initscr innocuous_initscr + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef initscr + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_initscr || defined __stub___initscr +choke me +#endif int main () { - +return initscr (); ; return 0; } _ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_initscr=yes else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + ac_cv_func_initscr=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_initscr" >&5 +$as_echo "$ac_cv_func_initscr" >&6; } +if test "x$ac_cv_func_initscr" = x""yes; then + : +else + +case $host_os in #(vi +freebsd*) #(vi + { $as_echo "$as_me:$LINENO: checking for tgoto in -lmytinfo" >&5 +$as_echo_n "checking for tgoto in -lmytinfo... " >&6; } +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgoto (); +int +main () +{ +return tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_mytinfo_tgoto=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_tgoto" >&5 +$as_echo "$ac_cv_lib_mytinfo_tgoto" >&6; } +if test "x$ac_cv_lib_mytinfo_tgoto" = x""yes; then + LIBS="-lmytinfo $LIBS" +fi + + ;; +hpux10.*|hpux11.*) + { $as_echo "$as_me:$LINENO: checking for initscr in -lcur_colr" >&5 +$as_echo_n "checking for initscr in -lcur_colr... " >&6; } +if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcur_colr $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); int main () { -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - +return initscr (); ; return 0; } _ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_cur_colr_initscr=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_cur_colr_initscr=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cur_colr_initscr" >&5 +$as_echo "$ac_cv_lib_cur_colr_initscr" >&6; } +if test "x$ac_cv_lib_cur_colr_initscr" = x""yes; then + + LIBS="-lcur_colr $LIBS" + CFLAGS="-I/usr/include/curses_colr $CFLAGS" + ac_cv_func_initscr=yes + +else + + { $as_echo "$as_me:$LINENO: checking for initscr in -lHcurses" >&5 +$as_echo_n "checking for initscr in -lHcurses... " >&6; } +if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lHcurses $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); int main () { - +return initscr (); ; return 0; } _ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_Hcurses_initscr=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } + ac_cv_lib_Hcurses_initscr=no fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Hcurses_initscr" >&5 +$as_echo "$ac_cv_lib_Hcurses_initscr" >&6; } +if test "x$ac_cv_lib_Hcurses_initscr" = x""yes; then -int -main () -{ -#ifndef __GNUC__ - choke me -#endif + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + LIBS="-lHcurses $LIBS" + CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS" + ac_cv_func_initscr=yes - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= + + ;; +linux*) # Suse Linux does not follow /usr/lib convention + LIBS="$LIBS -L/lib" + ;; +esac + +if test ".$With5lib" != ".no" ; then +if test -d /usr/5lib ; then + # SunOS 3.x or 4.x + CPPFLAGS="$CPPFLAGS -I/usr/5include" + LIBS="$LIBS -L/usr/5lib" fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +fi + +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + cf_term_lib="" + cf_curs_lib="" + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + { $as_echo "$as_me:$LINENO: checking for tgoto" >&5 +$as_echo_n "checking for tgoto... " >&6; } +if test "${ac_cv_func_tgoto+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define tgoto to an innocuous variant, in case declares tgoto. + For example, HP-UX 11i declares gettimeofday. */ +#define tgoto innocuous_tgoto + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char tgoto (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef tgoto + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgoto (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_tgoto || defined __stub___tgoto +choke me +#endif int main () { - +return tgoto (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_tgoto=yes else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -int -main () -{ + ac_cv_func_tgoto=no +fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_tgoto" >&5 +$as_echo "$ac_cv_func_tgoto" >&6; } +if test "x$ac_cv_func_tgoto" = x""yes; then + cf_term_lib=predefined +else + for cf_term_lib in termcap termlib unknown + do + as_ac_Lib=`$as_echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for tgoto in -l$cf_term_lib" >&5 +$as_echo_n "checking for tgoto in -l$cf_term_lib... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_term_lib $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgoto (); int main () { - +return tgoto (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_Lib=yes" else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + break +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + done -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; +fi + + + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown + do + as_ac_Lib=`$as_echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for initscr in -l$cf_curs_lib" >&5 +$as_echo_n "checking for initscr in -l$cf_curs_lib... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_curs_lib $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); int main () { -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +return initscr (); ; return 0; } _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_Lib=yes" else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none + eval "$as_ac_Lib=no" fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= +ac_res=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Lib'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + break fi + done + test $cf_curs_lib = unknown && { { $as_echo "$as_me:$LINENO: error: no curses library found" >&5 +$as_echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown ; then + { $as_echo "$as_me:$LINENO: checking if we can link with $cf_curs_lib library" >&5 +$as_echo_n "checking if we can link with $cf_curs_lib library... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error +#include <${cf_cv_ncurses_header-curses.h}> +int +main () +{ +initscr() + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + cf_result=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -else - # Broken: fails on valid input. -continue + cf_result=no fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:$LINENO: result: $cf_result" >&5 +$as_echo "$cf_result" >&6; } + test $cf_result = no && { { $as_echo "$as_me:$LINENO: error: Cannot link curses library" >&5 +$as_echo "$as_me: error: Cannot link curses library" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_term_lib" != predefined ; then + { $as_echo "$as_me:$LINENO: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +$as_echo_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <${cf_cv_ncurses_header-curses.h}> +int +main () +{ +initscr(); tgoto((char *)0, 0, 0); + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + cf_result=no else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <${cf_cv_ncurses_header-curses.h}> +int +main () +{ +initscr() + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + cf_result=yes else - # Passes both tests. -ac_preproc_ok=: -break + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cf_result=error fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:$LINENO: result: $cf_result" >&5 +$as_echo "$cf_result" >&6; } + fi +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac +fi - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : + old_LIBS="$LIBS" + LIBS="$LIBS $MUTTLIBS" + for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm +do + +{ $as_echo "$as_me:$LINENO: checking for $ac_func declaration" >&5 +$as_echo_n "checking for $ac_func declaration... " >&6; } +if { as_var=ac_cv_func_decl_$ac_func; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <${cf_cv_ncurses_header-curses.h}> +int +main () +{ +#ifndef ${ac_func} +extern int ${ac_func}(); +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <${cf_cv_ncurses_header-curses.h}> +int +main () +{ +#ifndef ${ac_func} +int (*p)() = ${ac_func}; +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi +eval "ac_cv_func_decl_$ac_func=yes" else - ac_cv_path_EGREP=$EGREP + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +eval "ac_cv_func_decl_$ac_func=no" fi - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +eval "ac_cv_func_decl_$ac_func=yes" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" +if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + + +ac_tr_func=`echo HAVE_$ac_func | tr '[a-z]' '[A-Z]'` + + cat >>confdefs.h <<_ACEOF +#define $ac_tr_func 1 +_ACEOF + +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi +done + + if test "$ac_cv_func_decl_start_color" = yes; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +cat >>confdefs.h <<\_ACEOF +#define HAVE_COLOR 1 +_ACEOF + + fi + if test "$ac_cv_func_decl_resizeterm" = yes; then + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" + fi + LIBS="$old_LIBS" + +fi + + +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if test "${ac_cv_header_stdc+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -4307,23 +11780,48 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - ac_cv_header_stdc=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - + $EGREP "memchr" >/dev/null 2>&1; then + : else ac_cv_header_stdc=no fi @@ -4333,14 +11831,18 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - + $EGREP "free" >/dev/null 2>&1; then + : else ac_cv_header_stdc=no fi @@ -4350,10 +11852,14 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -4380,2928 +11886,3513 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = x""yes; then : - MINIX=yes -else - MINIX= -fi - - - if test "$MINIX" = yes; then - -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h - - -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h - - -$as_echo "#define _MINIX 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - - - - -ALL_LINGUAS="de eu ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg ga" - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prefix" >&5 -$as_echo_n "checking for prefix... " >&6; } -if test x$prefix = xNONE; then - mutt_cv_prefix=$ac_default_prefix -else - mutt_cv_prefix=$prefix -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_prefix" >&5 -$as_echo "$mutt_cv_prefix" >&6; } - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +ac_cv_header_stdc=no fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + + fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + + + + + + +for ac_header in stdarg.h sys/ioctl.h ioctl.h sysexits.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_header_compiler=no fi - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - CC=$ac_ct_CC - fi +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - CC="$ac_cv_prog_CC" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi +done - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : + + +for ac_header in sys/time.h sys/resource.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi + ac_header_compiler=no fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - test -n "$CC" && break - done fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe + +done + + +for ac_header in unix.h do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - test -n "$ac_ct_CC" && break -done +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; + ;; esac - CC=$ac_ct_CC - fi +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : + + + +for ac_func in setrlimit getsid +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif int main () { -#ifndef __GNUC__ - choke me -#endif - +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - ac_compiler_gnu=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +done + + +{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +#include int main () { - +return *(signal (0, 0)) (0) == 1; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_signal=void +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal +_ACEOF + + + +{ $as_echo "$as_me:$LINENO: checking for sig_atomic_t in signal.h" >&5 +$as_echo_n "checking for sig_atomic_t in signal.h... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sig_atomic_t" >/dev/null 2>&1; then + + ac_cv_type_sig_atomic_t=yes; + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "volatile.*sig_atomic_t" >/dev/null 2>&1; then + + is_sig_atomic_t_volatile=yes; + { $as_echo "$as_me:$LINENO: result: yes, volatile" >&5 +$as_echo "yes, volatile" >&6; } + +else + + is_sig_atomic_t_volatile=no; + { $as_echo "$as_me:$LINENO: result: yes, non volatile" >&5 +$as_echo "yes, non volatile" >&6; } + +fi +rm -f conftest* + + +else + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: checking for sig_atomic_t" >&5 +$as_echo_n "checking for sig_atomic_t... " >&6; } +if test "${ac_cv_type_sig_atomic_t+set}" = set; then + $as_echo_n "(cached) " >&6 else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_type_sig_atomic_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_includes_default int main () { - +if (sizeof (sig_atomic_t)) + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_includes_default int main () { - +if (sizeof ((sig_atomic_t))) + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_sig_atomic_t=yes fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : - $as_echo_n "(cached) " >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 +$as_echo "$ac_cv_type_sig_atomic_t" >&6; } +if test "x$ac_cv_type_sig_atomic_t" = x""yes; then + : else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define sig_atomic_t int _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : -fi + is_sig_atomic_t_volatile=no -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +fi +rm -f conftest* -depcc="$CC" am_compiler_list= +if test $is_sig_atomic_t_volatile = 'yes' +then + cat >>confdefs.h <<\_ACEOF +#define SIG_ATOMIC_VOLATILE_T sig_atomic_t +_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac + cat >>confdefs.h <<\_ACEOF +#define SIG_ATOMIC_VOLATILE_T volatile sig_atomic_t +_ACEOF - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +fi - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done +{ $as_echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 +$as_echo_n "checking whether sys_siglist is declared... " >&6; } +if test "${ac_cv_have_decl_sys_siglist+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +/* NetBSD declares sys_siglist in unistd.h. */ +#ifdef HAVE_UNISTD_H +# include +#endif - cd .. - rm -rf conftest.dir + +int +main () +{ +#ifndef sys_siglist + (void) sys_siglist; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_sys_siglist=yes else - am_cv_CC_dependencies_compiler_type=none + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_sys_siglist=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 +$as_echo "$ac_cv_have_decl_sys_siglist" >&6; } +if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SYS_SIGLIST 1 +_ACEOF + - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SYS_SIGLIST 0 +_ACEOF + + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then : + + +{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5 +$as_echo_n "checking for pid_t... " >&6; } +if test "${ac_cv_type_pid_t+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_type_pid_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); +$ac_includes_default int main () { -return strerror (); +if (sizeof (pid_t)) + return 0; ; return 0; } _ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then : - break +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof ((pid_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_pid_t=yes fi -done -if test "${ac_cv_search_strerror+set}" = set; then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +$as_echo "$ac_cv_type_pid_t" >&6; } +if test "x$ac_cv_type_pid_t" = x""yes; then + : +else -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5 -$as_echo_n "checking for function prototypes... " >&6; } -if test "$ac_cv_prog_cc_c89" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +cat >>confdefs.h <<_ACEOF +#define pid_t int +_ACEOF -$as_echo "#define PROTOTYPES 1" >>confdefs.h +fi +{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5 +$as_echo_n "checking for ssize_t... " >&6; } +if test "${ac_cv_type_ssize_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_ssize_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof (ssize_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof ((ssize_t))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -$as_echo "#define __PROTOTYPES 1" >>confdefs.h + ac_cv_type_ssize_t=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test "$ac_cv_prog_cc_stdc" != no; then - U= ANSI2KNR= -else - U=_ ANSI2KNR=./ansi2knr fi -# Ensure some checks needed by ansi2knr itself. -for ac_header in string.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" -if test "x$ac_cv_header_string_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRING_H 1 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 +$as_echo "$ac_cv_type_ssize_t" >&6; } +if test "x$ac_cv_type_ssize_t" = x""yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define ssize_t int _ACEOF fi -done -if test "x$U" != "x"; then - as_fn_error "Compiler not ANSI compliant" "$LINENO" 5 -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + + + + +for ac_func in fgetpos memmove setegid srand48 strerror +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext +#undef $ac_func - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break + eval "$as_ac_var=no" fi - done - ac_cv_prog_CPP=$CPP - +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +done + + + + + + + + +for ac_func in setenv strcasecmp strdup strsep strtok_r wcscasecmp do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext +#undef $ac_func - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } + eval "$as_ac_var=no" fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; + case " $LIBOBJS " in + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + ;; esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi +fi done - done -IFS=$as_save_IFS -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + +for ac_func in strcasestr mkdtemp +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi +#ifdef __STDC__ +# include +#else +# include +#endif -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + case " $LIBOBJS " in + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + ;; +esac + fi +done -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + +{ $as_echo "$as_me:$LINENO: checking for getopt" >&5 +$as_echo_n "checking for getopt... " >&6; } +if test "${ac_cv_func_getopt+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define getopt to an innocuous variant, in case declares getopt. + For example, HP-UX 11i declares gettimeofday. */ +#define getopt innocuous_getopt -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getopt (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - if test "x$ac_ct_AR" = x; then - AR="ar" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef getopt + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getopt (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_getopt || defined __stub___getopt +choke me +#endif + +int +main () +{ +return getopt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - AR=$ac_ct_AR - fi +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_getopt=yes else - AR="$ac_cv_prog_AR" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_getopt=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getopt" >&5 +$as_echo "$ac_cv_func_getopt" >&6; } +if test $ac_cv_func_getopt = yes; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +for ac_header in getopt.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - +$ac_includes_default +#include <$ac_header> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF - ;; +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : - $as_echo_n "(cached) " >&6 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; + ac_header_preproc=no +fi - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - ac_cv_c_const=no + eval "$as_ac_Header=\$ac_header_preproc" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h +done fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : +SNPRINTFOBJS="" +{ $as_echo "$as_me:$LINENO: checking for snprintf" >&5 +$as_echo_n "checking for snprintf... " >&6; } +if test "${ac_cv_func_snprintf+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; +/* Define snprintf to an innocuous variant, in case declares snprintf. + For example, HP-UX 11i declares gettimeofday. */ +#define snprintf innocuous_snprintf -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char snprintf (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. - ac_arch= - ac_prev= - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do - if test -n "$ac_prev"; then - case $ac_word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then - ac_arch=$ac_word - else - ac_cv_c_bigendian=universal - break - fi - ;; - esac - ac_prev= - elif test "x$ac_word" = "x-arch"; then - ac_prev=arch - fi - done -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include +#ifdef __STDC__ +# include +#else +# include +#endif -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif +#undef snprintf - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snprintf (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_snprintf || defined __stub___snprintf +choke me +#endif int main () { -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - +return snprintf (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_snprintf=yes else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_snprintf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_snprintf" >&5 +$as_echo "$ac_cv_func_snprintf" >&6; } +if test "x$ac_cv_func_snprintf" = x""yes; then + mutt_cv_func_snprintf=yes +else + mutt_cv_func_snprintf=no +fi - ; - return 0; -} +{ $as_echo "$as_me:$LINENO: checking for vsnprintf" >&5 +$as_echo_n "checking for vsnprintf... " >&6; } +if test "${ac_cv_func_vsnprintf+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +/* Define vsnprintf to an innocuous variant, in case declares vsnprintf. + For example, HP-UX 11i declares gettimeofday. */ +#define vsnprintf innocuous_vsnprintf + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char vsnprintf (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef vsnprintf + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char vsnprintf (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_vsnprintf || defined __stub___vsnprintf +choke me +#endif int main () { -#ifndef _BIG_ENDIAN - not big endian - #endif - +return vsnprintf (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_vsnprintf=yes else - ac_cv_c_bigendian=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vsnprintf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf" >&5 +$as_echo "$ac_cv_func_vsnprintf" >&6; } +if test "x$ac_cv_func_vsnprintf" = x""yes; then + mutt_cv_func_vsnprintf=yes +else + mutt_cv_func_vsnprintf=no +fi + +if test $mutt_cv_func_snprintf = yes; then +{ $as_echo "$as_me:$LINENO: checking whether your system's snprintf is C99 compliant" >&5 +$as_echo_n "checking whether your system's snprintf is C99 compliant... " >&6; } +if test "${mutt_cv_c99_snprintf+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + mutt_cv_c99_snprintf=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; -int -main () +#include +int main() { -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; + char buf[8]; + int len = snprintf(buf, 4, "1234567"); + return (len != 7 || buf[3] != '\0'); } + _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_c99_snprintf=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +mutt_cv_c99_snprintf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_c99_snprintf" >&5 +$as_echo "$mutt_cv_c99_snprintf" >&6; } +else + mutt_cv_c99_snprintf=no +fi +if test $mutt_cv_func_vsnprintf = yes; then +{ $as_echo "$as_me:$LINENO: checking whether your system's vsnprintf is C99 compliant" >&5 +$as_echo_n "checking whether your system's vsnprintf is C99 compliant... " >&6; } +if test "${mutt_cv_c99_vsnprintf+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + mutt_cv_c99_vsnprintf=no else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -int -main () + +#include +#include +int foo(const char *fmt, ...) { + char buf[8]; + int len; + va_list ap; + va_start(ap, fmt); + len = vsnprintf(buf, 4, fmt, ap); + va_end(ap); + return (len != 7 || buf[3] != '\0'); +} - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - - ; - return 0; +int main() +{ + return foo("%s", "1234567"); } + _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_bigendian=no +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_c99_vsnprintf=yes else - ac_cv_c_bigendian=yes + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +mutt_cv_c99_vsnprintf=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -;; #( - no) - ;; #( - universal) +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_c99_vsnprintf" >&5 +$as_echo "$mutt_cv_c99_vsnprintf" >&6; } +else + mutt_cv_c99_vsnprintf=no +fi +if test $mutt_cv_c99_snprintf = yes; then -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_SNPRINTF 1 +_ACEOF - ;; #( - *) - as_fn_error "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac +fi +if test $mutt_cv_c99_vsnprintf = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_VSNPRINTF 1 +_ACEOF -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; fi +if test $mutt_cv_c99_snprintf = no -o $mutt_cv_c99_vsnprintf = no; then + case " $LIBOBJS " in + *" snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" + ;; +esac -if test "$enable_largefile" != no; then +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: checking for va_copy" >&5 +$as_echo_n "checking for va_copy... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; +#include int main () { - +va_list ap1, ap2; va_copy(ap1, ap2); ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : - break -fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_largefile_CC=' -n32'; break -fi -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : - $as_echo_n "(cached) " >&6 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + { $as_echo "$as_me:$LINENO: result: va_copy" >&5 +$as_echo "va_copy" >&6; } else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - ; - return 0; -} + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; +#include int main () { - +va_list ap1, ap2; __va_copy(ap1, ap2); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=64; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : - $as_echo_n "(cached) " >&6 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + cat >>confdefs.h <<\_ACEOF +#define va_copy __va_copy +_ACEOF + + { $as_echo "$as_me:$LINENO: result: __va_copy" >&5 +$as_echo "__va_copy" >&6; } else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - ; - return 0; -} + cat >>confdefs.h <<\_ACEOF +#define va_copy(dest,src) memcpy(&dest,&src,sizeof(va_list)) _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break + + { $as_echo "$as_me:$LINENO: result: memcpy" >&5 +$as_echo "memcpy" >&6; } + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + + +for ac_func in ftruncate +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + int main () { - +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=1; break +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -;; -esac -rm -rf conftest* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then : +else + +{ $as_echo "$as_me:$LINENO: checking for chsize in -lx" >&5 +$as_echo_n "checking for chsize in -lx... " >&6; } +if test "${ac_cv_lib_x_chsize+set}" = set; then $as_echo_n "(cached) " >&6 else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} + ac_check_lib_save_LIBS=$LIBS +LIBS="-lx $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char chsize (); int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return chsize (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=1; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF -;; +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -rm -rf conftest* - -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then - -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h - -fi - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 -$as_echo_n "checking size of off_t... " >&6; } -if test "${ac_cv_sizeof_off_t+set}" = set; then : - $as_echo_n "(cached) " >&6 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_x_chsize=yes else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -else - if test "$ac_cv_type_off_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (off_t) -See \`config.log' for more details." "$LINENO" 5; }; } - else - ac_cv_sizeof_off_t=0 - fi + ac_cv_lib_x_chsize=no fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -$as_echo "$ac_cv_sizeof_off_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_x_chsize" >&5 +$as_echo "$ac_cv_lib_x_chsize" >&6; } +if test "x$ac_cv_lib_x_chsize" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBX 1 _ACEOF + LIBS="-lx $LIBS" +fi -# Extract the first word of "dbx", so it can be a program name with args. -set dummy dbx; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DBX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $DBX in - [\\/]* | ?:[\\/]*) - ac_cv_path_DBX="$DBX" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DBX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi +fi done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_DBX" && ac_cv_path_DBX="no" - ;; -esac -fi -DBX=$ac_cv_path_DBX -if test -n "$DBX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBX" >&5 -$as_echo "$DBX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -# Extract the first word of "gdb", so it can be a program name with args. -set dummy gdb; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GDB+set}" = set; then : +for ac_func in strftime +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - case $GDB in - [\\/]* | ?:[\\/]*) - ac_cv_path_GDB="$GDB" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GDB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func - test -z "$ac_cv_path_GDB" && ac_cv_path_GDB="no" - ;; -esac -fi -GDB=$ac_cv_path_GDB -if test -n "$GDB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDB" >&5 -$as_echo "$GDB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif -# Extract the first word of "sdb", so it can be a program name with args. -set dummy sdb; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SDB+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $SDB in - [\\/]* | ?:[\\/]*) - ac_cv_path_SDB="$SDB" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SDB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +#undef $ac_func - test -z "$ac_cv_path_SDB" && ac_cv_path_SDB="no" - ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -SDB=$ac_cv_path_SDB -if test -n "$SDB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDB" >&5 -$as_echo "$SDB" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +else -if test $GDB != no ; then - DEBUGGER=$GDB -elif test $DBX != no ; then - DEBUGGER=$DBX -elif test $SDB != no ; then - DEBUGGER=$SDB +{ $as_echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 +$as_echo_n "checking for strftime in -lintl... " >&6; } +if test "${ac_cv_lib_intl_strftime+set}" = set; then + $as_echo_n "(cached) " >&6 else - DEBUGGER=no -fi + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char strftime (); +int +main () +{ +return strftime (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_intl_strftime=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_intl_strftime=no +fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 +$as_echo "$ac_cv_lib_intl_strftime" >&6; } +if test "x$ac_cv_lib_intl_strftime" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBINTL 1 +_ACEOF + LIBS="-lintl $LIBS" +fi +fi +done +for ac_func in fchdir +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -for ac_header in inttypes.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" -if test "x$ac_cv_header_inttypes_h" = x""yes; then : + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF +else + mutt_cv_fchdir=no fi - done -ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" -if test "x$ac_cv_type_uint32_t" = x""yes; then : -$as_echo "#define HAVE_C99_INTTYPES 1" >>confdefs.h -fi +# Check whether --with-regex was given. +if test "${with_regex+set}" = set; then + withval=$with_regex; mutt_cv_regex=yes +else -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -$as_echo_n "checking size of short... " >&6; } -if test "${ac_cv_sizeof_short+set}" = set; then : +for ac_func in regcomp +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -else - if test "$ac_cv_type_short" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (short) -See \`config.log' for more details." "$LINENO" 5; }; } - else - ac_cv_sizeof_short=0 - fi -fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF + mutt_cv_regex=no +else + mutt_cv_regex=yes +fi +done +fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then : + +if test $mutt_cv_regex = no ; then +{ $as_echo "$as_me:$LINENO: checking whether your system's regexp library is completely broken" >&5 +$as_echo_n "checking whether your system's regexp library is completely broken... " >&6; } +if test "${mutt_cv_regex_broken+set}" = set; then $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : + if test "$cross_compiling" = yes; then + mutt_cv_regex_broken=yes +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +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); } +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_regex_broken=no else - if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (int) -See \`config.log' for more details." "$LINENO" 5; }; } - else - ac_cv_sizeof_int=0 - fi + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +mutt_cv_regex_broken=yes +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_regex_broken" >&5 +$as_echo "$mutt_cv_regex_broken" >&6; } + if test $mutt_cv_regex_broken = yes ; then + echo "Using the included GNU regex instead." >&6 + mutt_cv_regex=yes + fi fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } +if test $mutt_cv_regex = yes; then +cat >>confdefs.h <<\_ACEOF +#define USE_GNU_REGEX 1 +_ACEOF + case " $LIBOBJS " in + *" regex.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS regex.$ac_objext" + ;; +esac -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF +fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } - else - ac_cv_sizeof_long=0 - fi +# Check whether --with-homespool was given. +if test "${with_homespool+set}" = set; then + withval=$with_homespool; with_homespool=${withval} fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } +if test x$with_homespool != x; then + if test $with_homespool = yes; then + with_homespool=mailbox + fi +cat >>confdefs.h <<_ACEOF +#define MAILPATH "$with_homespool" +_ACEOF -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long +cat >>confdefs.h <<\_ACEOF +#define HOMESPOOL 1 _ACEOF -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -$as_echo_n "checking size of long long... " >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then : - $as_echo_n "(cached) " >&6 +cat >>confdefs.h <<\_ACEOF +#define USE_DOTLOCK 1 +_ACEOF + + mutt_cv_setgid=no else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : +# Check whether --with-mailpath was given. +if test "${with_mailpath+set}" = set; then + withval=$with_mailpath; mutt_cv_mailpath=$withval else - if test "$ac_cv_type_long_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long long) -See \`config.log' for more details." "$LINENO" 5; }; } - else - ac_cv_sizeof_long_long=0 - fi + { $as_echo "$as_me:$LINENO: checking where new mail is stored" >&5 +$as_echo_n "checking where new mail is stored... " >&6; } +if test "${mutt_cv_mailpath+set}" = set; then + $as_echo_n "(cached) " >&6 +else + mutt_cv_mailpath=no + if test -d /var/mail; then + mutt_cv_mailpath=/var/mail + elif test -d /var/spool/mail; then + mutt_cv_mailpath=/var/spool/mail + elif test -d /usr/spool/mail; then + mutt_cv_mailpath=/usr/spool/mail + elif test -d /usr/mail; then + mutt_cv_mailpath=/usr/mail + fi fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_mailpath" >&5 +$as_echo "$mutt_cv_mailpath" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -$as_echo "$ac_cv_sizeof_long_long" >&6; } - + if test "$mutt_cv_mailpath" = no; then + { { $as_echo "$as_me:$LINENO: error: \"Could not determine where new mail is stored.\"" >&5 +$as_echo "$as_me: error: \"Could not determine where new mail is stored.\"" >&2;} + { (exit 1); exit 1; }; } + fi cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +#define MAILPATH "$mutt_cv_mailpath" _ACEOF - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if test "${ac_cv_type_long_long_int+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking if $mutt_cv_mailpath is world writable" >&5 +$as_echo_n "checking if $mutt_cv_mailpath is world writable... " >&6; } +if test "${mutt_cv_worldwrite+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$cross_compiling" = yes; then + mutt_cv_worldwrite=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +#include +#include - /* Test preprocessor. */ - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - error in preprocessor; - #endif - #if ! (18446744073709551615ULL <= -1ull) - error in preprocessor; - #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; -int -main () +int main (int argc, char **argv) { -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); - ; - return 0; -} + struct stat s; -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if test "$cross_compiling" = yes; then : - ac_cv_type_long_long_int=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif -int -main () -{ -long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; - ; - return 0; + stat ("$mutt_cv_mailpath", &s); + if (s.st_mode & S_IWOTH) exit (0); + exit (1); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_type_long_long_int=yes +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_worldwrite=yes else - ac_cv_type_long_long_int=no + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +mutt_cv_worldwrite=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -else - ac_cv_type_long_long_int=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } - if test $ac_cv_type_long_long_int = yes; then +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_worldwrite" >&5 +$as_echo "$mutt_cv_worldwrite" >&6; } -$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h + mutt_cv_setgid=no + if test $mutt_cv_worldwrite = yes; then - fi +cat >>confdefs.h <<\_ACEOF +#define USE_DOTLOCK 1 +_ACEOF + else -ac_aux_path_sendmail=/usr/sbin:/usr/lib -# Extract the first word of "sendmail", so it can be a program name with args. -set dummy sendmail; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SENDMAIL+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking if $mutt_cv_mailpath is group writable" >&5 +$as_echo_n "checking if $mutt_cv_mailpath is group writable... " >&6; } +if test "${mutt_cv_groupwrite+set}" = set; then $as_echo_n "(cached) " >&6 else - case $SENDMAIL in - [\\/]* | ?:[\\/]*) - ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:$ac_aux_path_sendmail" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + if test "$cross_compiling" = yes; then + mutt_cv_groupwrite=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include - test -z "$ac_cv_path_SENDMAIL" && ac_cv_path_SENDMAIL="/usr/sbin/sendmail" - ;; +int main (int argc, char **argv) +{ + struct stat s; + + stat ("$mutt_cv_mailpath", &s); + if (s.st_mode & S_IWGRP) exit (0); + exit (1); +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -SENDMAIL=$ac_cv_path_SENDMAIL -if test -n "$SENDMAIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SENDMAIL" >&5 -$as_echo "$SENDMAIL" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_groupwrite=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +mutt_cv_groupwrite=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_groupwrite" >&5 +$as_echo "$mutt_cv_groupwrite" >&6; } -cat >>confdefs.h <<_ACEOF -#define SENDMAIL "$ac_cv_path_SENDMAIL" -_ACEOF + if test $mutt_cv_groupwrite = yes; then +cat >>confdefs.h <<\_ACEOF +#define USE_DOTLOCK 1 +_ACEOF -OPS='$(srcdir)/OPS' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with GPGME support" >&5 -$as_echo_n "checking whether to build with GPGME support... " >&6; } -# Check whether --enable-gpgme was given. -if test "${enable_gpgme+set}" = set; then : - enableval=$enable_gpgme; if test x$enableval = xyes; then - enable_gpgme=yes - fi +cat >>confdefs.h <<\_ACEOF +#define USE_SETGID 1 +_ACEOF + mutt_cv_setgid=yes + fi + fi fi - -if test x"$enable_gpgme" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -# Check whether --with-gpgme-prefix was given. -if test "${with_gpgme_prefix+set}" = set; then : - withval=$with_gpgme_prefix; gpgme_config_prefix="$withval" -else - gpgme_config_prefix="" +# Check whether --enable-external_dotlock was given. +if test "${enable_external_dotlock+set}" = set; then + enableval=$enable_external_dotlock; mutt_cv_external_dotlock="$enableval" fi - if test "x$gpgme_config_prefix" != x ; then - GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" - fi - # Extract the first word of "gpgme-config", so it can be a program name with args. -set dummy gpgme-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GPGME_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $GPGME_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG="no" - ;; -esac -fi -GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG -if test -n "$GPGME_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5 -$as_echo "$GPGME_CONFIG" >&6; } +if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ + || test "x$mutt_cv_external_dotlock" = "xyes" +then + +cat >>confdefs.h <<\_ACEOF +#define DL_STANDALONE 1 +_ACEOF + + DOTLOCK_TARGET="mutt_dotlock\$(EXEEXT)" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS dotlock.o" fi - if test "$GPGME_CONFIG" != "no" ; then - gpgme_version=`$GPGME_CONFIG --version` - fi - gpgme_version_major=`echo $gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - gpgme_version_minor=`echo $gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - gpgme_version_micro=`echo $gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` - - tmp=1.0.0 - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_gpgme_api=0 - min_gpgme_version="$tmp" - fi +if test -z "$datarootdir"; then + datarootdir='${prefix}/share' +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $min_gpgme_version" >&5 -$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } - ok=no - if test "$GPGME_CONFIG" != "no" ; then - req_major=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes - else - if test "$gpgme_version_major" -eq "$req_major"; then - if test "$gpgme_version_minor" -gt "$req_minor"; then - ok=yes - else - if test "$gpgme_version_minor" -eq "$req_minor"; then - if test "$gpgme_version_micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no - fi - fi - fi - fi - if test $ok = yes; then - GPGME_CFLAGS=`$GPGME_CONFIG --cflags` - GPGME_LIBS=`$GPGME_CONFIG --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -$as_echo "#define CRYPT_BACKEND_GPGME 1" >>confdefs.h +{ $as_echo "$as_me:$LINENO: checking where to put the documentation" >&5 +$as_echo_n "checking where to put the documentation... " >&6; } - else - GPGME_CFLAGS="" - GPGME_LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - gpgme_found=no - fi +# Check whether --with-docdir was given. +if test "${with_docdir+set}" = set; then + withval=$with_docdir; mutt_cv_docdir=$withval +else + mutt_cv_docdir='${datarootdir}/doc/mutt' +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_docdir" >&5 +$as_echo "$mutt_cv_docdir" >&6; } +docdir=$mutt_cv_docdir - if test x"$gpgme_found" = xno; then - as_fn_error "*** GPGME not found ***" "$LINENO" 5 - else - tmp=1.1.1 - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_gpgme_api=0 - min_gpgme_version="$tmp" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $min_gpgme_version" >&5 -$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } - ok=no - if test "$GPGME_CONFIG" != "no" ; then - req_major=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes - else - if test "$gpgme_version_major" -eq "$req_major"; then - if test "$gpgme_version_minor" -gt "$req_minor"; then - ok=yes - else - if test "$gpgme_version_minor" -eq "$req_minor"; then - if test "$gpgme_version_micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no - fi - fi - fi - fi - if test $ok = yes; then - GPGME_CFLAGS=`$GPGME_CONFIG --cflags` - GPGME_LIBS=`$GPGME_CONFIG --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if test x$mutt_cv_setgid = xyes; then + DOTLOCK_GROUP='mail' + DOTLOCK_PERMISSION=2755 +else + DOTLOCK_GROUP='' + DOTLOCK_PERMISSION=755 +fi -$as_echo "#define HAVE_GPGME_PKA_TRUST 1" >>confdefs.h - else - GPGME_CFLAGS="" - GPGME_LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : - fi +# Check whether --with-domain was given. +if test "${with_domain+set}" = set; then + withval=$with_domain; if test $withval != yes; then + if test $withval != no; then - #needed to get GPGME_LIBS and al correctly - tmp=1.0.0 - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_gpgme_api=0 - min_gpgme_version="$tmp" - fi +cat >>confdefs.h <<_ACEOF +#define DOMAIN "$withval" +_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $min_gpgme_version" >&5 -$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } - ok=no - if test "$GPGME_CONFIG" != "no" ; then - req_major=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes - else - if test "$gpgme_version_major" -eq "$req_major"; then - if test "$gpgme_version_minor" -gt "$req_minor"; then - ok=yes - else - if test "$gpgme_version_minor" -eq "$req_minor"; then - if test "$gpgme_version_micro" -ge "$req_micro"; then - ok=yes - fi - fi fi fi - fi - fi - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no - fi - fi - fi - fi - if test $ok = yes; then - GPGME_CFLAGS=`$GPGME_CONFIG --cflags` - GPGME_LIBS=`$GPGME_CONFIG --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +fi -$as_echo "#define CRYPT_BACKEND_GPGME 1" >>confdefs.h - else - GPGME_CFLAGS="" - GPGME_LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : - fi +need_socket="no" +# Check whether --enable-pop was given. +if test "${enable_pop+set}" = set; then + enableval=$enable_pop; if test x$enableval = xyes ; then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o" - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define USE_POP 1 +_ACEOF -# Check whether --enable-pgp was given. -if test "${enable_pgp+set}" = set; then : - enableval=$enable_pgp; if test x$enableval = xno ; then - have_pgp=no + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o" + need_pop="yes" + need_socket="yes" + need_md5="yes" fi fi -if test x$have_pgp != xno ; then +# Check whether --enable-imap was given. +if test "${enable_imap+set}" = set; then + enableval=$enable_imap; if test x$enableval = xyes ; then -$as_echo "#define CRYPT_BACKEND_CLASSIC_PGP 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define USE_IMAP 1 +_ACEOF - PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(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 + LIBIMAP="-Limap -limap" + LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a" + need_imap="yes" + need_socket="yes" + need_md5="yes" + fi -# Check whether --enable-smime was given. -if test "${enable_smime+set}" = set; then : - enableval=$enable_smime; if test x$enableval = xno ; then - have_smime=no - fi +fi + if test x$need_imap = xyes; then + BUILD_IMAP_TRUE= + BUILD_IMAP_FALSE='#' +else + BUILD_IMAP_TRUE='#' + BUILD_IMAP_FALSE= fi -if test x$have_smime != xno ; then +# Check whether --enable-smtp was given. +if test "${enable_smtp+set}" = set; then + enableval=$enable_smtp; if test $enableval = yes; then -$as_echo "#define CRYPT_BACKEND_CLASSIC_SMIME 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define USE_SMTP 1 +_ACEOF - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" - SMIMEAUX_TARGET="smime_keys" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smtp.o" + need_socket="yes" + fi +fi + + +if test x"$need_imap" = xyes -o x"$need_pop" = xyes ; then + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS bcache.o" fi -# Check whether --with-mixmaster was given. -if test "${with_mixmaster+set}" = set; then : - withval=$with_mixmaster; if test "$withval" != no - then - if test -x "$withval" - then - MIXMASTER="$withval" - else - MIXMASTER="mixmaster" - fi - OPS="$OPS \$(srcdir)/OPS.MIX" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o" +if test "$need_socket" = "yes" +then -cat >>confdefs.h <<_ACEOF -#define MIXMASTER "$MIXMASTER" +for ac_header in sys/select.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -# We now require all OPS -OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT " - +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -# Extract the first word of "ispell", so it can be a program name with args. -set dummy ispell; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ISPELL+set}" = set; then : + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - case $ISPELL in - [\\/]* | ?:[\\/]*) - ac_cv_path_ISPELL="$ISPELL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ISPELL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } - test -z "$ac_cv_path_ISPELL" && ac_cv_path_ISPELL="no" - ;; -esac fi -ISPELL=$ac_cv_path_ISPELL -if test -n "$ISPELL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ISPELL" >&5 -$as_echo "$ISPELL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi +done -if test $ISPELL != no; then + { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5 +$as_echo_n "checking for socklen_t... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include -cat >>confdefs.h <<_ACEOF -#define ISPELL "$ISPELL" _ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "socklen_t" >/dev/null 2>&1; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } -fi +cat >>confdefs.h <<\_ACEOF +#define socklen_t int +_ACEOF +fi +rm -f conftest* -# Check whether --with-slang was given. -if test "${with_slang+set}" = set; then : - withval=$with_slang; { $as_echo "$as_me:${as_lineno-$LINENO}: checking if this is a BSD system" >&5 -$as_echo_n "checking if this is a BSD system... " >&6; } -if test "${mutt_cv_bsdish+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking for gethostent" >&5 +$as_echo_n "checking for gethostent... " >&6; } +if test "${ac_cv_func_gethostent+set}" = set; then $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - mutt_cv_bsdish=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +/* Define gethostent to an innocuous variant, in case declares gethostent. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostent innocuous_gethostent -main () -{ -#ifdef BSD - exit (0); +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostent (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include #else - exit (1); +# include +#endif + +#undef gethostent + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostent (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_gethostent || defined __stub___gethostent +choke me #endif + +int +main () +{ +return gethostent (); + ; + return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_bsdish=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_gethostent=yes else - mutt_cv_bsdish=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_gethostent=no fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_bsdish" >&5 -$as_echo "$mutt_cv_bsdish" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostent" >&5 +$as_echo "$ac_cv_func_gethostent" >&6; } +if test "x$ac_cv_func_gethostent" = x""yes; then + : +else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for S-Lang" >&5 -$as_echo_n "checking for S-Lang... " >&6; } - if test $withval = yes; then - if test -d $srcdir/../slang; then - mutt_cv_slang=$srcdir/../slang/src - CPPFLAGS="$CPPFLAGS -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" - elif test -d /usr/include/slang; then - CPPFLAGS="$CPPFLAGS -I/usr/include/slang" - fi - mutt_cv_slang=yes - fi - else - if test -f $withval/src/slang.h; then - mutt_cv_slang=$withval/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" - LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" - else - mutt_cv_slang=$withval - if test -d $withval/include/slang; then - CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" - elif test -d $withval/include; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - fi - LDFLAGS="$LDFLAGS -L${withval}/lib" - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_slang" >&5 -$as_echo "$mutt_cv_slang" >&6; } - if test $mutt_cv_bsdish = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermlib" >&5 -$as_echo_n "checking for main in -ltermlib... " >&6; } -if test "${ac_cv_lib_termlib_main+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking for gethostent in -lnsl" >&5 +$as_echo_n "checking for gethostent in -lnsl... " >&6; } +if test "${ac_cv_lib_nsl_gethostent+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltermlib $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lnsl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostent (); int main () { -return main (); +return gethostent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_termlib_main=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_nsl_gethostent=yes else - ac_cv_lib_termlib_main=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_gethostent=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_main" >&5 -$as_echo "$ac_cv_lib_termlib_main" >&6; } -if test "x$ac_cv_lib_termlib_main" = x""yes; then : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostent" >&5 +$as_echo "$ac_cv_lib_nsl_gethostent" >&6; } +if test "x$ac_cv_lib_nsl_gethostent" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LIBTERMLIB 1 +#define HAVE_LIBNSL 1 _ACEOF - LIBS="-ltermlib $LIBS" + LIBS="-lnsl $LIBS" fi - fi - -$as_echo "#define USE_SLANG_CURSES 1" >>confdefs.h - - -$as_echo "#define HAVE_COLOR 1" >>confdefs.h - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" - +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLtt_get_terminfo in -lslang" >&5 -$as_echo_n "checking for SLtt_get_terminfo in -lslang... " >&6; } -if test "${ac_cv_lib_slang_SLtt_get_terminfo+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking for setsockopt" >&5 +$as_echo_n "checking for setsockopt... " >&6; } +if test "${ac_cv_func_setsockopt+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lslang -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define setsockopt to an innocuous variant, in case declares setsockopt. + For example, HP-UX 11i declares gettimeofday. */ +#define setsockopt innocuous_setsockopt + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char setsockopt (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef setsockopt /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -7309,66 +15400,73 @@ #ifdef __cplusplus extern "C" #endif -char SLtt_get_terminfo (); +char setsockopt (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_setsockopt || defined __stub___setsockopt +choke me +#endif + int main () { -return SLtt_get_terminfo (); +return setsockopt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_slang_SLtt_get_terminfo=yes -else - ac_cv_lib_slang_SLtt_get_terminfo=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_slang_SLtt_get_terminfo" >&5 -$as_echo "$ac_cv_lib_slang_SLtt_get_terminfo" >&6; } -if test "x$ac_cv_lib_slang_SLtt_get_terminfo" = x""yes; then : - MUTTLIBS="$MUTTLIBS -lslang -lm" -else - as_fn_error "unable to compile. check config.log" "$LINENO" 5 -fi - - - +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_setsockopt=yes else - mutt_cv_curses=/usr + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Check whether --with-curses was given. -if test "${with_curses+set}" = set; then : - withval=$with_curses; if test $withval != yes; then - mutt_cv_curses=$withval - fi - if test x$mutt_cv_curses != x/usr; then - LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" - CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" - fi + ac_cv_func_setsockopt=no fi - - ac_fn_c_check_func "$LINENO" "initscr" "ac_cv_func_initscr" -if test "x$ac_cv_func_initscr" = x""yes; then : - +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5 +$as_echo "$ac_cv_func_setsockopt" >&6; } +if test "x$ac_cv_func_setsockopt" = x""yes; then + : else - cf_ncurses="ncurses" - for lib in ncurses ncursesw - do - as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_waddnwstr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for waddnwstr in -l$lib" >&5 -$as_echo_n "checking for waddnwstr in -l$lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +{ $as_echo "$as_me:$LINENO: checking for setsockopt in -lsocket" >&5 +$as_echo_n "checking for setsockopt in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_setsockopt+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$lib $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lsocket $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7377,43 +15475,93 @@ #ifdef __cplusplus extern "C" #endif -char waddnwstr (); +char setsockopt (); int main () { -return waddnwstr (); +return setsockopt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_socket_setsockopt=yes else - eval "$as_ac_Lib=no" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_socket_setsockopt=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - cf_ncurses="$lib"; break +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5 +$as_echo "$ac_cv_lib_socket_setsockopt" >&6; } +if test "x$ac_cv_lib_socket_setsockopt" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSOCKET 1 +_ACEOF + + LIBS="-lsocket $LIBS" + fi - done - as_ac_Lib=`$as_echo "ac_cv_lib_$cf_ncurses''_initscr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -l$cf_ncurses" >&5 -$as_echo_n "checking for initscr in -l$cf_ncurses... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +fi + + +for ac_func in getaddrinfo +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_ncurses $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -7421,88 +15569,173 @@ #ifdef __cplusplus extern "C" #endif -char initscr (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + int main () { -return initscr (); +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - eval "$as_ac_Lib=no" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - MUTTLIBS="$MUTTLIBS -l$cf_ncurses" - - if test "$cf_ncurses" = ncursesw; then - for ac_header in ncursesw/ncurses.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default" -if test "x$ac_cv_header_ncursesw_ncurses_h" = x""yes; then : +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_NCURSESW_NCURSES_H 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - cf_cv_ncurses_header="ncursesw/ncurses.h" -fi +fi done - else - for ac_header in ncurses/ncurses.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default" -if test "x$ac_cv_header_ncurses_ncurses_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NCURSES_NCURSES_H 1 -_ACEOF - cf_cv_ncurses_header="ncurses/ncurses.h" -else - for ac_header in ncurses.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" -if test "x$ac_cv_header_ncurses_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NCURSES_H 1 + +cat >>confdefs.h <<\_ACEOF +#define USE_SOCKET 1 _ACEOF - cf_cv_ncurses_header="ncurses.h" + + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o" fi -done + +# Check whether --with-gss was given. +if test "${with_gss+set}" = set; then + withval=$with_gss; gss_prefix="$withval" +else + gss_prefix="no" fi +if test "$gss_prefix" != "no" +then + if test "$need_imap" = "yes" + then + + GSSAPI_PREFIX=$gss_prefix + GSSAPI_IMPL="none" + saved_CPPFLAGS="$CPPFLAGS" + saved_LDFLAGS="$LDFLAGS" + saved_LIBS="$LIBS" + if test "$GSSAPI_PREFIX" != "yes" + then + krb5_path="$GSSAPI_PREFIX/bin" + else + krb5_path="$PATH" + fi + # Extract the first word of "krb5-config", so it can be a program name with args. +set dummy krb5-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_KRB5CFGPATH+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $KRB5CFGPATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_KRB5CFGPATH="$KRB5CFGPATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $krb5_path +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_KRB5CFGPATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done +IFS=$as_save_IFS - fi + test -z "$ac_cv_path_KRB5CFGPATH" && ac_cv_path_KRB5CFGPATH="none" + ;; +esac +fi +KRB5CFGPATH=$ac_cv_path_KRB5CFGPATH +if test -n "$KRB5CFGPATH"; then + { $as_echo "$as_me:$LINENO: result: $KRB5CFGPATH" >&5 +$as_echo "$KRB5CFGPATH" >&6; } else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -ac_fn_c_check_func "$LINENO" "initscr" "ac_cv_func_initscr" -if test "x$ac_cv_func_initscr" = x""yes; then : -else + if test "$KRB5CFGPATH" != "none" + then + GSSAPI_CFLAGS="$CPPFLAGS `$KRB5CFGPATH --cflags gssapi`" + GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`" + case "`$KRB5CFGPATH --version`" in + "Kerberos 5 "*) GSSAPI_IMPL="MIT";; + ?eimdal*) GSSAPI_IMPL="Heimdal";; + *) GSSAPI_IMPL="Unknown";; + esac + else + if test "$GSSAPI_PREFIX" != "yes" + then + GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include" + GSSAPI_LDFLAGS="-L$GSSAPI_PREFIX/lib" + CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" + LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS" + fi -case $host_os in #(vi -freebsd*) #(vi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -lmytinfo" >&5 -$as_echo_n "checking for tgoto in -lmytinfo... " >&6; } -if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi_krb5" >&5 +$as_echo_n "checking for gss_init_sec_context in -lgssapi_krb5... " >&6; } +if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lmytinfo $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7511,40 +15744,73 @@ #ifdef __cplusplus extern "C" #endif -char tgoto (); +char gss_init_sec_context (); int main () { -return tgoto (); +return gss_init_sec_context (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mytinfo_tgoto=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes else - ac_cv_lib_mytinfo_tgoto=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_gssapi_krb5_gss_init_sec_context=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mytinfo_tgoto" >&5 -$as_echo "$ac_cv_lib_mytinfo_tgoto" >&6; } -if test "x$ac_cv_lib_mytinfo_tgoto" = x""yes; then : - LIBS="-lmytinfo $LIBS" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 +$as_echo "$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; } +if test "x$ac_cv_lib_gssapi_krb5_gss_init_sec_context" = x""yes; then + + GSSAPI_IMPL="MIT", + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + fi - ;; -hpux10.*|hpux11.*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcur_colr" >&5 -$as_echo_n "checking for initscr in -lcur_colr... " >&6; } -if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then : + + if test "$GSSAPI_IMPL" = "none" + then + { $as_echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi" >&5 +$as_echo_n "checking for gss_init_sec_context in -lgssapi... " >&6; } +if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcur_colr $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lgssapi -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7553,42 +15819,75 @@ #ifdef __cplusplus extern "C" #endif -char initscr (); +char gss_init_sec_context (); int main () { -return initscr (); +return gss_init_sec_context (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cur_colr_initscr=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_gssapi_gss_init_sec_context=yes else - ac_cv_lib_cur_colr_initscr=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_gssapi_gss_init_sec_context=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cur_colr_initscr" >&5 -$as_echo "$ac_cv_lib_cur_colr_initscr" >&6; } -if test "x$ac_cv_lib_cur_colr_initscr" = x""yes; then : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 +$as_echo "$ac_cv_lib_gssapi_gss_init_sec_context" >&6; } +if test "x$ac_cv_lib_gssapi_gss_init_sec_context" = x""yes; then - LIBS="-lcur_colr $LIBS" - CFLAGS="-I/usr/include/curses_colr $CFLAGS" - ac_cv_func_initscr=yes + GSSAPI_IMPL="Heimdal" + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lasn1 -lroken" + GSSAPI_LIBS="$GSSAPI_LIBS -lcrypt -lcom_err" -else +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lHcurses" >&5 -$as_echo_n "checking for initscr in -lHcurses... " >&6; } -if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then : + fi + + if test "$GSSAPI_IMPL" = "none" + then + { $as_echo "$as_me:$LINENO: checking for g_order_init in -lgssapi_krb5" >&5 +$as_echo_n "checking for g_order_init in -lgssapi_krb5... " >&6; } +if test "${ac_cv_lib_gssapi_krb5_g_order_init+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lHcurses $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7597,74 +15896,208 @@ #ifdef __cplusplus extern "C" #endif -char initscr (); +char g_order_init (); int main () { -return initscr (); +return g_order_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Hcurses_initscr=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_gssapi_krb5_g_order_init=yes else - ac_cv_lib_Hcurses_initscr=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_gssapi_krb5_g_order_init=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Hcurses_initscr" >&5 -$as_echo "$ac_cv_lib_Hcurses_initscr" >&6; } -if test "x$ac_cv_lib_Hcurses_initscr" = x""yes; then : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_g_order_init" >&5 +$as_echo "$ac_cv_lib_gssapi_krb5_g_order_init" >&6; } +if test "x$ac_cv_lib_gssapi_krb5_g_order_init" = x""yes; then - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" - CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS" - ac_cv_func_initscr=yes + GSSAPI_IMPL="OldMIT", + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" fi + fi + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" + + { $as_echo "$as_me:$LINENO: checking GSSAPI implementation" >&5 +$as_echo_n "checking GSSAPI implementation... " >&6; } + { $as_echo "$as_me:$LINENO: result: $GSSAPI_IMPL" >&5 +$as_echo "$GSSAPI_IMPL" >&6; } + if test "$GSSAPI_IMPL" = "none" + then + cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi fi +rm -f confcache + { $as_echo "$as_me:$LINENO: result: GSSAPI libraries not found" >&5 +$as_echo "GSSAPI libraries not found" >&6; } + fi + if test "$GSSAPI_IMPL" = "Heimdal" + then - ;; -linux*) # Suse Linux does not follow /usr/lib convention - LIBS="$LIBS -L/lib" - ;; -esac +cat >>confdefs.h <<\_ACEOF +#define HAVE_HEIMDAL 1 +_ACEOF -if test ".$With5lib" != ".no" ; then -if test -d /usr/5lib ; then - # SunOS 3.x or 4.x - CPPFLAGS="$CPPFLAGS -I/usr/5include" - LIBS="$LIBS -L/usr/5lib" + fi + CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" + MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS" + +cat >>confdefs.h <<\_ACEOF +#define USE_GSS 1 +_ACEOF + + need_gss="yes" + else + { $as_echo "$as_me:$LINENO: WARNING: GSS was requested but IMAP is not enabled" >&5 +$as_echo "$as_me: WARNING: GSS was requested but IMAP is not enabled" >&2;} + fi fi + if test x$need_gss = xyes; then + USE_GSS_TRUE= + USE_GSS_FALSE='#' +else + USE_GSS_TRUE='#' + USE_GSS_FALSE= fi -if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - ac_fn_c_check_func "$LINENO" "tgoto" "ac_cv_func_tgoto" -if test "x$ac_cv_func_tgoto" = x""yes; then : - cf_term_lib=predefined -else - for cf_term_lib in termcap termlib unknown - do - as_ac_Lib=`$as_echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -l$cf_term_lib" >&5 -$as_echo_n "checking for tgoto in -l$cf_term_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + +# Check whether --with-ssl was given. +if test "${with_ssl+set}" = set; then + withval=$with_ssl; if test "$with_ssl" != "no" + then + if test "$need_socket" != "yes"; then + { $as_echo "$as_me:$LINENO: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&5 +$as_echo "$as_me: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&2;} + else + if test "$with_ssl" != "yes" + then + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" + fi + saved_LIBS="$LIBS" + + crypto_libs="" + { $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +$as_echo_n "checking for deflate in -lz... " >&6; } +if test "${ac_cv_lib_z_deflate+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_term_lib $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lz $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7673,50 +16106,67 @@ #ifdef __cplusplus extern "C" #endif -char tgoto (); +char deflate (); int main () { -return tgoto (); +return deflate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_z_deflate=yes else - eval "$as_ac_Lib=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - break -fi - - done + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_z_deflate=no fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +$as_echo "$ac_cv_lib_z_deflate" >&6; } +if test "x$ac_cv_lib_z_deflate" = x""yes; then + crypto_libs=-lz +fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown - do - as_ac_Lib=`$as_echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -l$cf_curs_lib" >&5 -$as_echo_n "checking for initscr in -l$cf_curs_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:$LINENO: checking for X509_new in -lcrypto" >&5 +$as_echo_n "checking for X509_new in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_X509_new+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_curs_lib $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-lcrypto $crypto_libs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7725,821 +16175,995 @@ #ifdef __cplusplus extern "C" #endif -char initscr (); +char X509_new (); int main () { -return initscr (); +return X509_new (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_crypto_X509_new=yes else - eval "$as_ac_Lib=no" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_crypto_X509_new=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - break +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_X509_new" >&5 +$as_echo "$ac_cv_lib_crypto_X509_new" >&6; } +if test "x$ac_cv_lib_crypto_X509_new" = x""yes; then + crypto_libs="-lcrypto $crypto_libs" fi - done - test $cf_curs_lib = unknown && as_fn_error "no curses library found" "$LINENO" 5 - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link with $cf_curs_lib library" >&5 -$as_echo_n "checking if we can link with $cf_curs_lib library... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <${cf_cv_ncurses_header-curses.h}> -int -main () -{ -initscr() - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - cf_result=yes +{ $as_echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5 +$as_echo_n "checking for SSL_new in -lssl... " >&6; } +if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then + $as_echo_n "(cached) " >&6 else - cf_result=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_result" >&5 -$as_echo "$cf_result" >&6; } - test $cf_result = no && as_fn_error "Cannot link curses library" "$LINENO" 5 - elif test "$cf_term_lib" != predefined ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 -$as_echo_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <${cf_cv_ncurses_header-curses.h}> -int -main () -{ -initscr(); tgoto((char *)0, 0, 0); - ; - return 0; -} + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $crypto_libs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - cf_result=no -else - - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${cf_cv_ncurses_header-curses.h}> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_new (); int main () { -initscr() +return SSL_new (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - cf_result=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_ssl_SSL_new=yes else - cf_result=error -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_ssl_SSL_new=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_result" >&5 -$as_echo "$cf_result" >&6; } - fi -fi - +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; } +if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSSL 1 +_ACEOF + + LIBS="-lssl $LIBS" +else + { { $as_echo "$as_me:$LINENO: error: Unable to find SSL library" >&5 +$as_echo "$as_me: error: Unable to find SSL library" >&2;} + { (exit 1); exit 1; }; } fi -fi + LIBS="$LIBS $crypto_libs" - old_LIBS="$LIBS" - LIBS="$LIBS $MUTTLIBS" - for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm +for ac_func in RAND_status RAND_egd do - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_func declaration" >&5 -$as_echo_n "checking for $ac_func declaration... " >&6; } -if { as_var=ac_cv_func_decl_$ac_func; eval "test \"\${$as_var+set}\" = set"; }; then : +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${cf_cv_ncurses_header-curses.h}> -int -main () -{ -#ifndef ${ac_func} -extern int ${ac_func}(); +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <${cf_cv_ncurses_header-curses.h}> int main () { -#ifndef ${ac_func} -int (*p)() = ${ac_func}; -#endif +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -eval "ac_cv_func_decl_$ac_func=yes" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_func_decl_$ac_func=no" + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -eval "ac_cv_func_decl_$ac_func=yes" +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + fi +done -if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -ac_tr_func=`echo HAVE_$ac_func | tr '[a-z]' '[A-Z]'` +cat >>confdefs.h <<\_ACEOF +#define USE_SSL 1 +_ACEOF - cat >>confdefs.h <<_ACEOF -#define $ac_tr_func 1 + +cat >>confdefs.h <<\_ACEOF +#define USE_SSL_OPENSSL 1 _ACEOF + LIBS="$saved_LIBS" + MUTTLIBS="$MUTTLIBS -lssl $crypto_libs" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o" + need_ssl=yes + fi + fi + +fi + + + +# Check whether --with-gnutls was given. +if test "${with_gnutls+set}" = set; then + withval=$with_gnutls; gnutls_prefix="$withval" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + gnutls_prefix="no" fi -done - if test "$ac_cv_func_decl_start_color" = yes; then +if test "$gnutls_prefix" != "no" && test x"$need_ssl" != xyes +then + if test "$need_socket" != "yes" + then + { $as_echo "$as_me:$LINENO: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&5 +$as_echo "$as_me: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&2;} + else + if test "$gnutls_prefix" != "yes" + then + LDFLAGS="$LDFLAGS -L$gnutls_prefix/lib" + CPPFLAGS="$CPPFLAGS -I$gnutls_prefix/include" + fi + saved_LIBS="$LIBS" -$as_echo "#define HAVE_COLOR 1" >>confdefs.h + { $as_echo "$as_me:$LINENO: checking for gnutls_check_version in -lgnutls" >&5 +$as_echo_n "checking for gnutls_check_version in -lgnutls... " >&6; } +if test "${ac_cv_lib_gnutls_gnutls_check_version+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgnutls $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - fi - if test "$ac_cv_func_decl_resizeterm" = yes; then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" - fi - LIBS="$old_LIBS" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gnutls_check_version (); +int +main () +{ +return gnutls_check_version (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_gnutls_gnutls_check_version=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_gnutls_gnutls_check_version=no fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_check_version" >&5 +$as_echo "$ac_cv_lib_gnutls_gnutls_check_version" >&6; } +if test "x$ac_cv_lib_gnutls_gnutls_check_version" = x""yes; then + { $as_echo "$as_me:$LINENO: checking whether GNUTLS_VERIFY_DISABLE_TIME_CHECKS is declared" >&5 +$as_echo_n "checking whether GNUTLS_VERIFY_DISABLE_TIME_CHECKS is declared... " >&6; } +if test "${ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include -#include +#include int main () { +#ifndef GNUTLS_VERIFY_DISABLE_TIME_CHECKS + (void) GNUTLS_VERIFY_DISABLE_TIME_CHECKS; +#endif ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS=yes else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -else - ac_cv_header_stdc=no + ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS" >&5 +$as_echo "$ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS" >&6; } +if test "x$ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS" = x""yes; then -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GNUTLS_VERIFY_DISABLE_TIME_CHECKS 1 _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GNUTLS_VERIFY_DISABLE_TIME_CHECKS 0 _ACEOF -if ac_fn_c_try_run "$LINENO"; then : -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi + LIBS="$saved_LIBS" + MUTTLIBS="$MUTTLIBS -lgnutls" -for ac_header in stdarg.h sys/ioctl.h ioctl.h sysexits.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi +cat >>confdefs.h <<\_ACEOF +#define USE_SSL 1 +_ACEOF -done -for ac_header in sys/time.h sys/resource.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +cat >>confdefs.h <<\_ACEOF +#define USE_SSL_GNUTLS 1 _ACEOF -fi -done + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o" + need_ssl=yes +else + { { $as_echo "$as_me:$LINENO: error: could not find libgnutls" >&5 +$as_echo "$as_me: error: could not find libgnutls" >&2;} + { (exit 1); exit 1; }; } +fi -for ac_header in unix.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default" -if test "x$ac_cv_header_unix_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UNIX_H 1 -_ACEOF + fi +fi + if test x$need_ssl = xyes; then + USE_SSL_TRUE= + USE_SSL_FALSE='#' +else + USE_SSL_TRUE='#' + USE_SSL_FALSE= fi -done -for ac_func in setrlimit getsid -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +# Check whether --with-sasl was given. +if test "${with_sasl+set}" = set; then + withval=$with_sasl; + if test "$with_sasl" != "no" + then + if test "$need_socket" != "yes" + then + { { $as_echo "$as_me:$LINENO: error: SASL support is only useful with POP or IMAP support" >&5 +$as_echo "$as_me: error: SASL support is only useful with POP or IMAP support" >&2;} + { (exit 1); exit 1; }; } + fi -fi -done + if test "$with_sasl" != "yes" + then + CPPFLAGS="$CPPFLAGS -I$with_sasl/include" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" + fi + saved_LIBS="$LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : + +{ $as_echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5 +$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; } +if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsasl2 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sasl_client_init (); int main () { -return *(signal (0, 0)) (0) == 1; +return sasl_client_init (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_sasl2_sasl_client_init=yes else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_sasl2_sasl_client_init=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_init" >&5 +$as_echo "$ac_cv_lib_sasl2_sasl_client_init" >&6; } +if test "x$ac_cv_lib_sasl2_sasl_client_init" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSASL2 1 _ACEOF + LIBS="-lsasl2 $LIBS" +else + { { $as_echo "$as_me:$LINENO: error: could not find libsasl2" >&5 +$as_echo "$as_me: error: could not find libsasl2" >&2;} + { (exit 1); exit 1; }; } +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t in signal.h" >&5 -$as_echo_n "checking for sig_atomic_t in signal.h... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" + MUTTLIBS="$MUTTLIBS -lsasl2" + LIBS="$saved_LIBS" + +cat >>confdefs.h <<\_ACEOF +#define USE_SASL 1 _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "sig_atomic_t" >/dev/null 2>&1; then : - ac_cv_type_sig_atomic_t=yes; - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include + need_sasl=yes + fi + +fi + if test x$need_sasl = xyes; then + USE_SASL_TRUE= + USE_SASL_FALSE='#' +else + USE_SASL_TRUE='#' + USE_SASL_FALSE= +fi + + + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; if test x$enableval = xyes ; then + +cat >>confdefs.h <<\_ACEOF +#define DEBUG 1 _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "volatile.*sig_atomic_t" >/dev/null 2>&1; then : - is_sig_atomic_t_volatile=yes; - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, volatile" >&5 -$as_echo "yes, volatile" >&6; } + fi -else +fi - is_sig_atomic_t_volatile=no; - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, non volatile" >&5 -$as_echo "yes, non volatile" >&6; } +# Check whether --enable-flock was given. +if test "${enable_flock+set}" = set; then + enableval=$enable_flock; if test $enableval = yes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_FLOCK 1 +_ACEOF + + fi fi -rm -f conftest* -else +mutt_cv_fcntl=yes +# Check whether --enable-fcntl was given. +if test "${enable_fcntl+set}" = set; then + enableval=$enable_fcntl; if test $enableval = no; then mutt_cv_fcntl=no; fi +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "$ac_includes_default" -if test "x$ac_cv_type_sig_atomic_t" = x""yes; then : -else +if test $mutt_cv_fcntl = yes; then -cat >>confdefs.h <<_ACEOF -#define sig_atomic_t int +cat >>confdefs.h <<\_ACEOF +#define USE_FCNTL 1 _ACEOF fi - is_sig_atomic_t_volatile=no +{ $as_echo "$as_me:$LINENO: checking whether struct dirent defines d_ino" >&5 +$as_echo_n "checking whether struct dirent defines d_ino... " >&6; } +ac_cv_dirent_d_ino=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +struct dirent dp; (void)dp.d_ino + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_dirent_d_ino=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest* -if test $is_sig_atomic_t_volatile = 'yes' -then - $as_echo "#define SIG_ATOMIC_VOLATILE_T sig_atomic_t" >>confdefs.h +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test x$ac_cv_dirent_d_ino = xyes ; then -else - $as_echo "#define SIG_ATOMIC_VOLATILE_T volatile sig_atomic_t" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_DIRENT_D_INO 1 +_ACEOF fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_dirent_d_ino" >&5 +$as_echo "$ac_cv_dirent_d_ino" >&6; } -ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include -/* NetBSD declares sys_siglist in unistd.h. */ -#ifdef HAVE_UNISTD_H -# include -#endif - -" -if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 +mutt_cv_warnings=yes +# Check whether --enable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval=$enable_warnings; if test $enableval = no; then + mutt_cv_warnings=no +fi fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SYS_SIGLIST $ac_have_decl -_ACEOF - -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = x""yes; then : +if test x$GCC = xyes && test $mutt_cv_warnings = yes; then + CFLAGS="-Wall -pedantic -Wno-long-long $CFLAGS" +fi -else +# Check whether --enable-nfs-fix was given. +if test "${enable_nfs_fix+set}" = set; then + enableval=$enable_nfs_fix; if test x$enableval = xyes; then -cat >>confdefs.h <<_ACEOF -#define pid_t int +cat >>confdefs.h <<\_ACEOF +#define NFS_ATTRIBUTE_HACK 1 _ACEOF + fi fi -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = x""yes; then : -else +# Check whether --enable-mailtool was given. +if test "${enable_mailtool+set}" = set; then + enableval=$enable_mailtool; if test x$enableval = xyes; then -cat >>confdefs.h <<_ACEOF -#define ssize_t int +cat >>confdefs.h <<\_ACEOF +#define SUN_ATTACHMENT 1 _ACEOF + fi fi -for ac_func in fgetpos memmove setegid srand48 strerror -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +# Check whether --enable-locales-fix was given. +if test "${enable_locales_fix+set}" = set; then + enableval=$enable_locales_fix; if test x$enableval = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define LOCALES_HACK 1 _ACEOF + fi fi -done - -for ac_func in setenv strcasecmp strdup strsep strtok_r wcscasecmp -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -else - case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" - ;; -esac -fi -done +# Check whether --with-exec-shell was given. +if test "${with_exec_shell+set}" = set; then + withval=$with_exec_shell; if test $withval != yes; then +cat >>confdefs.h <<_ACEOF +#define EXECSHELL "$withval" +_ACEOF -for ac_func in strcasestr mkdtemp -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + else + cat >>confdefs.h <<_ACEOF +#define EXECSHELL "/bin/sh" _ACEOF + fi else - case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" - ;; -esac + cat >>confdefs.h <<_ACEOF +#define EXECSHELL "/bin/sh" +_ACEOF fi -done +# Check whether --enable-exact-address was given. +if test "${enable_exact_address+set}" = set; then + enableval=$enable_exact_address; if test $enableval = yes; then + +cat >>confdefs.h <<\_ACEOF +#define EXACT_ADDRESS 1 +_ACEOF -ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" -if test "x$ac_cv_func_getopt" = x""yes; then : + fi fi -if test $ac_cv_func_getopt = yes; then - for ac_header in getopt.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" -if test "x$ac_cv_header_getopt_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETOPT_H 1 -_ACEOF +db_found=no +db_requested=auto +# Check whether --enable-hcache was given. +if test "${enable_hcache+set}" = set; then + enableval=$enable_hcache; fi -done +# Check whether --with-tokyocabinet was given. +if test "${with_tokyocabinet+set}" = set; then + withval=$with_tokyocabinet; fi -SNPRINTFOBJS="" -ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = x""yes; then : - mutt_cv_func_snprintf=yes -else - mutt_cv_func_snprintf=no -fi -ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" -if test "x$ac_cv_func_vsnprintf" = x""yes; then : - mutt_cv_func_vsnprintf=yes -else - mutt_cv_func_vsnprintf=no +# Check whether --with-qdbm was given. +if test "${with_qdbm+set}" = set; then + withval=$with_qdbm; fi -if test $mutt_cv_func_snprintf = yes; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system's snprintf is C99 compliant" >&5 -$as_echo_n "checking whether your system's snprintf is C99 compliant... " >&6; } -if test "${mutt_cv_c99_snprintf+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - mutt_cv_c99_snprintf=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int main() -{ - char buf[8]; - int len = snprintf(buf, 4, "1234567"); - return (len != 7 || buf[3] != '\0'); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_c99_snprintf=yes -else - mutt_cv_c99_snprintf=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +# Check whether --with-gdbm was given. +if test "${with_gdbm+set}" = set; then + withval=$with_gdbm; fi + +# Check whether --with-bdb was given. +if test "${with_bdb+set}" = set; then + withval=$with_bdb; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_c99_snprintf" >&5 -$as_echo "$mutt_cv_c99_snprintf" >&6; } -else - mutt_cv_c99_snprintf=no -fi -if test $mutt_cv_func_vsnprintf = yes; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system's vsnprintf is C99 compliant" >&5 -$as_echo_n "checking whether your system's vsnprintf is C99 compliant... " >&6; } -if test "${mutt_cv_c99_vsnprintf+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - mutt_cv_c99_vsnprintf=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int foo(const char *fmt, ...) -{ - char buf[8]; - int len; - va_list ap; - va_start(ap, fmt); - len = vsnprintf(buf, 4, fmt, ap); - va_end(ap); - return (len != 7 || buf[3] != '\0'); -} -int main() -{ - return foo("%s", "1234567"); -} +if test x$enable_hcache = xyes +then +cat >>confdefs.h <<\_ACEOF +#define USE_HCACHE 1 _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_c99_vsnprintf=yes -else - mutt_cv_c99_vsnprintf=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_c99_vsnprintf" >&5 -$as_echo "$mutt_cv_c99_vsnprintf" >&6; } -else - mutt_cv_c99_vsnprintf=no -fi -if test $mutt_cv_c99_snprintf = yes; then + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache.o" -$as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h + OLDCPPFLAGS="$CPPFLAGS" + OLDLDFLAGS="$LDFLAGS" + OLDLIBS="$LIBS" -fi -if test $mutt_cv_c99_vsnprintf = yes; then + need_md5="yes" -$as_echo "#define HAVE_VSNPRINTF 1" >>confdefs.h + 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 + { { $as_echo "$as_me:$LINENO: error: more than one header cache engine requested." >&5 +$as_echo "$as_me: error: more than one header cache engine requested." >&2;} + { (exit 1); exit 1; }; } + else + db_requested=qdbm + fi + fi + if test -n "$with_gdbm" && test "$with_gdbm" != "no" + then + if test "$db_requested" != "auto" + then + { { $as_echo "$as_me:$LINENO: error: more than one header cache engine requested." >&5 +$as_echo "$as_me: error: more than one header cache engine requested." >&2;} + { (exit 1); exit 1; }; } + else + db_requested=gdbm + fi + fi + if test -n "$with_bdb" && test "$with_bdb" != "no" + then + if test "$db_requested" != "auto" + then + { { $as_echo "$as_me:$LINENO: error: more than one header cache engine requested." >&5 +$as_echo "$as_me: error: more than one header cache engine requested." >&2;} + { (exit 1); exit 1; }; } + else + db_requested=bdb + fi + fi -fi -if test $mutt_cv_c99_snprintf = no -o $mutt_cv_c99_vsnprintf = no; then - case " $LIBOBJS " in - *" snprintf.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" - ;; -esac + 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 + if test "${ac_cv_header_tcbdb_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for tcbdb.h" >&5 +$as_echo_n "checking for tcbdb.h... " >&6; } +if test "${ac_cv_header_tcbdb_h+set}" = set; then + $as_echo_n "(cached) " >&6 fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 -$as_echo_n "checking for va_copy... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -va_list ap1, ap2; va_copy(ap1, ap2); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: va_copy" >&5 -$as_echo "va_copy" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tcbdb_h" >&5 +$as_echo "$ac_cv_header_tcbdb_h" >&6; } else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking tcbdb.h usability" >&5 +$as_echo_n "checking tcbdb.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -va_list ap1, ap2; __va_copy(ap1, ap2); - ; - return 0; -} +$ac_includes_default +#include _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - $as_echo "#define va_copy __va_copy" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: __va_copy" >&5 -$as_echo "__va_copy" >&6; } +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - $as_echo "#define va_copy(dest,src) memcpy(&dest,&src,sizeof(va_list))" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: memcpy" >&5 -$as_echo "memcpy" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -for ac_func in ftruncate -do : - ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" -if test "x$ac_cv_func_ftruncate" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FTRUNCATE 1 +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking tcbdb.h presence" >&5 +$as_echo_n "checking tcbdb.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chsize in -lx" >&5 -$as_echo_n "checking for chsize in -lx... " >&6; } -if test "${ac_cv_lib_x_chsize+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char chsize (); -int -main () -{ -return chsize (); - ; - return 0; -} +#include _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_x_chsize=yes +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - ac_cv_lib_x_chsize=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_x_chsize" >&5 -$as_echo "$ac_cv_lib_x_chsize" >&6; } -if test "x$ac_cv_lib_x_chsize" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBX 1 -_ACEOF - - LIBS="-lx $LIBS" - -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi -done +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -for ac_func in strftime -do : - ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" -if test "x$ac_cv_func_strftime" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: tcbdb.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: tcbdb.h: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for tcbdb.h" >&5 +$as_echo_n "checking for tcbdb.h... " >&6; } +if test "${ac_cv_header_tcbdb_h+set}" = set; then + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 -$as_echo_n "checking for strftime in -lintl... " >&6; } -if test "${ac_cv_lib_intl_strftime+set}" = set; then : + ac_cv_header_tcbdb_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tcbdb_h" >&5 +$as_echo "$ac_cv_header_tcbdb_h" >&6; } + +fi +if test "x$ac_cv_header_tcbdb_h" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for tcbdbopen in -ltokyocabinet" >&5 +$as_echo_n "checking for tcbdbopen in -ltokyocabinet... " >&6; } +if test "${ac_cv_lib_tokyocabinet_tcbdbopen+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS="-ltokyocabinet $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8548,953 +17172,982 @@ #ifdef __cplusplus extern "C" #endif -char strftime (); +char tcbdbopen (); int main () { -return strftime (); +return tcbdbopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_strftime=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_tokyocabinet_tcbdbopen=yes else - ac_cv_lib_intl_strftime=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 -$as_echo "$ac_cv_lib_intl_strftime" >&6; } -if test "x$ac_cv_lib_intl_strftime" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL 1 -_ACEOF - - LIBS="-lintl $LIBS" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_tokyocabinet_tcbdbopen=no fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -done - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tokyocabinet_tcbdbopen" >&5 +$as_echo "$ac_cv_lib_tokyocabinet_tcbdbopen" >&6; } +if test "x$ac_cv_lib_tokyocabinet_tcbdbopen" = x""yes; then + MUTTLIBS="$MUTTLIBS -ltokyocabinet" -for ac_func in fchdir -do : - ac_fn_c_check_func "$LINENO" "fchdir" "ac_cv_func_fchdir" -if test "x$ac_cv_func_fchdir" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FCHDIR 1 +cat >>confdefs.h <<\_ACEOF +#define HAVE_TC 1 _ACEOF + db_found=tc else - mutt_cv_fchdir=no + CPPFLAGS="$OLDCPPFLAGS" + LDFLAGS="$OLDLDFLAGS" fi -done +fi -# Check whether --with-regex was given. -if test "${with_regex+set}" = set; then : - withval=$with_regex; mutt_cv_regex=yes -else - for ac_func in regcomp -do : - ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp" -if test "x$ac_cv_func_regcomp" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_REGCOMP 1 -_ACEOF - mutt_cv_regex=no -else - mutt_cv_regex=yes -fi -done + if test "$db_requested" != auto && test "$db_found" != "$db_requested" + then + { { $as_echo "$as_me:$LINENO: error: Tokyo Cabinet could not be used. Check config.log for details." >&5 +$as_echo "$as_me: error: Tokyo Cabinet could not be used. Check config.log for details." >&2;} + { (exit 1); exit 1; }; } + fi + fi -fi + 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 + if test -d $with_qdbm/include/qdbm; then + CPPFLAGS="$CPPFLAGS -I$with_qdbm/include/qdbm" + else + CPPFLAGS="$CPPFLAGS -I$with_qdbm/include" + fi + LDFLAGS="$LDFLAGS -L$with_qdbm/lib" + else + if test -d /usr/include/qdbm; then + CPPFLAGS="$CPPFLAGS -I/usr/include/qdbm" + fi + fi + saved_LIBS="$LIBS" -if test $mutt_cv_regex = no ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system's regexp library is completely broken" >&5 -$as_echo_n "checking whether your system's regexp library is completely broken... " >&6; } -if test "${mutt_cv_regex_broken+set}" = set; then : +for ac_header in villa.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - if test "$cross_compiling" = yes; then : - mutt_cv_regex_broken=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include -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); } +$ac_includes_default +#include <$ac_header> _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_regex_broken=no -else - mutt_cv_regex_broken=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_regex_broken" >&5 -$as_echo "$mutt_cv_regex_broken" >&6; } - if test $mutt_cv_regex_broken = yes ; then - echo "Using the included GNU regex instead." >&6 - mutt_cv_regex=yes - fi -fi - -if test $mutt_cv_regex = yes; then - -$as_echo "#define USE_GNU_REGEX 1" >>confdefs.h - - case " $LIBOBJS " in - *" regex.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS regex.$ac_objext" - ;; +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac - -fi - - - -# Check whether --with-homespool was given. -if test "${with_homespool+set}" = set; then : - withval=$with_homespool; with_homespool=${withval} -fi - -if test x$with_homespool != x; then - if test $with_homespool = yes; then - with_homespool=mailbox - fi - -cat >>confdefs.h <<_ACEOF -#define MAILPATH "$with_homespool" -_ACEOF - - -$as_echo "#define HOMESPOOL 1" >>confdefs.h - - -$as_echo "#define USE_DOTLOCK 1" >>confdefs.h - - mutt_cv_setgid=no -else - -# Check whether --with-mailpath was given. -if test "${with_mailpath+set}" = set; then : - withval=$with_mailpath; mutt_cv_mailpath=$withval -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking where new mail is stored" >&5 -$as_echo_n "checking where new mail is stored... " >&6; } -if test "${mutt_cv_mailpath+set}" = set; then : - $as_echo_n "(cached) " >&6 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - mutt_cv_mailpath=no - if test -d /var/mail; then - mutt_cv_mailpath=/var/mail - elif test -d /var/spool/mail; then - mutt_cv_mailpath=/var/spool/mail - elif test -d /usr/spool/mail; then - mutt_cv_mailpath=/usr/spool/mail - elif test -d /usr/mail; then - mutt_cv_mailpath=/usr/mail - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_mailpath" >&5 -$as_echo "$mutt_cv_mailpath" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi - if test "$mutt_cv_mailpath" = no; then - as_fn_error "\"Could not determine where new mail is stored.\"" "$LINENO" 5 - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -cat >>confdefs.h <<_ACEOF -#define MAILPATH "$mutt_cv_mailpath" +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> _ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $mutt_cv_mailpath is world writable" >&5 -$as_echo_n "checking if $mutt_cv_mailpath is world writable... " >&6; } -if test "${mutt_cv_worldwrite+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - mutt_cv_worldwrite=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -int main (int argc, char **argv) -{ - struct stat s; +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - stat ("$mutt_cv_mailpath", &s); - if (s.st_mode & S_IWOTH) exit (0); - exit (1); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_worldwrite=yes + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - mutt_cv_worldwrite=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_worldwrite" >&5 -$as_echo "$mutt_cv_worldwrite" >&6; } - - mutt_cv_setgid=no - if test $mutt_cv_worldwrite = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -$as_echo "#define USE_DOTLOCK 1" >>confdefs.h +fi - else +done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $mutt_cv_mailpath is group writable" >&5 -$as_echo_n "checking if $mutt_cv_mailpath is group writable... " >&6; } -if test "${mutt_cv_groupwrite+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking for vlopen in -lqdbm" >&5 +$as_echo_n "checking for vlopen in -lqdbm... " >&6; } +if test "${ac_cv_lib_qdbm_vlopen+set}" = set; then $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - mutt_cv_groupwrite=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lqdbm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include -int main (int argc, char **argv) +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char vlopen (); +int +main () { - struct stat s; - - stat ("$mutt_cv_mailpath", &s); - if (s.st_mode & S_IWGRP) exit (0); - exit (1); +return vlopen (); + ; + return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_groupwrite=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_qdbm_vlopen=yes else - mutt_cv_groupwrite=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_groupwrite" >&5 -$as_echo "$mutt_cv_groupwrite" >&6; } - - if test $mutt_cv_groupwrite = yes; then - -$as_echo "#define USE_DOTLOCK 1" >>confdefs.h - - -$as_echo "#define USE_SETGID 1" >>confdefs.h + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - mutt_cv_setgid=yes - fi - fi + ac_cv_lib_qdbm_vlopen=no fi -# Check whether --enable-external_dotlock was given. -if test "${enable_external_dotlock+set}" = set; then : - enableval=$enable_external_dotlock; mutt_cv_external_dotlock="$enableval" +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_qdbm_vlopen" >&5 +$as_echo "$ac_cv_lib_qdbm_vlopen" >&6; } +if test "x$ac_cv_lib_qdbm_vlopen" = x""yes; then + MUTTLIBS="$MUTTLIBS -lqdbm" +cat >>confdefs.h <<\_ACEOF +#define HAVE_QDBM 1 +_ACEOF -if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ - || test "x$mutt_cv_external_dotlock" = "xyes" -then - -$as_echo "#define DL_STANDALONE 1" >>confdefs.h - - DOTLOCK_TARGET="mutt_dotlock\$(EXEEXT)" + db_found=qdbm else - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS dotlock.o" -fi - - - -if test -z "$datarootdir"; then - datarootdir='${prefix}/share' + CPPFLAGS="$OLDCPPFLAGS" + LDFLAGS="$OLDLDFLAGS" fi + LIBS="$saved_LIBS" + if test "$db_requested" != auto && test "$db_found" != "$db_requested" + then + { { $as_echo "$as_me:$LINENO: error: QDBM could not be used. Check config.log for details." >&5 +$as_echo "$as_me: error: QDBM could not be used. Check config.log for details." >&2;} + { (exit 1); exit 1; }; } + fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to put the documentation" >&5 -$as_echo_n "checking where to put the documentation... " >&6; } - -# Check whether --with-docdir was given. -if test "${with_docdir+set}" = set; then : - withval=$with_docdir; mutt_cv_docdir=$withval + 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 + CPPFLAGS="$CPPFLAGS -I$with_gdbm/include" + LDFLAGS="$LDFLAGS -L$with_gdbm/lib" + fi + saved_LIBS="$LIBS" + LIBS="$LIBS -lgdbm" + { $as_echo "$as_me:$LINENO: checking for gdbm_open" >&5 +$as_echo_n "checking for gdbm_open... " >&6; } +if test "${ac_cv_gdbmopen+set}" = set; then + $as_echo_n "(cached) " >&6 else - mutt_cv_docdir='${datarootdir}/doc/mutt' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_docdir" >&5 -$as_echo "$mutt_cv_docdir" >&6; } -if test -z "$docdir" -o -n "$with_docdir" -then - docdir=$mutt_cv_docdir -fi + ac_cv_gdbmopen=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +gdbm_open(0,0,0,0,0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_gdbmopen=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -if test x$mutt_cv_setgid = xyes; then - DOTLOCK_GROUP='mail' - DOTLOCK_PERMISSION=2755 -else - DOTLOCK_GROUP='' - DOTLOCK_PERMISSION=755 fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_gdbmopen" >&5 +$as_echo "$ac_cv_gdbmopen" >&6; } + LIBS="$saved_LIBS" + if test "$ac_cv_gdbmopen" = yes + then +cat >>confdefs.h <<\_ACEOF +#define HAVE_GDBM 1 +_ACEOF -# Check whether --with-domain was given. -if test "${with_domain+set}" = set; then : - withval=$with_domain; if test $withval != yes; then - if test $withval != no; then + MUTTLIBS="$MUTTLIBS -lgdbm" + db_found=gdbm + fi + if test "$db_requested" != auto && test "$db_found" != "$db_requested" + then + { { $as_echo "$as_me:$LINENO: error: GDBM could not be used. Check config.log for details." >&5 +$as_echo "$as_me: error: GDBM could not be used. Check config.log for details." >&2;} + { (exit 1); exit 1; }; } + fi + fi -cat >>confdefs.h <<_ACEOF -#define DOMAIN "$withval" + ac_bdb_prefix="$with_bdb" + 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 + ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + fi + 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.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" + { $as_echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5 +$as_echo_n "checking for BerkeleyDB > 4.0... " >&6; } + 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" + for bdblibdir in "$d/lib/$v" "$d/lib"; do + test -d "$bdblibdir" || continue + BDB_LIB_DIR="$bdblibdir" + for l in `echo $BDB_VERSIONS`; do + CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR" + LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - fi - fi -fi + #include + #include +int +main () +{ -need_socket="no" + DB *db = NULL; + db->open(db,NULL,NULL,NULL,0,0,0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then -# Check whether --enable-pop was given. -if test "${enable_pop+set}" = set; then : - enableval=$enable_pop; if test x$enableval = xyes ; then + ac_cv_dbcreate=yes + BDB_LIB="$l" + break -$as_echo "#define USE_POP 1" >>confdefs.h +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o" - need_pop="yes" - need_socket="yes" - need_md5="yes" - fi fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + done + test x$ac_cv_dbcreate = xyes && break 2 + done + fi + done + test x$BDB_LIB != x && break + done + if test x$ac_cv_dbcreate = xyes + then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR" + LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" -# Check whether --enable-imap was given. -if test "${enable_imap+set}" = set; then : - enableval=$enable_imap; if test x$enableval = xyes ; then - -$as_echo "#define USE_IMAP 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_DB4 1 +_ACEOF - LIBIMAP="-Limap -limap" - LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a" - need_imap="yes" - need_socket="yes" - need_md5="yes" + db_found=bdb + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi + if test $db_found = no + then + { { $as_echo "$as_me:$LINENO: error: You need Tokyo Cabinet, QDBM, GDBM or Berkeley DB4 for hcache" >&5 +$as_echo "$as_me: error: You need Tokyo Cabinet, QDBM, GDBM or Berkeley DB4 for hcache" >&2;} + { (exit 1); exit 1; }; } + fi fi - if test x$need_imap = xyes; then - BUILD_IMAP_TRUE= - BUILD_IMAP_FALSE='#' -else - BUILD_IMAP_TRUE='#' - BUILD_IMAP_FALSE= -fi - - -# Check whether --enable-smtp was given. -if test "${enable_smtp+set}" = set; then : - enableval=$enable_smtp; if test $enableval = yes; then - -$as_echo "#define USE_SMTP 1" >>confdefs.h - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smtp.o" - need_socket="yes" - fi +if test "$need_md5" = "yes" +then + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o" + MUTT_MD5="mutt_md5" fi -if test x"$need_imap" = xyes -o x"$need_pop" = xyes ; then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS bcache.o" -fi - -if test "$need_socket" = "yes" -then - for ac_header in sys/select.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_select_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_SELECT_H 1 -_ACEOF -fi -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 -$as_echo_n "checking for socklen_t... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "socklen_t" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "#define socklen_t int" >>confdefs.h +# Check whether --enable-iconv was given. +if test "${enable_iconv+set}" = set; then + enableval=$enable_iconv; if test x$enableval = xno ; then + am_cv_func_iconv=no + fi fi -rm -f conftest* - ac_fn_c_check_func "$LINENO" "gethostent" "ac_cv_func_gethostent" -if test "x$ac_cv_func_gethostent" = x""yes; then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostent in -lnsl" >&5 -$as_echo_n "checking for gethostent in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostent+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking for off_t" >&5 +$as_echo_n "checking for off_t... " >&6; } +if test "${ac_cv_type_off_t+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_type_off_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostent (); +$ac_includes_default int main () { -return gethostent (); +if (sizeof (off_t)) + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_nsl_gethostent=yes -else - ac_cv_lib_nsl_gethostent=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostent" >&5 -$as_echo "$ac_cv_lib_nsl_gethostent" >&6; } -if test "x$ac_cv_lib_nsl_gethostent" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF - - LIBS="-lnsl $LIBS" - -fi - -fi - - ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt" -if test "x$ac_cv_func_setsockopt" = x""yes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5 -$as_echo_n "checking for setsockopt in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_setsockopt+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char setsockopt (); +$ac_includes_default int main () { -return setsockopt (); +if (sizeof ((off_t))) + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_setsockopt=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - ac_cv_lib_socket_setsockopt=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5 -$as_echo "$ac_cv_lib_socket_setsockopt" >&6; } -if test "x$ac_cv_lib_socket_setsockopt" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_off_t=yes fi -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - for ac_func in getaddrinfo -do : - ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" -if test "x$ac_cv_func_getaddrinfo" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETADDRINFO 1 -_ACEOF fi -done - -$as_echo "#define USE_SOCKET 1" >>confdefs.h - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - - -# Check whether --with-gss was given. -if test "${with_gss+set}" = set; then : - withval=$with_gss; gss_prefix="$withval" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +$as_echo "$ac_cv_type_off_t" >&6; } +if test "x$ac_cv_type_off_t" = x""yes; then + : else - gss_prefix="no" -fi - -if test "$gss_prefix" != "no" -then - if test "$need_imap" = "yes" - then - GSSAPI_PREFIX=$gss_prefix - GSSAPI_IMPL="none" - saved_CPPFLAGS="$CPPFLAGS" - saved_LDFLAGS="$LDFLAGS" - saved_LIBS="$LIBS" - if test "$GSSAPI_PREFIX" != "yes" - then - krb5_path="$GSSAPI_PREFIX/bin" - else - krb5_path="$PATH" - fi - # Extract the first word of "krb5-config", so it can be a program name with args. -set dummy krb5-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_KRB5CFGPATH+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $KRB5CFGPATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_KRB5CFGPATH="$KRB5CFGPATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $krb5_path -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_KRB5CFGPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF - test -z "$ac_cv_path_KRB5CFGPATH" && ac_cv_path_KRB5CFGPATH="none" - ;; -esac -fi -KRB5CFGPATH=$ac_cv_path_KRB5CFGPATH -if test -n "$KRB5CFGPATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5CFGPATH" >&5 -$as_echo "$KRB5CFGPATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi - - if test "$KRB5CFGPATH" != "none" - then - GSSAPI_CFLAGS="$CPPFLAGS `$KRB5CFGPATH --cflags gssapi`" - GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`" - case "`$KRB5CFGPATH --version`" in - "Kerberos 5 "*) GSSAPI_IMPL="MIT";; - ?eimdal*) GSSAPI_IMPL="Heimdal";; - *) GSSAPI_IMPL="Unknown";; - esac - else - if test "$GSSAPI_PREFIX" != "yes" - then - GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include" - GSSAPI_LDFLAGS="-L$GSSAPI_PREFIX/lib" - CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" - LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi_krb5" >&5 -$as_echo_n "checking for gss_init_sec_context in -lgssapi_krb5... " >&6; } -if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 +$as_echo_n "checking for size_t... " >&6; } +if test "${ac_cv_type_size_t+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_type_size_t=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gss_init_sec_context (); +$ac_includes_default int main () { -return gss_init_sec_context (); +if (sizeof ((size_t))) + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - ac_cv_lib_gssapi_krb5_gss_init_sec_context=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_size_t=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 -$as_echo "$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; } -if test "x$ac_cv_lib_gssapi_krb5_gss_init_sec_context" = x""yes; then : - GSSAPI_IMPL="MIT", - GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +$as_echo "$ac_cv_type_size_t" >&6; } +if test "x$ac_cv_type_size_t" = x""yes; then + : +else - if test "$GSSAPI_IMPL" = "none" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi" >&5 -$as_echo_n "checking for gss_init_sec_context in -lgssapi... " >&6; } -if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then : +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if test "${ac_cv_working_alloca_h+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gss_init_sec_context (); +#include int main () { -return gss_init_sec_context (); +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gssapi_gss_init_sec_context=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_working_alloca_h=yes else - ac_cv_lib_gssapi_gss_init_sec_context=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_working_alloca_h=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 -$as_echo "$ac_cv_lib_gssapi_gss_init_sec_context" >&6; } -if test "x$ac_cv_lib_gssapi_gss_init_sec_context" = x""yes; then : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then - GSSAPI_IMPL="Heimdal" - GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lasn1 -lroken" - GSSAPI_LIBS="$GSSAPI_LIBS -lcrypt -lcom_err" +cat >>confdefs.h <<\_ACEOF +#define HAVE_ALLOCA_H 1 +_ACEOF fi - fi - - if test "$GSSAPI_IMPL" = "none" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g_order_init in -lgssapi_krb5" >&5 -$as_echo_n "checking for g_order_init in -lgssapi_krb5... " >&6; } -if test "${ac_cv_lib_gssapi_krb5_g_order_init+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if test "${ac_cv_func_alloca_works+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# ifdef HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif #endif -char g_order_init (); + int main () { -return g_order_init (); +char *p = (char *) alloca (1); + if (p) return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gssapi_krb5_g_order_init=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_func_alloca_works=yes else - ac_cv_lib_gssapi_krb5_g_order_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_g_order_init" >&5 -$as_echo "$ac_cv_lib_gssapi_krb5_g_order_init" >&6; } -if test "x$ac_cv_lib_gssapi_krb5_g_order_init" = x""yes; then : - - GSSAPI_IMPL="OldMIT", - GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_alloca_works=no fi - fi - fi - - CPPFLAGS="$saved_CPPFLAGS" - LDFLAGS="$saved_LDFLAGS" - LIBS="$saved_LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSSAPI implementation" >&5 -$as_echo_n "checking GSSAPI implementation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSSAPI_IMPL" >&5 -$as_echo "$GSSAPI_IMPL" >&6; } - if test "$GSSAPI_IMPL" = "none" - then - cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -rm -f confcache - { $as_echo "$as_me:${as_lineno-$LINENO}: result: GSSAPI libraries not found" >&5 -$as_echo "GSSAPI libraries not found" >&6; } - fi - if test "$GSSAPI_IMPL" = "Heimdal" - then - -$as_echo "#define HAVE_HEIMDAL 1" >>confdefs.h +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } - fi - CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" - MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS" +if test $ac_cv_func_alloca_works = yes; then -$as_echo "#define USE_GSS 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_ALLOCA 1 +_ACEOF - need_gss="yes" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GSS was requested but IMAP is not enabled" >&5 -$as_echo "$as_me: WARNING: GSS was requested but IMAP is not enabled" >&2;} - fi -fi - if test x$need_gss = xyes; then - USE_GSS_TRUE= - USE_GSS_FALSE='#' else - USE_GSS_TRUE='#' - USE_GSS_FALSE= -fi - + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext +cat >>confdefs.h <<\_ACEOF +#define C_ALLOCA 1 +_ACEOF -# Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then : - withval=$with_ssl; if test "$with_ssl" != "no" - then - if test "$need_socket" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&5 -$as_echo "$as_me: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&2;} - else - if test "$with_ssl" != "yes" - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" - fi - saved_LIBS="$LIBS" - crypto_libs="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -$as_echo_n "checking for deflate in -lz... " >&6; } -if test "${ac_cv_lib_z_deflate+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } +if test "${ac_cv_os_cray+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" +#if defined CRAY && ! defined CRAY2 +webecray +#else +wenotbecray #endif -char deflate (); -int -main () -{ -return deflate (); - ; - return 0; -} + _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_z_deflate=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "webecray" >/dev/null 2>&1; then + ac_cv_os_cray=yes else - ac_cv_lib_z_deflate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -$as_echo "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = x""yes; then : - crypto_libs=-lz + ac_cv_os_cray=no fi +rm -f conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_new in -lcrypto" >&5 -$as_echo_n "checking for X509_new in -lcrypto... " >&6; } -if test "${ac_cv_lib_crypto_X509_new+set}" = set; then : +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } +if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $crypto_libs $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9502,140 +18155,333 @@ #ifdef __cplusplus extern "C" #endif -char X509_new (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + int main () { -return X509_new (); +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_crypto_X509_new=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - ac_cv_lib_crypto_X509_new=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_X509_new" >&5 -$as_echo "$ac_cv_lib_crypto_X509_new" >&6; } -if test "x$ac_cv_lib_crypto_X509_new" = x""yes; then : - crypto_libs="-lcrypto $crypto_libs" +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define CRAY_STACKSEG_END $ac_func +_ACEOF + + break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5 -$as_echo_n "checking for SSL_new in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then : + done +fi + +{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +$as_echo_n "checking stack direction for C alloca... " >&6; } +if test "${ac_cv_c_stack_direction+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $crypto_libs $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default +int +find_stack_direction () +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } + else + return (&dummy > addr) ? 1 : -1; +} -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_new (); int main () { -return SSL_new (); - ; - return 0; + return find_stack_direction () < 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_SSL_new=yes +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_stack_direction=1 else - ac_cv_lib_ssl_SSL_new=no + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_stack_direction=-1 fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5 -$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; } -if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF - LIBS="-lssl $LIBS" -else - as_fn_error "Unable to find SSL library" "$LINENO" 5 fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } - - LIBS="$LIBS $crypto_libs" - for ac_func in RAND_status RAND_egd -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define STACK_DIRECTION $ac_cv_c_stack_direction _ACEOF + fi -done -$as_echo "#define USE_SSL 1" >>confdefs.h +for ac_header in stdlib.h unistd.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no +fi -$as_echo "#define USE_SSL_OPENSSL 1" >>confdefs.h +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } - LIBS="$saved_LIBS" - MUTTLIBS="$MUTTLIBS -lssl $crypto_libs" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl.o" - need_ssl=yes - fi - fi +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -# Check whether --with-gnutls was given. -if test "${with_gnutls+set}" = set; then : - withval=$with_gnutls; gnutls_prefix="$withval" + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - gnutls_prefix="no" + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } -if test "$gnutls_prefix" != "no" && test x"$need_ssl" != xyes -then - if test "$need_socket" != "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&5 -$as_echo "$as_me: WARNING: SSL support is only useful with POP, IMAP or SMTP support" >&2;} - else - if test "$gnutls_prefix" != "yes" - then - LDFLAGS="$LDFLAGS -L$gnutls_prefix/lib" - CPPFLAGS="$CPPFLAGS -I$gnutls_prefix/include" - fi - saved_LIBS="$LIBS" +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_check_version in -lgnutls" >&5 -$as_echo_n "checking for gnutls_check_version in -lgnutls... " >&6; } -if test "${ac_cv_lib_gnutls_gnutls_check_version+set}" = set; then : +fi + +done + + +for ac_func in getpagesize +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgnutls $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -9643,2120 +18489,3094 @@ #ifdef __cplusplus extern "C" #endif -char gnutls_check_version (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + int main () { -return gnutls_check_version (); +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gnutls_gnutls_check_version=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - ac_cv_lib_gnutls_gnutls_check_version=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_check_version" >&5 -$as_echo "$ac_cv_lib_gnutls_gnutls_check_version" >&6; } -if test "x$ac_cv_lib_gnutls_gnutls_check_version" = x""yes; then : - ac_fn_c_check_decl "$LINENO" "GNUTLS_VERIFY_DISABLE_TIME_CHECKS" "ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS" "#include -" -if test "x$ac_cv_have_decl_GNUTLS_VERIFY_DISABLE_TIME_CHECKS" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + fi +done -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GNUTLS_VERIFY_DISABLE_TIME_CHECKS $ac_have_decl +{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +$as_echo_n "checking for working mmap... " >&6; } +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +/* malloc might have been renamed as rpl_malloc. */ +#undef malloc +/* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped + For private mappings, we should verify that changes cannot be read() + back from the file, nor mmap's back from the file at a different + address. (There have been systems where private was not correctly + implemented like the infamous i386 svr4.0, and systems where the + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propagated back to all the places they're supposed to be. - LIBS="$saved_LIBS" - MUTTLIBS="$MUTTLIBS -lgnutls" + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ +#include +#include -$as_echo "#define USE_SSL 1" >>confdefs.h +#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +char *malloc (); +#endif +/* This mess was copied from the GNU getpagesize.h. */ +#ifndef HAVE_GETPAGESIZE +/* Assume that all systems that can run configure have sys/param.h. */ +# ifndef HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H 1 +# endif -$as_echo "#define USE_SSL_GNUTLS 1" >>confdefs.h +# ifdef _SC_PAGESIZE +# define getpagesize() sysconf(_SC_PAGESIZE) +# else /* no _SC_PAGESIZE */ +# ifdef HAVE_SYS_PARAM_H +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ +#endif /* no HAVE_GETPAGESIZE */ - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o" - need_ssl=yes -else - as_fn_error "could not find libgnutls" "$LINENO" 5 -fi +int +main () +{ + char *data, *data2, *data3; + int i, pagesize; + int fd; - fi -fi + pagesize = getpagesize (); - if test x$need_ssl = xyes; then - USE_SSL_TRUE= - USE_SSL_FALSE='#' + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + return 1; + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + return 1; + if (write (fd, data, pagesize) != pagesize) + return 1; + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + return 1; + data2 = (char *) malloc (2 * pagesize); + if (!data2) + return 1; + data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + return 1; + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + return 1; + if (read (fd, data3, pagesize) != pagesize) + return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + return 1; + close (fd); + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes else - USE_SSL_TRUE='#' - USE_SSL_FALSE= + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_func_mmap_fixed_mapped=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +if test $ac_cv_func_mmap_fixed_mapped = yes; then -# Check whether --with-sasl was given. -if test "${with_sasl+set}" = set; then : - withval=$with_sasl; - if test "$with_sasl" != "no" - then - if test "$need_socket" != "yes" - then - as_fn_error "SASL support is only useful with POP or IMAP support" "$LINENO" 5 - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_MMAP 1 +_ACEOF - if test "$with_sasl" != "yes" - then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" - LDFLAGS="$LDFLAGS -L$with_sasl/lib" - fi +fi +rm -f conftest.mmap - saved_LIBS="$LIBS" - LIBS= - # OpenSolaris provides a SASL2 interface in libsasl - sasl_libs="sasl2 sasl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sasl_encode64" >&5 -$as_echo_n "checking for library containing sasl_encode64... " >&6; } -if test "${ac_cv_search_sasl_encode64+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 +$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; } +if test "${ac_cv_gnu_library_2_1+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif #endif -char sasl_encode64 (); -int -main () -{ -return sasl_encode64 (); - ; - return 0; -} -_ACEOF -for ac_lib in '' $sasl_libs; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_sasl_encode64=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_sasl_encode64+set}" = set; then : - break -fi -done -if test "${ac_cv_search_sasl_encode64+set}" = set; then : - -else - ac_cv_search_sasl_encode64=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sasl_encode64" >&5 -$as_echo "$ac_cv_search_sasl_encode64" >&6; } -ac_res=$ac_cv_search_sasl_encode64 -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then + ac_cv_gnu_library_2_1=yes else - as_fn_error "could not find sasl lib" "$LINENO" 5 + ac_cv_gnu_library_2_1=no fi +rm -f conftest* - MUTTLIBS="$MUTTLIBS $LIBS" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" - LIBS="$saved_LIBS" +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 +$as_echo "$ac_cv_gnu_library_2_1" >&6; } -$as_echo "#define USE_SASL 1" >>confdefs.h + GLIBC21="$ac_cv_gnu_library_2_1" - need_sasl=yes - fi -fi - if test x$need_sasl = xyes; then - USE_SASL_TRUE= - USE_SASL_FALSE='#' -else - USE_SASL_TRUE='#' - USE_SASL_FALSE= -fi -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; if test x$enableval = xyes ; then -$as_echo "#define DEBUG 1" >>confdefs.h - fi -fi -# Check whether --enable-flock was given. -if test "${enable_flock+set}" = set; then : - enableval=$enable_flock; if test $enableval = yes; then -$as_echo "#define USE_FLOCK 1" >>confdefs.h - fi +for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - -mutt_cv_fcntl=yes -# Check whether --enable-fcntl was given. -if test "${enable_fcntl+set}" = set; then : - enableval=$enable_fcntl; if test $enableval = no; then mutt_cv_fcntl=no; fi + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -if test $mutt_cv_fcntl = yes; then - -$as_echo "#define USE_FCNTL 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct dirent defines d_ino" >&5 -$as_echo_n "checking whether struct dirent defines d_ino... " >&6; } -ac_cv_dirent_d_ino=no -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -struct dirent dp; (void)dp.d_ino - ; - return 0; -} +#include <$ac_header> _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_dirent_d_ino=yes +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test x$ac_cv_dirent_d_ino = xyes ; then -$as_echo "#define HAVE_DIRENT_D_INO 1" >>confdefs.h +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dirent_d_ino" >&5 -$as_echo "$ac_cv_dirent_d_ino" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -mutt_cv_warnings=yes -# Check whether --enable-warnings was given. -if test "${enable_warnings+set}" = set; then : - enableval=$enable_warnings; if test $enableval = no; then - mutt_cv_warnings=no -fi + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -if test x$GCC = xyes && test $mutt_cv_warnings = yes; then - CFLAGS="-Wall -pedantic -Wno-long-long $CFLAGS" fi -# Check whether --enable-nfs-fix was given. -if test "${enable_nfs_fix+set}" = set; then : - enableval=$enable_nfs_fix; if test x$enableval = xyes; then +done -$as_echo "#define NFS_ATTRIBUTE_HACK 1" >>confdefs.h - fi -fi -# Check whether --enable-mailtool was given. -if test "${enable_mailtool+set}" = set; then : - enableval=$enable_mailtool; if test x$enableval = xyes; then -$as_echo "#define SUN_ATTACHMENT 1" >>confdefs.h - fi -fi -# Check whether --enable-locales-fix was given. -if test "${enable_locales_fix+set}" = set; then : - enableval=$enable_locales_fix; if test x$enableval = xyes; then -$as_echo "#define LOCALES_HACK 1" >>confdefs.h - fi -fi -# Check whether --with-exec-shell was given. -if test "${with_exec_shell+set}" = set; then : - withval=$with_exec_shell; if test $withval != yes; then -cat >>confdefs.h <<_ACEOF -#define EXECSHELL "$withval" -_ACEOF - else - cat >>confdefs.h <<_ACEOF -#define EXECSHELL "/bin/sh" -_ACEOF - fi -else - cat >>confdefs.h <<_ACEOF -#define EXECSHELL "/bin/sh" -_ACEOF -fi -# Check whether --enable-exact-address was given. -if test "${enable_exact_address+set}" = set; then : - enableval=$enable_exact_address; if test $enableval = yes; then -$as_echo "#define EXACT_ADDRESS 1" >>confdefs.h - fi -fi +for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +strdup strtoul tsearch __argz_count __argz_stringify __argz_next +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -db_found=no -db_requested=auto -# Check whether --enable-hcache was given. -if test "${enable_hcache+set}" = set; then : - enableval=$enable_hcache; -fi +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func -# Check whether --with-tokyocabinet was given. -if test "${with_tokyocabinet+set}" = set; then : - withval=$with_tokyocabinet; -fi +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Check whether --with-qdbm was given. -if test "${with_qdbm+set}" = set; then : - withval=$with_qdbm; + eval "$as_ac_var=no" fi - -# Check whether --with-gdbm was given. -if test "${with_gdbm+set}" = set; then : - withval=$with_gdbm; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - -# Check whether --with-bdb was given. -if test "${with_bdb+set}" = set; then : - withval=$with_bdb; fi +done -db_found=no -if test x$enable_hcache = xyes -then - -$as_echo "#define USE_HCACHE 1" >>confdefs.h - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache.o" - - OLDCPPFLAGS="$CPPFLAGS" - OLDLDFLAGS="$LDFLAGS" - OLDLIBS="$LIBS" - need_md5="yes" - 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 - as_fn_error "more than one header cache engine requested." "$LINENO" 5 - else - db_requested=qdbm - fi - fi - if test -n "$with_gdbm" && test "$with_gdbm" != "no" - then - if test "$db_requested" != "auto" - then - as_fn_error "more than one header cache engine requested." "$LINENO" 5 - else - db_requested=gdbm - fi - fi - if test -n "$with_bdb" && test "$with_bdb" != "no" - then - if test "$db_requested" != "auto" - then - as_fn_error "more than one header cache engine requested." "$LINENO" 5 - else - db_requested=bdb - fi - fi - 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 +# Check whether --with-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then + withval=$with_libiconv_prefix; + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done - ac_fn_c_check_header_mongrel "$LINENO" "tcbdb.h" "ac_cv_header_tcbdb_h" "$ac_includes_default" -if test "x$ac_cv_header_tcbdb_h" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcbdbopen in -ltokyocabinet" >&5 -$as_echo_n "checking for tcbdbopen in -ltokyocabinet... " >&6; } -if test "${ac_cv_lib_tokyocabinet_tcbdbopen+set}" = set; then : +fi + + + { $as_echo "$as_me:$LINENO: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if test "${am_cv_func_iconv+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltokyocabinet $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char tcbdbopen (); + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include int main () { -return tcbdbopen (); +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_tokyocabinet_tcbdbopen=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + am_cv_func_iconv=yes else - ac_cv_lib_tokyocabinet_tcbdbopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tokyocabinet_tcbdbopen" >&5 -$as_echo "$ac_cv_lib_tokyocabinet_tcbdbopen" >&6; } -if test "x$ac_cv_lib_tokyocabinet_tcbdbopen" = x""yes; then : - MUTTLIBS="$MUTTLIBS -ltokyocabinet" - -$as_echo "#define HAVE_TC 1" >>confdefs.h + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - db_found=tc -else - CPPFLAGS="$OLDCPPFLAGS" - LDFLAGS="$OLDLDFLAGS" -fi fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "$db_requested" != auto && test "$db_found" != "$db_requested" - then - as_fn_error "Tokyo Cabinet could not be used. Check config.log for details." "$LINENO" 5 - fi - fi - 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 - if test -d $with_qdbm/include/qdbm; then - CPPFLAGS="$CPPFLAGS -I$with_qdbm/include/qdbm" - else - CPPFLAGS="$CPPFLAGS -I$with_qdbm/include" - fi - LDFLAGS="$LDFLAGS -L$with_qdbm/lib" - else - if test -d /usr/include/qdbm; then - CPPFLAGS="$CPPFLAGS -I/usr/include/qdbm" - fi - fi +fi - saved_LIBS="$LIBS" - for ac_header in villa.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "villa.h" "ac_cv_header_villa_h" "$ac_includes_default" -if test "x$ac_cv_header_villa_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VILLA_H 1 -_ACEOF +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then -done +cat >>confdefs.h <<\_ACEOF +#define HAVE_ICONV 1 +_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vlopen in -lqdbm" >&5 -$as_echo_n "checking for vlopen in -lqdbm... " >&6; } -if test "${ac_cv_lib_qdbm_vlopen+set}" = set; then : + { $as_echo "$as_me:$LINENO: checking for iconv declaration" >&5 +$as_echo_n "checking for iconv declaration... " >&6; } + if test "${am_cv_proto_iconv+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lqdbm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +#include +#include +extern #ifdef __cplusplus -extern "C" +"C" #endif -char vlopen (); +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif + int main () { -return vlopen (); + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_qdbm_vlopen=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + am_cv_proto_iconv_arg1="" else - ac_cv_lib_qdbm_vlopen=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + am_cv_proto_iconv_arg1="const" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qdbm_vlopen" >&5 -$as_echo "$ac_cv_lib_qdbm_vlopen" >&6; } -if test "x$ac_cv_lib_qdbm_vlopen" = x""yes; then : - MUTTLIBS="$MUTTLIBS -lqdbm" -$as_echo "#define HAVE_QDBM 1" >>confdefs.h + am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + { $as_echo "$as_me:$LINENO: result: ${ac_t:- + }$am_cv_proto_iconv" >&5 +$as_echo "${ac_t:- + }$am_cv_proto_iconv" >&6; } - db_found=qdbm -else - CPPFLAGS="$OLDCPPFLAGS" - LDFLAGS="$OLDLDFLAGS" -fi +cat >>confdefs.h <<_ACEOF +#define ICONV_CONST $am_cv_proto_iconv_arg1 +_ACEOF - LIBS="$saved_LIBS" - if test "$db_requested" != auto && test "$db_found" != "$db_requested" - then - as_fn_error "QDBM could not be used. Check config.log for details." "$LINENO" 5 - fi - fi + fi + LIBICONV= + if test "$am_cv_lib_iconv" = yes; then + LIBICONV="-liconv" + fi - 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 - CPPFLAGS="$CPPFLAGS -I$with_gdbm/include" - LDFLAGS="$LDFLAGS -L$with_gdbm/lib" - fi - saved_LIBS="$LIBS" - LIBS="$LIBS -lgdbm" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open" >&5 -$as_echo_n "checking for gdbm_open... " >&6; } -if test "${ac_cv_gdbmopen+set}" = set; then : + + + { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 +$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } +if test "${am_cv_langinfo_codeset+set}" = set; then $as_echo_n "(cached) " >&6 else - - ac_cv_gdbmopen=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -gdbm_open(0,0,0,0,0); +char* cs = nl_langinfo(CODESET); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_gdbmopen=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + am_cv_langinfo_codeset=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + am_cv_langinfo_codeset=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gdbmopen" >&5 -$as_echo "$ac_cv_gdbmopen" >&6; } - LIBS="$saved_LIBS" - if test "$ac_cv_gdbmopen" = yes - then - -$as_echo "#define HAVE_GDBM 1" >>confdefs.h - - MUTTLIBS="$MUTTLIBS -lgdbm" - db_found=gdbm - fi - if test "$db_requested" != auto && test "$db_found" != "$db_requested" - then - as_fn_error "GDBM could not be used. Check config.log for details." "$LINENO" 5 - fi - fi - - ac_bdb_prefix="$with_bdb" - 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 - ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" - fi - 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.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BerkeleyDB > 4.0" >&5 -$as_echo_n "checking for BerkeleyDB > 4.0... " >&6; } - 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" - for bdblibdir in "$d/lib/$v" "$d/lib"; do - test -d "$bdblibdir" || continue - BDB_LIB_DIR="$bdblibdir" - for l in `echo $BDB_VERSIONS`; do - CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR" - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include - #include +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 +$as_echo "$am_cv_langinfo_codeset" >&6; } + if test $am_cv_langinfo_codeset = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LANGINFO_CODESET 1 +_ACEOF + fi + + if test $ac_cv_header_locale_h = yes; then + { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include int main () { - - DB *db = NULL; - db->open(db,NULL,NULL,NULL,0,0,0); - +return LC_MESSAGES ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - ac_cv_dbcreate=yes - BDB_LIB="$l" - break +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + am_cv_val_LC_MESSAGES=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + am_cv_val_LC_MESSAGES=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - test x$ac_cv_dbcreate = xyes && break 2 - done - fi - done - test x$BDB_LIB != x && break - done - if test x$ac_cv_dbcreate = xyes - then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR" - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" -$as_echo "#define HAVE_DB4 1" >>confdefs.h +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then - db_found=bdb - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_LC_MESSAGES 1 +_ACEOF - if test $db_found = no - then - as_fn_error "You need Tokyo Cabinet, QDBM, GDBM or Berkeley DB4 for hcache" "$LINENO" 5 fi -fi - - if test x$db_found != xno; then - BUILD_HCACHE_TRUE= - BUILD_HCACHE_FALSE='#' + fi + { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then + enableval=$enable_nls; USE_NLS=$enableval else - BUILD_HCACHE_TRUE='#' - BUILD_HCACHE_FALSE= + USE_NLS=yes fi + { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } -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 + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + INTLLIBS= + if test "$USE_NLS" = "yes"; then +cat >>confdefs.h <<\_ACEOF +#define ENABLE_NLS 1 +_ACEOF + { $as_echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 +$as_echo_n "checking whether included gettext is requested... " >&6; } +# Check whether --with-included-gettext was given. +if test "${with_included_gettext+set}" = set; then + withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval +else + nls_cv_force_use_gnu_gettext=no +fi + { $as_echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 +$as_echo "$nls_cv_force_use_gnu_gettext" >&6; } + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + CATOBJEXT=NONE -# Check whether --enable-iconv was given. -if test "${enable_iconv+set}" = set; then : - enableval=$enable_iconv; if test x$enableval = xno ; then - am_cv_func_iconv=no - fi -fi + if test "${ac_cv_header_libintl_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +$as_echo_n "checking for libintl.h... " >&6; } +if test "${ac_cv_header_libintl_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +$as_echo "$ac_cv_header_libintl_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +$as_echo_n "checking libintl.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : + ac_header_compiler=no +fi -else +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -cat >>confdefs.h <<_ACEOF -#define off_t long int +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +$as_echo_n "checking libintl.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include _ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +$as_echo_n "checking for libintl.h... " >&6; } +if test "${ac_cv_header_libintl_h+set}" = set; then + $as_echo_n "(cached) " >&6 else + ac_cv_header_libintl_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +$as_echo "$ac_cv_header_libintl_h" >&6; } -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int +fi +if test "x$ac_cv_header_libintl_h" = x""yes; then + { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if test "${gt_cv_func_gnugettext1_libc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + gt_cv_func_gnugettext1_libc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_func_gnugettext1_libc=no fi -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -$as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 +$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } + + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gt_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $LIBICONV" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +extern int _nl_msg_cat_cntr; int main () { -char *p = (char *) alloca (2 * sizeof (int)); - if (p) return 0; +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_working_alloca_h=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + gt_cv_func_gnugettext1_libintl=yes else - ac_cv_working_alloca_h=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gt_cv_func_gnugettext1_libintl=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -$as_echo "$ac_cv_working_alloca_h" >&6; } -if test $ac_cv_working_alloca_h = yes; then +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 +$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } + fi -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h + if test "$gt_cv_func_gnugettext1_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then -fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETTEXT 1 +_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -$as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : + + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + INTLLIBS="-lintl $LIBICONV" + fi + + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + +for ac_func in dcgettext +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# ifdef HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me #endif int main () { -char *p = (char *) alloca (1); - if (p) return 0; +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_func_alloca_works=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - ac_cv_func_alloca_works=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -$as_echo "$ac_cv_func_alloca_works" >&6; } +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if test $ac_cv_func_alloca_works = yes; then +fi +done -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h + LIBS="$gt_save_LIBS" + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then + $as_echo_n "(cached) " >&6 else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -$as_echo "#define C_ALLOCA 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then : - ac_cv_os_cray=yes + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - ac_cv_os_cray=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF + CATOBJEXT=.gmo + fi - break fi - done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -$as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : + + if test "$CATOBJEXT" = "NONE"; then + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + INTLOBJS="\$(GETTOBJS)" + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - ac_cv_c_stack_direction=0 + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi -int -main () -{ - return find_stack_direction () < 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_stack_direction=1 + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_cv_c_stack_direction=-1 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi - +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -$as_echo "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac fi - - - - - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -done - - + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + { $as_echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 +$as_echo "found msgfmt program is not GNU msgfmt; ignore it" >&6; } + GMSGFMT=":" + fi + fi + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + fi + POSUB=po + fi + ac_config_commands="$ac_config_commands default-1" -for ac_func in getpagesize -do : - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -if test "x$ac_cv_func_getpagesize" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPAGESIZE 1 -_ACEOF -fi -done + if test "$PACKAGE" = gettext; then + BUILD_INCLUDED_LIBINTL=yes + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -$as_echo_n "checking for working mmap... " >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : + for ac_prog in bison +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_INTLBISON+set}" = set; then $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - ac_cv_func_mmap_fixed_mapped=no + if test -n "$INTLBISON"; then + ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc - -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); -#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main () -{ - char *data, *data2, *data3; - const char *cdata2; - int i, pagesize; - int fd, fd2; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - return 1; - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - return 2; - if (write (fd, data, pagesize) != pagesize) - return 3; - close (fd); - - /* Next, check that the tail of a page is zero-filled. File must have - non-zero length, otherwise we risk SIGBUS for entire page. */ - fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); - if (fd2 < 0) - return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) - return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); - if (data2 == MAP_FAILED) - return 6; - for (i = 0; i < pagesize; ++i) - if (*(data2 + i)) - return 7; - close (fd2); - if (munmap (data2, pagesize)) - return 8; - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - return 9; - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - return 10; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - return 11; +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_INTLBISON="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - return 12; - if (read (fd, data3, pagesize) != pagesize) - return 13; - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - return 14; - close (fd); - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_mmap_fixed_mapped=yes -else - ac_cv_func_mmap_fixed_mapped=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then - -$as_echo "#define HAVE_MMAP 1" >>confdefs.h - +INTLBISON=$ac_cv_prog_INTLBISON +if test -n "$INTLBISON"; then + { $as_echo "$as_me:$LINENO: result: $INTLBISON" >&5 +$as_echo "$INTLBISON" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.mmap conftest.txt - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5 -$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; } -if test "${ac_cv_gnu_library_2_1+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif + test -n "$INTLBISON" && break +done -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then : - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + { $as_echo "$as_me:$LINENO: checking version of bison" >&5 +$as_echo_n "checking version of bison... " >&6; } + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +$as_echo "$ac_prog_version" >&6; } + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 -$as_echo "$ac_cv_gnu_library_2_1" >&6; } - GLIBC21="$ac_cv_gnu_library_2_1" - for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done - for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done + nls_cv_header_intl= + nls_cv_header_libgt= + DATADIRNAME=share + INSTOBJEXT=.mo -# Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then : - withval=$with_libiconv_prefix; - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done -fi + GENCAT=gencat - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } + fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -$as_echo "#define HAVE_ICONV 1" >>confdefs.h + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if test "${am_cv_proto_iconv+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + INTL_LIBTOOL_SUFFIX_PREFIX= -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" +if test "$am_cv_func_iconv" != "yes" +then + { $as_echo "$as_me:$LINENO: WARNING: Configuring without iconv support. See INSTALL for details" >&5 +$as_echo "$as_me: WARNING: Configuring without iconv support. See INSTALL for details" >&2;} else - am_cv_proto_iconv_arg1="const" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } - -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF - - fi - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 -$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } -if test "${am_cv_langinfo_codeset+set}" = set; then : +for ac_header in iconv.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -char* cs = nl_langinfo(CODESET); - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_langinfo_codeset=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - am_cv_langinfo_codeset=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 -$as_echo "$am_cv_langinfo_codeset" >&6; } - if test $am_cv_langinfo_codeset = yes; then -$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h - - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} +#include <$ac_header> _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes -else - am_cv_val_LC_MESSAGES=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } - # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : - enableval=$enable_nls; USE_NLS=$enableval -else - USE_NLS=yes -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } - - - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= - - if test "$USE_NLS" = "yes"; then - -$as_echo "#define ENABLE_NLS 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5 -$as_echo_n "checking whether included gettext is requested... " >&6; } - -# Check whether --with-included-gettext was given. -if test "${with_included_gettext+set}" = set; then : - withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - nls_cv_force_use_gnu_gettext=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5 -$as_echo "$nls_cv_force_use_gnu_gettext" >&6; } - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - CATOBJEXT=NONE + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 -$as_echo_n "checking for GNU gettext in libc... " >&6; } -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then : + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + { $as_echo "$as_me:$LINENO: checking whether iconv.h defines iconv_t" >&5 +$as_echo_n "checking whether iconv.h defines iconv_t... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr - ; - return 0; -} +#include + _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libc=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "typedef.*iconv_t" >/dev/null 2>&1; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ICONV_T_DEF 1 +_ACEOF + else - gt_cv_func_gnugettext1_libc=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest* + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 -$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 -$as_echo_n "checking for GNU gettext in libintl... " >&6; } -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then : +done + + +{ $as_echo "$as_me:$LINENO: checking whether this iconv is good enough" >&5 +$as_echo_n "checking whether this iconv is good enough... " >&6; } +if test "${mutt_cv_iconv_good+set}" = set; then $as_echo_n "(cached) " >&6 else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $LIBICONV" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + if test "$cross_compiling" = yes; then + mutt_cv_iconv_good=yes +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -int -main () + +#include +int main() { -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr - ; - return 0; + iconv_t cd; + char buf[4]; + char *ob; + size_t obl; + ob = buf, obl = sizeof(buf); + return ((cd = iconv_open("UTF-8", "UTF-8")) != (iconv_t)(-1) && + (iconv(cd, 0, 0, &ob, &obl) || + !(ob == buf && obl == sizeof(buf)) || + iconv_close(cd))); } + _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libintl=yes +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_iconv_good=yes else - gt_cv_func_gnugettext1_libintl=no + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +mutt_cv_iconv_good=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 -$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } - fi - - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - INTLLIBS="-lintl $LIBICONV" - fi - - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF - + LIBS="$mutt_save_LIBS" +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_iconv_good" >&5 +$as_echo "$mutt_cv_iconv_good" >&6; } +if test "$mutt_cv_iconv_good" = no; then + { { $as_echo "$as_me:$LINENO: error: Try using libiconv instead" >&5 +$as_echo "$as_me: error: Try using libiconv instead" >&2;} + { (exit 1); exit 1; }; } fi -done - - LIBS="$gt_save_LIBS" - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking whether iconv is non-transcribing" >&5 +$as_echo_n "checking whether iconv is non-transcribing... " >&6; } +if test "${mutt_cv_iconv_nontrans+set}" = set; then $as_echo_n "(cached) " >&6 else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + if test "$cross_compiling" = yes; then + mutt_cv_iconv_nontrans=no else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +#include +#include +int main() +{ + iconv_t cd; + const char *ib; + char *ob; + size_t ibl, obl; + const char *s = "\304\211"; + char t[3]; + ib = s, ibl = 2, ob = t, obl = 3; + return ((cd = iconv_open("UTF-8", "UTF-8")) == (iconv_t)(-1) || + iconv(cd, &ib, &ibl, &ob, &obl)); +} - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + mutt_cv_iconv_nontrans=no else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac +( exit $ac_status ) +mutt_cv_iconv_nontrans=yes fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - CATOBJEXT=.gmo - fi + LIBS="$mutt_save_LIBS" +fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_iconv_nontrans" >&5 +$as_echo "$mutt_cv_iconv_nontrans" >&6; } +if test "$mutt_cv_iconv_nontrans" = yes; then + cat >>confdefs.h <<\_ACEOF +#define ICONV_NONTRANS 1 +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define ICONV_NONTRANS 0 +_ACEOF fi +CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl" +if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes - fi - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +_ACEOF - if test "$nls_cv_use_gnu_gettext" = "yes"; then - INTLOBJS="\$(GETTOBJS)" - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +else + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + +for ac_func in bind_textdomain_codeset +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac + LIBS="$mutt_save_LIBS" fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + +fi # libiconv + + + +# Check whether --with-idn was given. +if test "${with_idn+set}" = set; then + withval=$with_idn; + 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 + + fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if test "x$with_idn" != "xno"; then + if test "$am_cv_func_iconv" != "yes" + then + if test "x$with_idn" != "x" + then + { { $as_echo "$as_me:$LINENO: error: IDN requested but iconv is disabled or unavailable" >&5 +$as_echo "$as_me: error: IDN requested but iconv is disabled or unavailable" >&2;} + { (exit 1); exit 1; }; } + fi + else + { $as_echo "$as_me:$LINENO: checking for library containing stringprep_check_version" >&5 +$as_echo_n "checking for library containing stringprep_check_version... " >&6; } +if test "${ac_cv_search_stringprep_check_version+set}" = set; then $as_echo_n "(cached) " >&6 else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char stringprep_check_version (); +int +main () +{ +return stringprep_check_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' idn; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_stringprep_check_version=$ac_res else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -$as_echo "found msgfmt program is not GNU msgfmt; ignore it" >&6; } - GMSGFMT=":" - fi - fi +fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_stringprep_check_version+set}" = set; then + break +fi +done +if test "${ac_cv_search_stringprep_check_version+set}" = set; then + : +else + ac_cv_search_stringprep_check_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_stringprep_check_version" >&5 +$as_echo "$ac_cv_search_stringprep_check_version" >&6; } +ac_res=$ac_cv_search_stringprep_check_version +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - POSUB=po - fi - ac_config_commands="$ac_config_commands default-1" +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBIDN 1 +_ACEOF + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_idna.o" - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi +fi - for ac_prog in bison + + +for ac_func in idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_INTLBISON+set}" = set; then : +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - if test -n "$INTLBISON"; then - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_INTLBISON="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -fi -fi -INTLBISON=$ac_cv_prog_INTLBISON -if test -n "$INTLBISON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5 -$as_echo "$INTLBISON" >&6; } +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - test -n "$INTLBISON" && break +fi done - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5 -$as_echo_n "checking version of bison... " >&6; } - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 -$as_echo "$ac_prog_version" >&6; } - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - +for ac_func in idna_to_ascii_from_utf8 idna_to_ascii_8z +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" +fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - nls_cv_header_intl= - nls_cv_header_libgt= +fi +done - DATADIRNAME=share - INSTOBJEXT=.mo +for ac_func in idna_to_ascii_lz idna_to_ascii_from_locale +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - GENCAT=gencat +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - fi +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + eval "$as_ac_var=no" +fi - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done - INTL_LIBTOOL_SUFFIX_PREFIX= + fi +fi -if test "$am_cv_func_iconv" != "yes" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Configuring without iconv support. See INSTALL for details" >&5 -$as_echo "$as_me: WARNING: Configuring without iconv support. See INSTALL for details" >&2;} +for ac_header in wchar.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - -for ac_header in iconv.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" -if test "x$ac_cv_header_iconv_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ICONV_H 1 + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv.h defines iconv_t" >&5 -$as_echo_n "checking whether iconv.h defines iconv_t... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "typedef.*iconv_t" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -$as_echo "#define HAVE_ICONV_T_DEF 1" >>confdefs.h + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + eval "$as_ac_Header=\$ac_header_preproc" fi -rm -f conftest* +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this iconv is good enough" >&5 -$as_echo_n "checking whether this iconv is good enough... " >&6; } -if test "${mutt_cv_iconv_good+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking for wchar_t" >&5 +$as_echo_n "checking for wchar_t... " >&6; } +if test "${mutt_cv_wchar_t+set}" = set; then $as_echo_n "(cached) " >&6 else - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - if test "$cross_compiling" = yes; then : - mutt_cv_iconv_good=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int main() +#include +#include +#ifdef HAVE_WCHAR_H +#include +#endif + +int +main () { - iconv_t cd; - char buf[4]; - char *ob; - size_t obl; - ob = buf, obl = sizeof(buf); - return ((cd = iconv_open("UTF-8", "UTF-8")) != (iconv_t)(-1) && - (iconv(cd, 0, 0, &ob, &obl) || - !(ob == buf && obl == sizeof(buf)) || - iconv_close(cd))); + wchar_t wc; return 0; + ; + return 0; } - _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_iconv_good=yes +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + mutt_cv_wchar_t=yes else - mutt_cv_iconv_good=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + mutt_cv_wchar_t=no fi - LIBS="$mutt_save_LIBS" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_iconv_good" >&5 -$as_echo "$mutt_cv_iconv_good" >&6; } -if test "$mutt_cv_iconv_good" = no; then - as_fn_error "Try using libiconv instead" "$LINENO" 5 +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_wchar_t" >&5 +$as_echo "$mutt_cv_wchar_t" >&6; } + +if test "$mutt_cv_wchar_t" = no; then + +cat >>confdefs.h <<\_ACEOF +#define wchar_t int +_ACEOF + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv is non-transcribing" >&5 -$as_echo_n "checking whether iconv is non-transcribing... " >&6; } -if test "${mutt_cv_iconv_nontrans+set}" = set; then : +{ $as_echo "$as_me:$LINENO: checking for wint_t" >&5 +$as_echo_n "checking for wint_t... " >&6; } +if test "${mutt_cv_wint_t+set}" = set; then $as_echo_n "(cached) " >&6 else - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - if test "$cross_compiling" = yes; then : - mutt_cv_iconv_nontrans=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -int main() +#include +#include +#ifdef HAVE_WCHAR_H +#include +#endif + +int +main () { - iconv_t cd; - const char *ib; - char *ob; - size_t ibl, obl; - const char *s = "\304\211"; - char t[3]; - ib = s, ibl = 2, ob = t, obl = 3; - return ((cd = iconv_open("UTF-8", "UTF-8")) == (iconv_t)(-1) || - iconv(cd, &ib, &ibl, &ob, &obl)); + wint_t wc; return 0; + ; + return 0; } - _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - mutt_cv_iconv_nontrans=no +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + mutt_cv_wint_t=yes else - mutt_cv_iconv_nontrans=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="$mutt_save_LIBS" + mutt_cv_wint_t=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_iconv_nontrans" >&5 -$as_echo "$mutt_cv_iconv_nontrans" >&6; } -if test "$mutt_cv_iconv_nontrans" = yes; then - $as_echo "#define ICONV_NONTRANS 1" >>confdefs.h - -else - $as_echo "#define ICONV_NONTRANS 0" >>confdefs.h +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_wint_t" >&5 +$as_echo "$mutt_cv_wint_t" >&6; } -CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl" +if test "$mutt_cv_wint_t" = no; then -if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then +cat >>confdefs.h <<\_ACEOF +#define wint_t int +_ACEOF + +fi -$as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h +for ac_header in wctype.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - mutt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> _ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi -done - LIBS="$mutt_save_LIBS" -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -fi # libiconv +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -# Check whether --with-idn was given. -if test "${with_idn+set}" = set; then : - withval=$with_idn; - 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 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi +done -if test "x$with_idn" != "xno"; then - if test "$am_cv_func_iconv" != "yes" - then - if test "x$with_idn" != "x" - then - as_fn_error "IDN requested but iconv is disabled or unavailable" "$LINENO" 5 - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing stringprep_check_version" >&5 -$as_echo_n "checking for library containing stringprep_check_version... " >&6; } -if test "${ac_cv_search_stringprep_check_version+set}" = set; then : + + + + +for ac_func in iswalnum iswalpha iswcntrl iswdigit +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -11764,84 +21584,62 @@ #ifdef __cplusplus extern "C" #endif -char stringprep_check_version (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + int main () { -return stringprep_check_version (); +return $ac_func (); ; return 0; } _ACEOF -for ac_lib in '' idn; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_stringprep_check_version=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_stringprep_check_version+set}" = set; then : - break -fi -done -if test "${ac_cv_search_stringprep_check_version+set}" = set; then : - +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - ac_cv_search_stringprep_check_version=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_stringprep_check_version" >&5 -$as_echo "$ac_cv_search_stringprep_check_version" >&6; } -ac_res=$ac_cv_search_stringprep_check_version -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - -$as_echo "#define HAVE_LIBIDN 1" >>confdefs.h - - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_idna.o" - -fi - - for ac_func in idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi -done - - for ac_func in idna_to_ascii_from_utf8 idna_to_ascii_8z -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -done - - for ac_func in idna_to_ascii_lz idna_to_ascii_from_locale -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11849,143 +21647,208 @@ fi done - fi -fi -for ac_header in wchar.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" -if test "x$ac_cv_header_wchar_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WCHAR_H 1 -_ACEOF -fi -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 -$as_echo_n "checking for wchar_t... " >&6; } -if test "${mutt_cv_wchar_t+set}" = set; then : +for ac_func in iswgraph iswlower iswprint iswpunct iswspace iswupper +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -#include -#include -#ifdef HAVE_WCHAR_H -#include +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me #endif int main () { - wchar_t wc; return 0; +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - mutt_cv_wchar_t=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - mutt_cv_wchar_t=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_wchar_t" >&5 -$as_echo "$mutt_cv_wchar_t" >&6; } +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if test "$mutt_cv_wchar_t" = no; then +fi +done -$as_echo "#define wchar_t int" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 -$as_echo_n "checking for wint_t... " >&6; } -if test "${mutt_cv_wint_t+set}" = set; then : + +for ac_func in iswxdigit towupper towlower +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -#include -#include -#ifdef HAVE_WCHAR_H -#include +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me #endif int main () { - wint_t wc; return 0; +return $ac_func (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - mutt_cv_wint_t=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else - mutt_cv_wint_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_wint_t" >&5 -$as_echo "$mutt_cv_wint_t" >&6; } - -if test "$mutt_cv_wint_t" = no; then - -$as_echo "#define wint_t int" >>confdefs.h - -fi - -for ac_header in wctype.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "wctype.h" "ac_cv_header_wctype_h" "$ac_includes_default" -if test "x$ac_cv_header_wctype_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WCTYPE_H 1 -_ACEOF - -fi - -done - -for ac_func in iswalnum iswalpha iswblank iswcntrl iswdigit -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi -done - -for ac_func in iswgraph iswlower iswprint iswpunct iswspace iswupper -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -done - -for ac_func in iswxdigit towupper towlower -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11994,12 +21857,16 @@ done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 +{ $as_echo "$as_me:$LINENO: checking for mbstate_t" >&5 $as_echo_n "checking for mbstate_t... " >&6; } -if test "${mutt_cv_mbstate_t+set}" = set; then : +if test "${mutt_cv_mbstate_t+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -12016,49 +21883,76 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then mutt_cv_mbstate_t=yes else - mutt_cv_mbstate_t=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + mutt_cv_mbstate_t=no fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_mbstate_t" >&5 +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_mbstate_t" >&5 $as_echo "$mutt_cv_mbstate_t" >&6; } if test "$mutt_cv_mbstate_t" = no; then -$as_echo "#define mbstate_t int" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define mbstate_t int +_ACEOF fi wc_funcs=maybe # Check whether --with-wc-funcs was given. -if test "${with_wc_funcs+set}" = set; then : +if test "${with_wc_funcs+set}" = set; then withval=$with_wc_funcs; wc_funcs=$withval fi if test "$wc_funcs" != yes && test "$wc_funcs" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t functions" >&5 + { $as_echo "$as_me:$LINENO: checking for wchar_t functions" >&5 $as_echo_n "checking for wchar_t functions... " >&6; } -if test "${mutt_cv_wc_funcs+set}" = set; then : +if test "${mutt_cv_wc_funcs+set}" = set; then $as_echo_n "(cached) " >&6 else mutt_cv_wc_funcs=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _XOPEN_SOURCE 600 +#define _XOPEN_SOURCE 1 #include #include -#ifdef HAVE_WCHAR_H -#include -#endif #ifdef HAVE_WCTYPE_H #include #endif +#ifdef HAVE_WCHAR_H +#include +#endif int main () { @@ -12068,31 +21962,64 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then mutt_cv_wc_funcs=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_wc_funcs" >&5 +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_wc_funcs" >&5 $as_echo "$mutt_cv_wc_funcs" >&6; } wc_funcs=$mutt_cv_wc_funcs fi if test $wc_funcs = yes; then -$as_echo "#define HAVE_WC_FUNCS 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_WC_FUNCS 1 +_ACEOF else MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS utf8.o wcwidth.o" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 +{ $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } -if test "${mutt_cv_langinfo_codeset+set}" = set; then : +if test "${mutt_cv_langinfo_codeset+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include int @@ -12103,28 +22030,59 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then mutt_cv_langinfo_codeset=yes else - mutt_cv_langinfo_codeset=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + mutt_cv_langinfo_codeset=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_langinfo_codeset" >&5 +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_langinfo_codeset" >&5 $as_echo "$mutt_cv_langinfo_codeset" >&6; } if test $mutt_cv_langinfo_codeset = yes; then -$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_LANGINFO_CODESET 1 +_ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and YESEXPR" >&5 +{ $as_echo "$as_me:$LINENO: checking for nl_langinfo and YESEXPR" >&5 $as_echo_n "checking for nl_langinfo and YESEXPR... " >&6; } -if test "${mutt_cv_langinfo_yesexpr+set}" = set; then : +if test "${mutt_cv_langinfo_yesexpr+set}" = set; then $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include int @@ -12135,28 +22093,55 @@ return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then mutt_cv_langinfo_yesexpr=yes else - mutt_cv_langinfo_yesexpr=no + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + mutt_cv_langinfo_yesexpr=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mutt_cv_langinfo_yesexpr" >&5 +{ $as_echo "$as_me:$LINENO: result: $mutt_cv_langinfo_yesexpr" >&5 $as_echo "$mutt_cv_langinfo_yesexpr" >&6; } if test $mutt_cv_langinfo_yesexpr = yes; then -$as_echo "#define HAVE_LANGINFO_YESEXPR 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define HAVE_LANGINFO_YESEXPR 1 +_ACEOF fi have_openjade="no" # Extract the first word of "ospcat", so it can be a program name with args. set dummy ospcat; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_OSPCAT+set}" = set; then : +if test "${ac_cv_path_OSPCAT+set}" = set; then $as_echo_n "(cached) " >&6 else case $OSPCAT in @@ -12169,14 +22154,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OSPCAT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done +done IFS=$as_save_IFS test -z "$ac_cv_path_OSPCAT" && ac_cv_path_OSPCAT="none" @@ -12185,17 +22170,17 @@ fi OSPCAT=$ac_cv_path_OSPCAT if test -n "$OSPCAT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSPCAT" >&5 + { $as_echo "$as_me:$LINENO: result: $OSPCAT" >&5 $as_echo "$OSPCAT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi if test "$OSPCAT" != "none" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openjade docbook stylesheets" >&5 + { $as_echo "$as_me:$LINENO: checking for openjade docbook stylesheets" >&5 $as_echo_n "checking for openjade docbook stylesheets... " >&6; } dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\([^']*\)\/catalog'.*/\1/p"` @@ -12206,18 +22191,18 @@ fi if test -f $DSLROOT/print/docbook.dsl then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: in $DSLROOT" >&5 + { $as_echo "$as_me:$LINENO: result: in $DSLROOT" >&5 $as_echo "in $DSLROOT" >&6; } have_openjade="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found: PDF documentation will not be built." >&5 + { $as_echo "$as_me:$LINENO: result: not found: PDF documentation will not be built." >&5 $as_echo "not found: PDF documentation will not be built." >&6; } fi fi # Check whether --enable-full_doc was given. -if test "${enable_full_doc+set}" = set; then : +if test "${enable_full_doc+set}" = set; then enableval=$enable_full_doc; if test x$enableval = xno ; then full_doc=no fi @@ -12226,7 +22211,9 @@ if test x$full_doc != xno ; then -$as_echo "#define MAKEDOC_FULL 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define MAKEDOC_FULL 1 +_ACEOF fi @@ -12259,13 +22246,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; + *) $as_unset $ac_var ;; esac ;; esac done @@ -12273,8 +22260,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -12297,11 +22284,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -12321,8 +22308,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -12338,47 +22325,63 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${BUILD_IMAP_TRUE}" && test -z "${BUILD_IMAP_FALSE}"; then - as_fn_error "conditional \"BUILD_IMAP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_IMAP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"BUILD_IMAP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${USE_GSS_TRUE}" && test -z "${USE_GSS_FALSE}"; then - as_fn_error "conditional \"USE_GSS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GSS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"USE_GSS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${USE_SSL_TRUE}" && test -z "${USE_SSL_FALSE}"; then - as_fn_error "conditional \"USE_SSL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"USE_SSL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"USE_SSL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi if test -z "${USE_SASL_TRUE}" && test -z "${USE_SASL_FALSE}"; then - as_fn_error "conditional \"USE_SASL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_HCACHE_TRUE}" && test -z "${BUILD_HCACHE_FALSE}"; then - as_fn_error "conditional \"BUILD_HCACHE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: conditional \"USE_SASL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"USE_SASL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -12388,18 +22391,17 @@ debug=false ac_cs_recheck=false ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -12407,15 +22409,23 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; esac + fi + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + as_nl=' ' export as_nl @@ -12423,13 +22433,7 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -12440,7 +22444,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in #( + case $arg in *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -12463,6 +22467,13 @@ } fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -12472,15 +22483,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in #(( +case $0 in *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done IFS=$as_save_IFS ;; @@ -12492,16 +22503,12 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 + { (exit 1); exit 1; } fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var done PS1='$ ' PS2='> ' @@ -12513,89 +22520,7 @@ LANGUAGE=C export LANGUAGE -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. -as_fn_error () -{ - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 - fi - $as_echo "$as_me: error: $1" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - +# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -12609,12 +22534,8 @@ as_basename=false fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -12634,25 +22555,76 @@ } s/.*/./; q'` -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( +case `echo -n x` in -n*) - case `echo 'xy\c'` in + case `echo 'x\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; + *) ECHO_C='\c';; esac;; *) ECHO_N='-n';; esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -12681,56 +22653,8 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" - - -} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' + as_mkdir_p=: else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -12749,10 +22673,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in #( + case $1 in -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -12767,19 +22691,13 @@ exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12811,15 +22729,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. +\`$as_me' instantiates files from templates according to the +current configuration. -Usage: $0 [OPTION]... [TAG]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -12838,17 +22754,16 @@ Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, - with options \\"\$ac_cs_config\\" +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -12884,8 +22799,6 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -12893,19 +22806,20 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - as_fn_append CONFIG_FILES " '$ac_optarg'" + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + { $as_echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -12913,10 +22827,11 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) { $as_echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; - *) as_fn_append ac_config_targets " $1" + *) ac_config_targets="$ac_config_targets $1" ac_need_defaults=false ;; esac @@ -12982,7 +22897,9 @@ "muttbug.sh") CONFIG_FILES="$CONFIG_FILES muttbug.sh" ;; "doc/instdoc.sh") CONFIG_FILES="$CONFIG_FILES doc/instdoc.sh" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; esac done @@ -13009,7 +22926,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap 'as_fn_exit 1' 1 2 13 15 + trap '{ (exit 1); exit 1; }' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -13020,7 +22937,11 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || +{ + $as_echo "$as_me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -13028,16 +22949,10 @@ if test -n "$CONFIG_FILES"; then -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi +ac_cr=' ' ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -13051,18 +22966,24 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -13084,7 +23005,7 @@ t delim :nl h -s/\(.\{148\}\)..*/\1/ +s/\(.\{148\}\).*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -13098,7 +23019,7 @@ t nl :delim h -s/\(.\{148\}\)..*/\1/ +s/\(.\{148\}\).*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -13151,7 +23072,9 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), @@ -13192,7 +23115,9 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} + { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -13277,7 +23202,9 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;} + { (exit 1); exit 1; }; } fi # test -n "$CONFIG_HEADERS" @@ -13290,7 +23217,9 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} + { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -13318,10 +23247,12 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -13332,7 +23263,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -13345,7 +23276,9 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -13373,7 +23306,47 @@ q } s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in @@ -13430,6 +23403,7 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= + ac_sed_dataroot=' /datarootdir/ { p @@ -13439,11 +23413,12 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p' +/@mandir@/p +' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -13453,7 +23428,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -13482,12 +23457,14 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} @@ -13497,7 +23474,9 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; :H) # @@ -13508,19 +23487,25 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +$as_echo "$as_me: error: could not create -" >&2;} + { (exit 1); exit 1; }; } fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -13558,7 +23543,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -13653,7 +23638,47 @@ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -13694,12 +23719,15 @@ done # for ac_tag -as_fn_exit 0 +{ (exit 0); exit 0; } _ACEOF +chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } # configure is writing to config.log, and then calls config.status. @@ -13720,10 +23748,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || { (exit 1); exit 1; } fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru mutt-1.5.21/configure.ac mutt-1.5.20/configure.ac --- mutt-1.5.21/configure.ac 2010-08-24 16:34:21.000000000 +0000 +++ mutt-1.5.20/configure.ac 2009-06-09 06:50:33.000000000 +0000 @@ -109,7 +109,6 @@ #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) @@ -542,10 +541,8 @@ [mutt_cv_docdir=$withval], [mutt_cv_docdir='${datarootdir}/doc/mutt']) AC_MSG_RESULT($mutt_cv_docdir) -if test -z "$docdir" -o -n "$with_docdir" -then - docdir=$mutt_cv_docdir -fi + +docdir=$mutt_cv_docdir AC_SUBST(docdir) if test x$mutt_cv_setgid = xyes; then @@ -719,7 +716,7 @@ AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) -AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use SASL network security library]), +AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use Cyrus SASL 2 network security library]), [ if test "$with_sasl" != "no" then @@ -735,19 +732,15 @@ fi saved_LIBS="$LIBS" - LIBS= - # 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]),) + AC_CHECK_LIB(sasl2, sasl_client_init,, + AC_MSG_ERROR([could not find libsasl2]),) - 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 SASL library for POP/IMAP authentication. ]) + [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ]) need_sasl=yes fi ]) @@ -842,7 +835,6 @@ 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]) @@ -1035,15 +1027,10 @@ 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" + MUTT_MD5="mutt_md5" fi AC_SUBST(MUTT_MD5) @@ -1222,7 +1209,7 @@ fi AC_CHECK_HEADERS(wctype.h) -AC_CHECK_FUNCS(iswalnum iswalpha iswblank iswcntrl iswdigit) +AC_CHECK_FUNCS(iswalnum iswalpha iswcntrl iswdigit) AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper) AC_CHECK_FUNCS(iswxdigit towupper towlower) @@ -1250,14 +1237,14 @@ AC_CACHE_CHECK([for wchar_t functions], mutt_cv_wc_funcs, mutt_cv_wc_funcs=no AC_TRY_LINK([ -#define _XOPEN_SOURCE 600 +#define _XOPEN_SOURCE 1 #include #include -#ifdef HAVE_WCHAR_H -#include -#endif #ifdef HAVE_WCTYPE_H #include +#endif +#ifdef HAVE_WCHAR_H +#include #endif], [mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0); iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)], diff -Nru mutt-1.5.21/contrib/Makefile.in mutt-1.5.20/contrib/Makefile.in --- mutt-1.5.21/contrib/Makefile.in 2010-08-25 16:31:47.000000000 +0000 +++ mutt-1.5.20/contrib/Makefile.in 2009-06-09 06:50:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,7 +128,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PGPAUX_TARGET = @PGPAUX_TARGET@ @@ -221,9 +220,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign contrib/Makefile + $(AUTOMAKE) --gnu contrib/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru mutt-1.5.21/copy.c mutt-1.5.20/copy.c --- mutt-1.5.21/copy.c 2010-03-02 19:15:00.000000000 +0000 +++ mutt-1.5.20/copy.c 2009-06-12 23:38:52.000000000 +0000 @@ -868,7 +868,6 @@ int l, rp = 0; ADDRESS *a = NULL; - ADDRESS *cur = NULL; switch (tolower ((unsigned char) *s)) { @@ -938,9 +937,6 @@ mutt_addrlist_to_local (a); rfc2047_decode_adrlist (a); - for (cur = a; cur; cur = cur->next) - if (cur->personal) - rfc822_dequote_comment (cur->personal); /* angle brackets for return path are mandated by RfC5322, * so leave Return-Path as-is */ diff -Nru mutt-1.5.21/crypt.c mutt-1.5.20/crypt.c --- mutt-1.5.21/crypt.c 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/crypt.c 2009-03-31 06:52:43.000000000 +0000 @@ -593,7 +593,7 @@ if (!WithCrypto) return; - mutt_mktemp (tempfname, sizeof (tempfname)); + mutt_mktemp (tempfname); if (!(fpout = safe_fopen (tempfname, "w"))) { mutt_perror (tempfname); @@ -844,7 +844,7 @@ if (sigcnt) { - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (crypt_write_signed (a, s, tempfile) == 0) { for (i = 0; i < sigcnt; i++) diff -Nru mutt-1.5.21/crypt-gpgme.c mutt-1.5.20/crypt-gpgme.c --- mutt-1.5.21/crypt-gpgme.c 2010-09-13 17:19:55.000000000 +0000 +++ mutt-1.5.20/crypt-gpgme.c 2009-05-19 00:11:35.000000000 +0000 @@ -403,7 +403,7 @@ int err = 0; gpgme_data_t data; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); fptmp = safe_fopen (tempfile, "w+"); if (!fptmp) { @@ -525,7 +525,7 @@ FILE *fp; size_t nread = 0; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); fp = safe_fopen (tempfile, "w+"); if (!fp) { @@ -918,7 +918,7 @@ { t->subtype = safe_strdup ("pgp-signature"); t->use_disp = 0; - t->disposition = DISPNONE; + t->disposition = DISPINLINE; t->encoding = ENC7BIT; } t->filename = sigfile; @@ -991,7 +991,7 @@ t->parts->next->encoding = ENC7BIT; t->parts->next->filename = outfile; t->parts->next->use_disp = 1; - t->parts->next->disposition = DISPATTACH; + t->parts->next->disposition = DISPINLINE; t->parts->next->unlink = 1; /* delete after sending the message */ t->parts->next->d_filename = safe_strdup ("msg.asc"); /* non pgp/mime can save */ @@ -1711,7 +1711,7 @@ memset (&s, 0, sizeof (s)); s.fpin = fpin; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(*fpout = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1756,7 +1756,7 @@ memset (&s, 0, sizeof (s)); s.fpin = fpin; fseeko (s.fpin, b->offset, 0); - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(tmpfp = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1774,7 +1774,7 @@ memset (&s, 0, sizeof (s)); s.fpin = tmpfp; s.fpout = 0; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(*fpout = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1810,7 +1810,7 @@ memset (&s, 0, sizeof (s)); s.fpin = *fpout; fseeko (s.fpin, bb->offset, 0); - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(tmpfp = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1829,7 +1829,7 @@ memset (&s, 0, sizeof (s)); s.fpin = tmpfp; s.fpout = 0; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(*fpout = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1908,7 +1908,7 @@ goto err_tmpdir; } - mutt_mktemp (tmpfile, sizeof (tmpfile)); + mutt_mktemp (tmpfile); *fp = safe_fopen (tmpfile, "w+"); if (!*fp) { @@ -1985,7 +1985,7 @@ if (tagged_only && !b->tagged) return 0; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (mutt_decode_save_attachment (fp, b, tempfile, 0, 0) != 0) { unlink (tempfile); @@ -2371,14 +2371,16 @@ safe_fclose (&pgpout); } } +#if 0 else { - /* A traditional PGP part may mix signed and unsigned content */ + /* why would we want to display this at all? */ /* XXX - we may wish to recode here */ if (s->prefix) state_puts (s->prefix, s); state_puts (buf, s); } +#endif } m->goodsig = (maybe_goodsig && have_any_sigs); @@ -2424,7 +2426,7 @@ /* Move forward to the application/pgp-encrypted body. */ a = a->next; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(fpout = safe_fopen (tempfile, "w+"))) { if (s->flags & M_DISPLAY) @@ -2490,7 +2492,7 @@ dprint (2, (debugfile, "Entering smime_encrypted handler\n")); a->warnsig = 0; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(fpout = safe_fopen (tempfile, "w+"))) { if (s->flags & M_DISPLAY) @@ -3450,7 +3452,7 @@ gpgme_key_t k = NULL; int maxdepth = 100; - mutt_mktemp (tempfile, sizeof (tempfile)); + mutt_mktemp (tempfile); if (!(fp = safe_fopen (tempfile, "w"))) { mutt_perror _("Can't create temporary file"); @@ -4482,66 +4484,37 @@ } if (sender) - { - if (signature_key) { - gpgme_key_t key = signature_key; - gpgme_user_id_t uid = NULL; - int sender_length = 0; - int uid_length = 0; - - sender_length = strlen (sender->mailbox); - for (uid = key->uids; uid && ret; uid = uid->next) - { - uid_length = strlen (uid->email); - if (1 - && (uid->email[0] == '<') - && (uid->email[uid_length - 1] == '>') - && (uid_length == sender_length + 2)) + if (signature_key) { - const char* at_sign = strchr(uid->email + 1, '@'); - if (at_sign == NULL) - { - if (! strncmp (uid->email + 1, sender->mailbox, sender_length)) - ret = 0; - } - else - { - /* - * Assume address is 'mailbox@domainname'. - * The mailbox part is case-sensitive, - * the domainname is not. (RFC 2821) - */ - const char* tmp_email = uid->email + 1; - const char* tmp_sender = sender->mailbox; - /* length of mailbox part including '@' */ - int mailbox_length = at_sign - tmp_email + 1; - int domainname_length = sender_length - mailbox_length; - int mailbox_match, domainname_match; - - mailbox_match = (! strncmp (tmp_email, tmp_sender, - mailbox_length)); - tmp_email += mailbox_length; - tmp_sender += mailbox_length; - domainname_match = (! strncasecmp (tmp_email, tmp_sender, - domainname_length)); - if (mailbox_match && domainname_match) - ret = 0; - } + gpgme_key_t key = signature_key; + gpgme_user_id_t uid = NULL; + int sender_length = 0; + int uid_length = 0; + + sender_length = strlen (sender->mailbox); + for (uid = key->uids; uid && ret; uid = uid->next) + { + uid_length = strlen (uid->email); + if (1 + && (uid->email[0] == '<') + && (uid->email[uid_length - 1] == '>') + && (uid_length == sender_length + 2) + && (! strncmp (uid->email + 1, sender->mailbox, sender_length))) + ret = 0; + } } - } + else + mutt_any_key_to_continue (_("Failed to verify sender")); } - else - mutt_any_key_to_continue (_("Failed to verify sender")); - } else mutt_any_key_to_continue (_("Failed to figure out sender")); if (signature_key) - { - gpgme_key_release (signature_key); - signature_key = NULL; - } + { + gpgme_key_release (signature_key); + signature_key = NULL; + } return ret; } diff -Nru mutt-1.5.21/curs_lib.c mutt-1.5.20/curs_lib.c --- mutt-1.5.21/curs_lib.c 2010-08-25 16:31:40.000000000 +0000 +++ mutt-1.5.20/curs_lib.c 2009-03-31 06:52:43.000000000 +0000 @@ -98,10 +98,7 @@ mutt_allow_interrupt (0); if (SigInt) - { mutt_query_exit (); - return err; - } if(ch == ERR) { @@ -207,9 +204,9 @@ answer[1] = 0; reyes_ok = (expr = nl_langinfo (YESEXPR)) && expr[0] == '^' && - !REGCOMP (&reyes, expr, REG_NOSUB); + !regcomp (&reyes, expr, REG_NOSUB|REG_EXTENDED); reno_ok = (expr = nl_langinfo (NOEXPR)) && expr[0] == '^' && - !REGCOMP (&reno, expr, REG_NOSUB); + !regcomp (&reno, expr, REG_NOSUB|REG_EXTENDED); #endif CLEARLINE(LINES-1); @@ -223,7 +220,7 @@ answer_string = safe_malloc (COLS + 1); snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no, def == M_YES ? no : yes); answer_string_len = strlen (answer_string); - mutt_message ("%.*s%s", COLS - answer_string_len, msg, answer_string); + printw ("%.*s%s", COLS - answer_string_len, msg, answer_string); FREE (&answer_string); FOREVER @@ -278,12 +275,6 @@ addstr ((char *) (def == M_YES ? yes : no)); mutt_refresh (); } - else - { - /* when the users cancels with ^G, clear the message stored with - * mutt_message() so it isn't displayed when the screen is refreshed. */ - mutt_clear_error(); - } return (def); } @@ -304,49 +295,54 @@ SigInt = 0; } -static void curses_message (int error, const char *fmt, va_list ap) +void mutt_curses_error (const char *fmt, ...) { + va_list ap; char scratch[LONG_STRING]; + va_start (ap, fmt); vsnprintf (scratch, sizeof (scratch), fmt, ap); - + va_end (ap); + dprint (1, (debugfile, "%s\n", scratch)); mutt_format_string (Errorbuf, sizeof (Errorbuf), - 0, COLS, FMT_LEFT, 0, scratch, sizeof (scratch), 0); + 0, COLS-2, FMT_LEFT, 0, scratch, sizeof (scratch), 0); if (!option (OPTKEEPQUIET)) { - if (error) - BEEP (); - SETCOLOR (error ? MT_COLOR_ERROR : MT_COLOR_MESSAGE); + BEEP (); + SETCOLOR (MT_COLOR_ERROR); mvaddstr (LINES-1, 0, Errorbuf); clrtoeol (); SETCOLOR (MT_COLOR_NORMAL); mutt_refresh (); } - if (error) - set_option (OPTMSGERR); - else - unset_option (OPTMSGERR); + set_option (OPTMSGERR); } -void mutt_curses_error (const char *fmt, ...) +void mutt_curses_message (const char *fmt, ...) { va_list ap; + char scratch[LONG_STRING]; va_start (ap, fmt); - curses_message (1, fmt, ap); + vsnprintf (scratch, sizeof (scratch), fmt, ap); va_end (ap); -} -void mutt_curses_message (const char *fmt, ...) -{ - va_list ap; + mutt_format_string (Errorbuf, sizeof (Errorbuf), + 0, COLS-2, FMT_LEFT, 0, scratch, sizeof (scratch), 0); - va_start (ap, fmt); - curses_message (0, fmt, ap); - va_end (ap); + if (!option (OPTKEEPQUIET)) + { + SETCOLOR (MT_COLOR_MESSAGE); + mvaddstr (LINES - 1, 0, Errorbuf); + clrtoeol (); + SETCOLOR (MT_COLOR_NORMAL); + mutt_refresh (); + } + + unset_option (OPTMSGERR); } void mutt_progress_init (progress_t* progress, const char *msg, @@ -734,11 +730,6 @@ w = 1; /* hack */ else { -#ifdef HAVE_ISWBLANK - if (iswblank (wc)) - wc = ' '; - else -#endif if (!IsWPrint (wc)) wc = '?'; w = wcwidth (wc); @@ -750,7 +741,7 @@ min_width -= w; max_width -= w; strncpy (p, scratch, k2); - p += k2; + p += k2; destlen -= k2; } } @@ -889,7 +880,7 @@ { wchar_t wc; int w = 0, l = 0, cl; - int cw, n; + size_t cw, n; mbstate_t mbstate; if (!src) @@ -903,13 +894,7 @@ if (cl == (size_t)(-1) || cl == (size_t)(-2)) cw = cl = 1; else - { cw = wcwidth (wc); - /* hack because M_TREE symbols aren't turned into characters - * until rendered by print_enriched_string (#3364) */ - if (cw < 0 && cl == 1 && src[0] && src[0] < M_TREE_MAX) - cw = 1; - } if (cl + l > maxlen || cw + w > maxwid) break; l += cl; diff -Nru mutt-1.5.21/curs_main.c mutt-1.5.20/curs_main.c --- mutt-1.5.21/curs_main.c 2010-09-13 17:19:55.000000000 +0000 +++ mutt-1.5.20/curs_main.c 2009-06-14 02:48:36.000000000 +0000 @@ -473,6 +473,10 @@ * modified underneath us.) */ +#ifdef USE_IMAP + imap_allow_reopen (Context); +#endif + index_hint = (Context->vcount && menu->current >= 0 && menu->current < Context->vcount) ? CURHDR->index : 0; if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0) @@ -682,6 +686,10 @@ mutt_curs_set (1); /* fallback from the pager */ } +#ifdef USE_IMAP + imap_disallow_reopen (Context); +#endif + switch (op) { @@ -914,11 +922,6 @@ resort_index (menu); set_option (OPTSEARCHINVALID); } - if (menu->menu == MENU_PAGER) - { - op = OP_DISPLAY_MESSAGE; - continue; - } menu->redraw |= REDRAW_STATUS; } break; @@ -988,23 +991,6 @@ if (Context && Context->magic == M_IMAP) imap_check_mailbox (Context, &index_hint, 1); break; - - case OP_MAIN_IMAP_LOGOUT_ALL: - if (Context && Context->magic == M_IMAP) - { - if (mx_close_mailbox (Context, &index_hint) != 0) - { - set_option (OPTSEARCHINVALID); - menu->redraw = REDRAW_FULL; - break; - } - FREE (&Context); - } - imap_logout_all(); - mutt_message _("Logged out of IMAP servers."); - set_option (OPTSEARCHINVALID); - menu->redraw = REDRAW_FULL; - break; #endif case OP_MAIN_SYNC_FOLDER: @@ -1125,10 +1111,6 @@ } mutt_str_replace (&CurrentFolder, buf); - /* keepalive failure in mutt_enter_fname may kill connection. #3028 */ - if (Context && !Context->path) - FREE (&Context); - if (Context) { int check; @@ -1238,7 +1220,7 @@ if ((Sort & SORT_MASK) != SORT_THREADS) mutt_error _("Threading is not enabled."); - else if (CURHDR->env->in_reply_to || CURHDR->env->references) + else { { HEADER *oldcur = CURHDR; @@ -1259,10 +1241,8 @@ else menu->redraw |= REDRAW_INDEX; } - else - mutt_error _("Thread cannot be broken, message is not part of a thread"); - break; + break; case OP_MAIN_LINK_THREADS: @@ -2053,11 +2033,6 @@ if ((menu->current = (op == OP_MAIN_READ_THREAD ? mutt_next_thread (CURHDR) : mutt_next_subthread (CURHDR))) == -1) menu->current = menu->oldcurrent; - else if (menu->menu == MENU_PAGER) - { - op = OP_DISPLAY_MESSAGE; - continue; - } } menu->redraw = REDRAW_INDEX | REDRAW_STATUS; } diff -Nru mutt-1.5.21/debian/changelog mutt-1.5.20/debian/changelog --- mutt-1.5.21/debian/changelog 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/changelog 2011-02-14 17:04:53.000000000 +0000 @@ -1,78 +1,20 @@ -mutt (1.5.21-2ubuntu3) natty; urgency=low +mutt (1.5.20-9ubuntu2ppa3) natty; urgency=low - * Update ubuntu/lp-693244-autoview to blacklist text/html and move patch to - above mutt.org in the series. + * packaging for natty, no changes - -- Loïc Minier Sat, 29 Jan 2011 01:21:06 +0100 + -- Joe MacDonald Mon, 14 Feb 2011 11:43:02 -0500 -mutt (1.5.21-2ubuntu2) natty; urgency=low +mutt (1.5.20-9ubuntu2ppa2) maverick; urgency=low - * New patch, ubuntu/lp-693244-autoview, revert changeset 5248:4b5326d8d2ee - to fix implicit_autoview; LP: #693244. + * Apply the Exchange 2010 workaround to all versions of mutt. - -- Loïc Minier Sat, 29 Jan 2011 00:49:31 +0100 + -- Joe MacDonald Thu, 18 Nov 2010 10:42:12 -0500 -mutt (1.5.21-2ubuntu1) natty; urgency=low +mutt (1.5.20-9ubuntu2ppa1) maverick; urgency=low - * Merge with Debian experimental (LP: #697529), remaining changes: - + Drop libtokyocabinet-dev (universe) from Build-Depends, use always - libgdbm-dev and also use gdbm for the header cache backend. (lp: #607448) + * Integrate patch for handling Exchange 2010 non-compliant IMAP behaviour - -- أحمد المحمودي (Ahmed El-Mahmoudy) Wed, 05 Jan 2011 09:03:40 +0200 - -mutt (1.5.21-2) experimental; urgency=low - - [ Christoph Berg ] - * debian/patches: features/imap_fast_trash: Support purging of messages. - - [ Antonio Radici ] - * debian/patches: - + upstream/578087-header-strchr.patch: prevent from segfaulting on malformed - messages (Closes: 578087, 578583) - + upstream/603288-split-fetches.patch: split FETCH's into smaller chunks, - workaround for Exchange 2010 (Closes: 603288) - + upstream/537061-dont-recode-saved-attachments.patch: as the patch says, - see the patch for more info (Closes: 537061) - + upstream/608706-fix-spelling-errors.patch: to fix some spelling errors - (Closes: 608706) - + debian-specific/566076-build_doc_adjustments.patch: use w3m to build the - manual (Closes: 566076) - * debian/extra/lib/mailto-mutt: replaced by a wrapper, added the reason to - NEWS.Debian (Closes: 576313) - * debian/extra/rc/compressed-folders.rc: added support for xz-compressed - folders (Closes: 578099) - * debian/*.lintian-overrides: ignore 'binary without manpage' errors due to - the diversions to mutt-org/mutt-patched - - -- Antonio Radici Sun, 02 Jan 2011 21:05:25 +0000 - -mutt (1.5.21-1ubuntu1) natty; urgency=low - - * Merge with Debian experimental (LP: #691512), remaining changes: - + debian/control, debian/patches/debian-specific/build_doc_adjustments.diff: - Use w3m (main) instead of elinks (universe) for generating documentation. - + Drop libtokyocabinet-dev (universe) from Build-Depends, use always - libgdbm-dev and also use gdbm for the header cache backend. (lp: #607448) - - -- أحمد المحمودي (Ahmed El-Mahmoudy) Fri, 17 Dec 2010 14:28:28 +0200 - -mutt (1.5.21-1) experimental; urgency=low - - * New upstream version (Closes: 597487) - * debian/patches: - + refreshed all patches - + removed patches applied upstream - * debian/control: - + Standards-Version bumped to 3.9.1, no change required - - -- Antonio Radici Sun, 03 Oct 2010 22:48:50 +0100 - -mutt (1.5.20-10) experimental; urgency=low - - * debian/patches: features/imap_fast_trash: Make "move to trash folder" use - IMAP COPY, by Paul Miller (jettero). - - -- Christoph Berg Wed, 25 Aug 2010 11:11:43 +0200 + -- Joe MacDonald Wed, 17 Nov 2010 13:32:01 -0500 mutt (1.5.20-9ubuntu2) maverick; urgency=low diff -Nru mutt-1.5.21/debian/control mutt-1.5.20/debian/control --- mutt-1.5.21/debian/control 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/control 2011-02-14 17:04:53.000000000 +0000 @@ -9,7 +9,7 @@ libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev, libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev, libgdbm-dev -Standards-Version: 3.9.1 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-mutt/mutt.git Vcs-Browser: http://git.debian.org/?p=pkg-mutt/mutt.git Homepage: http://www.mutt.org/ diff -Nru mutt-1.5.21/debian/extra/lib/mailto-mutt mutt-1.5.20/debian/extra/lib/mailto-mutt --- mutt-1.5.21/debian/extra/lib/mailto-mutt 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/extra/lib/mailto-mutt 2011-02-14 17:04:53.000000000 +0000 @@ -1,8 +1,118 @@ #!/bin/sh # -# mailto-mutt -- wrapper to use mutt as mailto handler from Iceweasel +# mailto-mutt -- wrapper to be able to use mutt as mailto handler from firefox # -# If you want Iceweasel 3.x to use this wrapper for mailto URLs, go to Edit > -# Preferences > Applications, and set "mailto" to "/usr/lib/mutt/mailto-mutt". +# To use, surf to Firefox's about:config page and configure the following +# three values: +# network.protocol-handler.external.mailto boolean true +# network.protocol-handler.app.mailto string '/path/to/handler' +# network.protocol-handler.warn-external.mailto boolean false +# +# Copyright martin f. krafft +# Released under the terms of the Artistic Licence 2.0 +# +# Revision: $Id: mailto-mutt 498 2007-05-12 12:02:10Z madduck $ +# +set -eu + +case "${1:-}" in + -d) debug=1; shift;; + '') exit 0;; + *) :;; +esac + +url_unescape() +{ + perl -e 'use URI::Escape; while(<>) { print uri_unescape($_); }' +} + +MAILTO="${@%%\?*}" +ARGS="${@#*\?}" +[ "$ARGS" = "$MAILTO" ] && unset ARGS +MAILTO="$(echo "${MAILTO#mailto:}" | url_unescape)" + +subject= +cc= +bcc= +body= +mutt_commands= + +IFS_store="$IFS" +IFS='&' + +for arg in ${ARGS:-}; do + value="$(echo "${arg#*=}" | url_unescape | sed -e "s,',\',")" + + case "${arg%%=*}" in + subject|Subject|SUBJECT) subject="$value";; + cc|Cc|CC) cc="$value";; + bcc|Bcc|BCC) bcc="$value";; + body|Body|BODY) body="$value";; + *) + mutt_commands="${mutt_commands:+${mutt_commands} + }-e\"my_hdr ${arg%%=*}: $value\"" + ;; + esac +done + +IFS="$IFS_store" + +break_at_commas() +{ + local atom + for i; do + atom="${atom:+$atom }$i" + case "${atom:-}" in + *,) echo "${atom%,}"; unset atom;; + esac + done + [ -n "${atom:-}" ] && echo "${atom%,}" +} + +get_addr_args() +{ + local type + case "$1" in + -*) type="$1"; shift;; + *) unset type;; + esac + + break_at_commas "$@" | while read addr; do + echo -n "${type:-}\"$addr\" " + done +} + +if [ -n "$mutt_commands" ]; then + mutt_args="${mutt_args:+$mutt_args }$mutt_commands" +fi + +if [ -n "$subject" ]; then + mutt_args="${mutt_args:+$mutt_args }-s\"$subject\"" +fi + +mutt_args="${mutt_args:+$mutt_args }$(get_addr_args -c $cc)" +mutt_args="${mutt_args:+$mutt_args }$(get_addr_args -b $bcc)" +mutt_args="${mutt_args:+$mutt_args }-- $(get_addr_args $MAILTO)" + +run() +{ + if [ ${debug:-0} -eq 1 ]; then + echo "$@" + [ -t 0 ] && [ -t 1 ] && [ -t 2 ] && $SHELL + else + eval "$@" + fi +} -exec x-terminal-emulator -e mutt "$@" +if [ -n "$body" ]; then + TMPFILE="$(tempfile -p mailto -d /tmp)" + trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15 + echo "$body" > $TMPFILE + run x-terminal-emulator -e mutt -i $TMPFILE${mutt_args:+ $mutt_args} + ret=$? + rm -f $TMPFILE + trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15 + exit $ret +else + run exec x-terminal-emulator -e mutt${mutt_args:+ $mutt_args} +fi diff -Nru mutt-1.5.21/debian/extra/rc/compressed-folders.rc mutt-1.5.20/debian/extra/rc/compressed-folders.rc --- mutt-1.5.21/debian/extra/rc/compressed-folders.rc 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/extra/rc/compressed-folders.rc 2011-02-14 17:04:53.000000000 +0000 @@ -5,6 +5,4 @@ open-hook \\.bz2$ "bzip2 -cd '%f' > '%t'" close-hook \\.bz2$ "bzip2 -c '%t' > '%f'" append-hook \\.bz2$ "bzip2 -c '%t' >> '%f'" -open-hook \\.xz$ "xz -cd %f > %t" -close-hook \\.xz$ "xz -c %t > %f" -append-hook \\.xz$ "xz -c %t >> %f" + diff -Nru mutt-1.5.21/debian/mutt.lintian-overrides mutt-1.5.20/debian/mutt.lintian-overrides --- mutt-1.5.21/debian/mutt.lintian-overrides 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/mutt.lintian-overrides 2011-02-14 17:04:53.000000000 +0000 @@ -1,4 +1,2 @@ mutt: setgid-binary usr/bin/mutt_dotlock 2755 root/mail mutt: arch-dep-package-has-big-usr-share -mutt: binary-without-manpage usr/bin/mutt-org -mutt: menu-command-not-in-package /usr/share/menu/mutt:5 /usr/bin/mutt diff -Nru mutt-1.5.21/debian/mutt-patched.lintian-overrides mutt-1.5.20/debian/mutt-patched.lintian-overrides --- mutt-1.5.21/debian/mutt-patched.lintian-overrides 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/mutt-patched.lintian-overrides 2011-02-14 17:04:53.000000000 +0000 @@ -1 +1 @@ -mutt-patched: binary-without-manpage usr/bin/mutt-patched +mutt-patched: binary-without-manpage usr/bin/mutt diff -Nru mutt-1.5.21/debian/NEWS mutt-1.5.20/debian/NEWS --- mutt-1.5.21/debian/NEWS 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/NEWS 2011-02-14 17:04:53.000000000 +0000 @@ -1,10 +1,3 @@ -mutt (1.5.21-2) experimental; urgency=low - mailto-mutt has been replaced by a wrapper as per #576313, because mutt is now - able to handle the mailto: urls; additionally it will also do some checks on - attachments and it will allow us to be as close to upstream as possible - - -- Antonio Radici Sat, 01 Jan 2011 12:56:29 +0000 - mutt (1.5.20-6) unstable; urgency=low The behavior of the write_bcc option has changed, now write_bcc is only used to decide if an Fcc message should have its Bcc header written; diff -Nru mutt-1.5.21/debian/patches/debian-specific/467432-write_bcc.patch mutt-1.5.20/debian/patches/debian-specific/467432-write_bcc.patch --- mutt-1.5.21/debian/patches/debian-specific/467432-write_bcc.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/debian-specific/467432-write_bcc.patch 2011-02-14 17:04:53.000000000 +0000 @@ -26,7 +26,7 @@ /* now copy the body of the message. */ --- a/init.h +++ b/init.h -@@ -3392,14 +3392,9 @@ +@@ -3365,14 +3365,9 @@ { "write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1}, /* ** .pp @@ -46,7 +46,7 @@ /* --- a/protos.h +++ b/protos.h -@@ -366,7 +366,7 @@ +@@ -372,7 +372,7 @@ int mutt_write_mime_body (BODY *, FILE *); int mutt_write_mime_header (BODY *, FILE *); int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags); @@ -57,7 +57,7 @@ void mutt_set_header_color(CONTEXT *, HEADER *); --- a/send.c +++ b/send.c -@@ -995,10 +995,10 @@ +@@ -994,10 +994,10 @@ unset_option (OPTWRITEBCC); #endif #ifdef MIXMASTER @@ -72,7 +72,7 @@ if (old_write_bcc) --- a/sendlib.c +++ b/sendlib.c -@@ -1929,7 +1929,7 @@ +@@ -1835,7 +1835,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, @@ -81,7 +81,7 @@ { char buffer[LONG_STRING]; char *p, *q; -@@ -1972,7 +1972,7 @@ +@@ -1878,7 +1878,7 @@ else if (mode > 0) fputs ("Cc: \n", fp); @@ -90,7 +90,7 @@ { if(mode != 0 || option(OPTWRITEBCC)) { -@@ -2711,7 +2711,7 @@ +@@ -2616,7 +2616,7 @@ /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() * */ diff -Nru mutt-1.5.21/debian/patches/debian-specific/566076-build_doc_adjustments.patch mutt-1.5.20/debian/patches/debian-specific/566076-build_doc_adjustments.patch --- mutt-1.5.21/debian/patches/debian-specific/566076-build_doc_adjustments.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/debian-specific/566076-build_doc_adjustments.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Use w3m to build the txt manual - ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -102,9 +102,7 @@ - - check: - manual.txt: manual.html -- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ -- LC_ALL=C w3m -dump manual.html > $@ || \ -- LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ -+ LC_ALL=C w3m -dump -O UTF-8 manual.html > $@ - - Muttrc: stamp-doc-rc - -@@ -116,10 +114,10 @@ - touch stamp-doc-rc - - manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css -- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml -+ xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml - - stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css -- -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml -+ xsltproc --nonet $(srcdir)/chunk.xsl manual.xml - touch stamp-doc-chunked - - $(CHUNKED_DOCFILES): stamp-doc-chunked diff -Nru mutt-1.5.21/debian/patches/debian-specific/build_doc_adjustments.diff mutt-1.5.20/debian/patches/debian-specific/build_doc_adjustments.diff --- mutt-1.5.21/debian/patches/debian-specific/build_doc_adjustments.diff 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/debian-specific/build_doc_adjustments.diff 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,17 @@ +Use elinks(1) to generate the HTML manual page + +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -114,10 +112,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked + touch stamp-doc-rc + + manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css +- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml ++ xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml + + stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css +- -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml ++ xsltproc --nonet $(srcdir)/chunk.xsl manual.xml + touch stamp-doc-chunked + + $(CHUNKED_DOCFILES): stamp-doc-chunked diff -Nru mutt-1.5.21/debian/patches/debian-specific/document_debian_defaults mutt-1.5.20/debian/patches/debian-specific/document_debian_defaults --- mutt-1.5.21/debian/patches/debian-specific/document_debian_defaults 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/debian-specific/document_debian_defaults 2011-02-14 17:04:53.000000000 +0000 @@ -1,8 +1,10 @@ Some customization of the option which are straying from the default only on Debian systems ---- a/init.h -+++ b/init.h +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:36:35.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:36:36.000000000 +0200 @@ -312,6 +312,9 @@ ** .pp ** When this variable is \fIset\fP, mutt will include Delivered-To headers when @@ -13,7 +15,7 @@ */ { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 }, /* -@@ -1033,6 +1036,9 @@ +@@ -1032,6 +1035,9 @@ ** one is not used. ** .pp ** Also see $$use_domain and $$hidden_host. @@ -23,7 +25,7 @@ */ { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 }, /* -@@ -1566,6 +1572,9 @@ +@@ -1554,6 +1560,9 @@ ** system. It is used with various sets of parameters to gather the ** list of known remailers, and to finally send a message through the ** mixmaster chain. @@ -33,7 +35,7 @@ */ #endif { "move", DT_QUAD, R_NONE, OPT_MOVE, M_NO }, -@@ -2585,6 +2594,10 @@ +@@ -2570,6 +2579,10 @@ ** This variable contains the name of either a directory, or a file which ** contains trusted certificates for use with OpenSSL. ** (S/MIME only) @@ -44,7 +46,7 @@ */ { "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 }, /* -@@ -2791,6 +2804,9 @@ +@@ -2776,6 +2789,9 @@ ** .ts ** set smtp_authenticators="digest-md5:cram-md5" ** .te @@ -54,7 +56,7 @@ */ # endif /* USE_SASL */ { "smtp_pass", DT_STR, R_NONE, UL &SmtpPass, UL 0 }, -@@ -2838,6 +2854,9 @@ +@@ -2823,6 +2839,9 @@ ** .pp ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: ``\fCset sort=reverse-date-sent\fP''). @@ -64,7 +66,7 @@ */ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS }, /* -@@ -3375,6 +3394,9 @@ +@@ -3348,6 +3367,9 @@ ** is set to deliver directly via SMTP (see $$smtp_url), this ** option does nothing: mutt will never write out the ``Bcc:'' header ** in this case. diff -Nru mutt-1.5.21/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff mutt-1.5.20/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff --- mutt-1.5.21/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff 2011-02-14 17:04:53.000000000 +0000 @@ -3,16 +3,16 @@ --- a/init.c +++ b/init.c -@@ -48,6 +48,7 @@ +@@ -47,6 +47,7 @@ #include #include #include +#include #include #include - #include -@@ -2952,6 +2953,31 @@ - srandom(seed); + +@@ -2953,6 +2954,31 @@ + return 0; } +int getmailname(char *s, size_t l) diff -Nru mutt-1.5.21/debian/patches/debian-specific/Muttrc mutt-1.5.20/debian/patches/debian-specific/Muttrc --- mutt-1.5.21/debian/patches/debian-specific/Muttrc 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/debian-specific/Muttrc 2011-02-14 17:04:53.000000000 +0000 @@ -40,7 +40,7 @@ # imitate the old search-body function macro index \eb "~b " "search in message bodies" -@@ -23,14 +51,14 @@ +@@ -23,7 +51,7 @@ "call urlview to extract URLs out of a message" # Show documentation when pressing F1 @@ -49,7 +49,8 @@ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" - bind browser y exit +@@ -35,7 +63,7 @@ + # append-hook \\.gz$ "gzip -c %t >> %f" # If Mutt is unable to determine your site's domain name correctly, you can -# set the default here. @@ -57,7 +58,7 @@ # # set hostname=cs.hmc.edu -@@ -42,6 +70,10 @@ +@@ -47,6 +75,10 @@ # be undone with unmime_lookup. mime_lookup application/octet-stream @@ -68,7 +69,7 @@ ## ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH *** ## -@@ -96,6 +128,9 @@ +@@ -101,6 +133,9 @@ attachments -A message/external-body attachments -I message/external-body diff -Nru mutt-1.5.21/debian/patches/features/compressed-folders mutt-1.5.20/debian/patches/features/compressed-folders --- mutt-1.5.21/debian/patches/features/compressed-folders 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/compressed-folders 2011-02-14 17:04:53.000000000 +0000 @@ -175,7 +175,7 @@ + ctx->realpath = ctx->path; + + /* Uncompress to /tmp */ -+ mutt_mktemp (tmppath, sizeof(tmppath)); ++ mutt_mktemp (tmppath); + ctx->path = safe_malloc (strlen (tmppath) + 1); + strcpy (ctx->path, tmppath); +} @@ -551,7 +551,7 @@ +void mutt_fast_close_compressed (CONTEXT *); --- a/configure.ac +++ b/configure.ac -@@ -812,6 +812,11 @@ +@@ -805,6 +805,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -565,7 +565,7 @@ AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", --- a/curs_main.c +++ b/curs_main.c -@@ -1153,6 +1153,11 @@ +@@ -1135,6 +1135,11 @@ { int check; @@ -579,7 +579,7 @@ --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -6116,6 +6116,205 @@ +@@ -5678,6 +5678,205 @@ @@ -787,7 +787,7 @@ --- a/doc/muttrc.man.head +++ b/doc/muttrc.man.head -@@ -346,6 +346,24 @@ +@@ -345,6 +345,24 @@ to a certain recipient. The meaning of "key ID" is to be taken broadly: This can be a different e-mail address, a numerical key ID, or even just an arbitrary search string. @@ -844,7 +844,7 @@ ) --- a/init.h +++ b/init.h -@@ -3530,6 +3530,11 @@ +@@ -3504,6 +3504,11 @@ { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, @@ -853,12 +853,12 @@ + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, + { "append-hook", mutt_parse_hook, M_APPENDHOOK }, +#endif - { "group", parse_group, M_GROUP }, - { "ungroup", parse_group, M_UNGROUP }, + { "group", parse_group, 0 }, + { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, --- a/main.c +++ b/main.c -@@ -401,6 +401,12 @@ +@@ -402,6 +402,12 @@ #else "-LOCALES_HACK " #endif @@ -873,7 +873,7 @@ "+HAVE_WC_FUNCS " --- a/Makefile.am +++ b/Makefile.am -@@ -22,7 +22,7 @@ +@@ -18,7 +18,7 @@ bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ @@ -882,7 +882,7 @@ commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ edit.c enter.c flags.c init.c filter.c from.c \ getdomain.c group.c \ -@@ -61,7 +61,7 @@ +@@ -57,7 +57,7 @@ bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ @@ -904,7 +904,7 @@ #include #include #include -@@ -1070,6 +1074,12 @@ +@@ -1048,6 +1052,12 @@ int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -931,7 +931,7 @@ /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -887,6 +892,11 @@ +@@ -882,6 +887,11 @@ int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ @@ -956,7 +956,7 @@ #ifdef USE_IMAP #include "imap.h" #endif -@@ -414,6 +418,10 @@ +@@ -415,6 +419,10 @@ return (-1); } @@ -967,7 +967,7 @@ return (magic); } -@@ -453,6 +461,13 @@ +@@ -454,6 +462,13 @@ { struct stat sb; @@ -981,7 +981,7 @@ ctx->append = 1; #ifdef USE_IMAP -@@ -616,7 +631,12 @@ +@@ -617,7 +632,12 @@ } ctx->magic = mx_get_magic (path); @@ -995,7 +995,7 @@ if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -721,6 +741,10 @@ +@@ -718,6 +738,10 @@ mutt_free_header (&ctx->hdrs[i]); FREE (&ctx->hdrs); FREE (&ctx->v2r); @@ -1006,7 +1006,7 @@ FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -773,6 +797,12 @@ +@@ -770,6 +794,12 @@ if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); @@ -1019,7 +1019,7 @@ return rc; } -@@ -1043,6 +1073,11 @@ +@@ -1033,6 +1063,11 @@ !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1031,7 +1031,7 @@ mx_fastclose_mailbox (ctx); return 0; -@@ -1361,6 +1396,11 @@ +@@ -1355,6 +1390,11 @@ { int rc; @@ -1045,49 +1045,55 @@ if (ctx->locked) lock = 0; --- a/mx.h +++ b/mx.h -@@ -36,6 +36,9 @@ - M_MAILDIR, - M_IMAP, - M_POP +@@ -40,6 +40,9 @@ + #ifdef USE_POP + , M_POP + #endif +#ifdef USE_COMPRESSED + , M_COMPRESSED +#endif }; WHERE short DefaultMagic INITVAL (M_MBOX); ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -8,6 +8,7 @@ - color.c - commands.c - compose.c -+compress.c - crypt-gpgme.c - crypt.c - cryptglue.c ---- a/status.c -+++ b/status.c -@@ -96,6 +96,14 @@ - - case 'f': - snprintf (fmt, sizeof(fmt), "%%%ss", prefix); -+#ifdef USE_COMPRESSED -+ if (Context && Context->compressinfo && Context->realpath) -+ { -+ strfcpy (tmp, Context->realpath, sizeof (tmp)); -+ mutt_pretty_mailbox (tmp, sizeof (tmp)); -+ } -+ else -+#endif - if (Context && Context->path) - { - strfcpy (tmp, Context->path, sizeof (tmp)); --- a/po/de.po +++ b/po/de.po -@@ -5159,6 +5159,36 @@ - msgid "show S/MIME options" - msgstr "Zeige S/MIME Optionen" +@@ -2005,6 +2005,10 @@ + msgid "Bad history file format (line %d)" + msgstr "Falsches Format der Datei frherer Eingaben (Zeile %d)" + ++#: hook.c:96 ++msgid "badly formatted command string" ++msgstr "Hook enthlt nicht die Muster %f und %t" ++ + #: hook.c:251 + #, c-format + msgid "unhook: Can't do unhook * from within a hook." +@@ -2766,7 +2770,7 @@ + msgid "Mailbox is corrupt!" + msgstr "Mailbox fehlerhaft!" + +-#: mbox.c:678 ++#: mbox.c:678 compress.c:203 mbox.c:661 + msgid "Mailbox was corrupted!" + msgstr "Mailbox wurde zerstrt!" + +@@ -2774,10 +2778,11 @@ + msgid "Fatal error! Could not reopen mailbox!" + msgstr "Fataler Fehler, konnte Mailbox nicht erneut ffnen!" + +-#: mbox.c:746 ++#: mbox.c:746 compress.c:264 compress.c:246 compress.c:367 compress.c:443 mbox.c:706 + msgid "Unable to lock mailbox!" + msgstr "Kann Mailbox nicht fr exklusiven Zugriff sperren!" + ++ + #. this means ctx->changed or ctx->deleted was set, but no + #. * messages were found to be changed or deleted. This should + #. * never happen, is we presume it is a bug in mutt. +@@ -5378,3 +5383,32 @@ + #~ msgid "Authentication method is unknown." + #~ msgstr "Authentifizierungsmethode unbekannt." + +#: compress.c:228 compress.c:253 +#, c-format @@ -1117,7 +1123,30 @@ +#, c-format +msgid " %s: Error compressing mailbox! Uncompressed one kept!\n" +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n" -+ - #~ msgid "Clear" - #~ msgstr "Klartext" +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -8,6 +8,7 @@ + color.c + commands.c + compose.c ++compress.c + crypt-gpgme.c + crypt.c + cryptglue.c +--- a/status.c ++++ b/status.c +@@ -96,6 +96,14 @@ + case 'f': + snprintf (fmt, sizeof(fmt), "%%%ss", prefix); ++#ifdef USE_COMPRESSED ++ if (Context && Context->compressinfo && Context->realpath) ++ { ++ strfcpy (tmp, Context->realpath, sizeof (tmp)); ++ mutt_pretty_mailbox (tmp, sizeof (tmp)); ++ } ++ else ++#endif + if (Context && Context->path) + { + strfcpy (tmp, Context->path, sizeof (tmp)); diff -Nru mutt-1.5.21/debian/patches/features/ifdef mutt-1.5.20/debian/patches/features/ifdef --- mutt-1.5.21/debian/patches/features/ifdef 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/ifdef 2011-02-14 17:04:53.000000000 +0000 @@ -28,8 +28,8 @@ == END PATCH --- a/init.c +++ b/init.c -@@ -601,6 +601,65 @@ - } +@@ -635,6 +635,65 @@ static int remove_from_rx_list (RX_LIST + return (rv); } +static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) @@ -96,7 +96,7 @@ do --- a/init.h +++ b/init.h -@@ -3439,6 +3439,7 @@ +@@ -3413,6 +3413,7 @@ static int parse_lists (BUFFER *, BUFFER static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -104,9 +104,9 @@ static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -3489,6 +3490,7 @@ - { "group", parse_group, M_GROUP }, - { "ungroup", parse_group, M_UNGROUP }, +@@ -3463,6 +3464,7 @@ struct command_t Commands[] = { + { "group", parse_group, 0 }, + { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, + { "ifdef", parse_ifdef, 0 }, #ifdef HAVE_ICONV @@ -114,7 +114,7 @@ #endif --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -4373,6 +4373,28 @@ +@@ -4087,6 +4087,28 @@ considered to be an executable program f diff -Nru mutt-1.5.21/debian/patches/features/imap_fast_trash mutt-1.5.20/debian/patches/features/imap_fast_trash --- mutt-1.5.21/debian/patches/features/imap_fast_trash 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/imap_fast_trash 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -http://marc.info/?l=mutt-dev&m=128045511126422 - -Make "move to trash folder" use IMAP COPY. - -by Paul Miller (jettero) - ---- a/imap/imap.c -+++ b/imap/imap.c -@@ -893,6 +893,12 @@ static int imap_make_msg_set (IMAP_DATA* - if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted) - match = invert ^ hdrs[n]->deleted; - break; -+ case M_EXPIRED: /* imap_fast_trash version of M_DELETED */ -+ if (hdrs[n]->purged) -+ break; -+ if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted) -+ match = invert ^ hdrs[n]->deleted; -+ break; - case M_FLAG: - if (hdrs[n]->flagged != HEADER_DATA(hdrs[n])->flagged) - match = invert ^ hdrs[n]->flagged; -@@ -2028,3 +2034,54 @@ int imap_complete(char* dest, size_t dle - - return -1; - } -+ -+int imap_fast_trash() { -+ -+ if( Context->magic == M_IMAP && mx_is_imap(TrashPath) ) { -+ IMAP_MBOX mx; -+ IMAP_DATA *idata = (IMAP_DATA *) Context->data; -+ char mbox[LONG_STRING]; -+ char mmbox[LONG_STRING]; -+ int rc; -+ dprint(1, (debugfile, "[itf] trashcan seems to be on imap.\n")); -+ -+ if ( imap_parse_path(TrashPath, &mx) == 0 ) { -+ if( mutt_account_match(&(idata->conn->account), &(mx.account)) ) { -+ dprint(1, (debugfile, "[itf] trashcan seems to be on the same account.\n")); -+ -+ imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox)); -+ if (!*mbox) -+ strfcpy (mbox, "INBOX", sizeof (mbox)); -+ imap_munge_mbox_name (mmbox, sizeof (mmbox), mbox); -+ -+ rc = imap_exec_msgset (idata, "UID COPY", mmbox, M_EXPIRED, 0, 0); -+ if (!rc) { -+ dprint (1, (debugfile, "imap_copy_messages: No messages del-tagged\n")); -+ rc = -1; -+ goto old_way; -+ -+ } else if (rc < 0) { -+ dprint (1, (debugfile, "could not queue copy\n")); -+ goto old_way; -+ -+ } else { -+ mutt_message (_("Copying %d messages to %s..."), rc, mbox); -+ return 0; -+ } -+ -+ } else { -+ dprint(1, (debugfile, "[itf] trashcan seems to be on a different account.\n")); -+ } -+ -+ old_way: -+ FREE (&mx.mbox); /* we probably only need to free this when the parse works */ -+ -+ } else { -+ dprint(1, (debugfile, "[itf] failed to parse TrashPath.\n" )); -+ } -+ -+ dprint(1, (debugfile, "[itf] giving up and trying old fasioned way.\n" )); -+ } -+ -+ return 1; -+} ---- a/imap/imap.h -+++ b/imap/imap.h -@@ -72,4 +72,7 @@ void imap_keepalive (void); - - int imap_account_match (const ACCOUNT* a1, const ACCOUNT* a2); - -+/* trash */ -+int imap_fast_trash(); -+ - #endif ---- a/mx.c -+++ b/mx.c -@@ -802,6 +802,11 @@ static int trash_append (CONTEXT *ctx) - && stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev) - return 0; /* we are in the trash folder: simple sync */ - -+ #ifdef USE_IMAP -+ if( !imap_fast_trash() ) -+ return 0; -+ #endif -+ - if ((ctx_trash = mx_open_mailbox (TrashPath, M_APPEND, NULL)) != NULL) - { - for (i = 0 ; i < ctx->msgcount ; i++) diff -Nru mutt-1.5.21/debian/patches/features/purge-message mutt-1.5.20/debian/patches/features/purge-message --- mutt-1.5.21/debian/patches/features/purge-message 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/purge-message 2011-02-14 17:04:53.000000000 +0000 @@ -26,9 +26,11 @@ - Fixed indentation of "purged" in mutt.h. == END PATCH ---- a/OPS -+++ b/OPS -@@ -142,6 +142,7 @@ +Index: mutt/OPS +=================================================================== +--- mutt.orig/OPS 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/OPS 2009-06-25 12:36:14.000000000 +0200 +@@ -141,6 +141,7 @@ OP_PREV_LINE "scroll up one line" OP_PREV_PAGE "move to the previous page" OP_PRINT "print the current entry" @@ -36,9 +38,11 @@ OP_QUERY "query external program for addresses" OP_QUERY_APPEND "append new query results to current results" OP_QUIT "save changes to mailbox and quit" ---- a/curs_main.c -+++ b/curs_main.c -@@ -1843,6 +1843,7 @@ +Index: mutt/curs_main.c +=================================================================== +--- mutt.orig/curs_main.c 2009-06-25 12:35:44.000000000 +0200 ++++ mutt/curs_main.c 2009-06-25 12:36:14.000000000 +0200 +@@ -1823,6 +1823,7 @@ MAYBE_REDRAW (menu->redraw); break; @@ -46,7 +50,7 @@ case OP_DELETE: CHECK_MSGCOUNT; -@@ -1853,6 +1854,7 @@ +@@ -1833,6 +1834,7 @@ if (tag) { mutt_tag_set_flag (M_DELETE, 1); @@ -54,7 +58,7 @@ if (option (OPTDELETEUNTAG)) mutt_tag_set_flag (M_TAG, 0); menu->redraw = REDRAW_INDEX; -@@ -1860,6 +1862,8 @@ +@@ -1840,6 +1842,8 @@ else { mutt_set_flag (Context, CURHDR, M_DELETE, 1); @@ -63,7 +67,7 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, CURHDR, M_TAG, 0); if (option (OPTRESOLVE)) -@@ -2161,11 +2165,13 @@ +@@ -2136,11 +2140,13 @@ if (tag) { mutt_tag_set_flag (M_DELETE, 0); @@ -77,7 +81,7 @@ if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) { menu->current++; -@@ -2186,9 +2192,11 @@ +@@ -2161,9 +2167,11 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0, @@ -91,8 +95,10 @@ { if (option (OPTRESOLVE)) { ---- a/flags.c -+++ b/flags.c +Index: mutt/flags.c +=================================================================== +--- mutt.orig/flags.c 2009-06-25 12:35:48.000000000 +0200 ++++ mutt/flags.c 2009-06-25 12:36:14.000000000 +0200 @@ -104,6 +104,16 @@ } break; @@ -110,9 +116,11 @@ case M_NEW: if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) ---- a/functions.h -+++ b/functions.h -@@ -121,6 +121,7 @@ +Index: mutt/functions.h +=================================================================== +--- mutt.orig/functions.h 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/functions.h 2009-06-25 12:36:14.000000000 +0200 +@@ -120,6 +120,7 @@ { "toggle-write", OP_TOGGLE_WRITE, "%" }, { "next-thread", OP_MAIN_NEXT_THREAD, "\016" }, { "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" }, @@ -120,7 +128,7 @@ { "query", OP_QUERY, "Q" }, { "quit", OP_QUIT, "q" }, { "reply", OP_REPLY, "r" }, -@@ -213,6 +214,7 @@ +@@ -209,6 +210,7 @@ { "print-message", OP_PRINT, "p" }, { "previous-thread", OP_MAIN_PREV_THREAD, "\020" }, { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" }, @@ -128,8 +136,10 @@ { "quit", OP_QUIT, "Q" }, { "exit", OP_EXIT, "q" }, { "reply", OP_REPLY, "r" }, ---- a/mutt.h -+++ b/mutt.h +Index: mutt/mutt.h +=================================================================== +--- mutt.orig/mutt.h 2009-06-25 12:35:48.000000000 +0200 ++++ mutt/mutt.h 2009-06-25 12:36:14.000000000 +0200 @@ -188,6 +188,7 @@ M_UNDELETE, M_DELETED, @@ -138,7 +148,7 @@ M_FLAG, M_TAG, M_UNTAG, -@@ -709,6 +710,7 @@ +@@ -704,6 +705,7 @@ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; unsigned int appended : 1; /* has been saved */ @@ -146,9 +156,11 @@ unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ ---- a/mx.c -+++ b/mx.c -@@ -806,6 +806,7 @@ +Index: mutt/mx.c +=================================================================== +--- mutt.orig/mx.c 2009-06-25 12:36:10.000000000 +0200 ++++ mutt/mx.c 2009-06-25 12:36:14.000000000 +0200 +@@ -803,6 +803,7 @@ { for (i = 0 ; i < ctx->msgcount ; i++) if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended @@ -156,9 +168,11 @@ && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1) { mx_close_mailbox (ctx_trash, NULL); ---- a/pager.c -+++ b/pager.c -@@ -2343,12 +2343,15 @@ +Index: mutt/pager.c +=================================================================== +--- mutt.orig/pager.c 2009-06-25 12:35:44.000000000 +0200 ++++ mutt/pager.c 2009-06-25 12:36:14.000000000 +0200 +@@ -2316,12 +2316,15 @@ MAYBE_REDRAW (redraw); break; @@ -174,7 +188,7 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, extra->hdr, M_TAG, 0); redraw = REDRAW_STATUS | REDRAW_INDEX; -@@ -2675,6 +2678,7 @@ +@@ -2648,6 +2651,7 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message")); mutt_set_flag (Context, extra->hdr, M_DELETE, 0); @@ -182,7 +196,7 @@ redraw = REDRAW_STATUS | REDRAW_INDEX; if (option (OPTRESOLVE)) { -@@ -2690,9 +2694,11 @@ +@@ -2663,9 +2667,11 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0, @@ -195,9 +209,11 @@ { if (option (OPTRESOLVE)) { ---- a/pattern.c -+++ b/pattern.c -@@ -1357,8 +1357,10 @@ +Index: mutt/pattern.c +=================================================================== +--- mutt.orig/pattern.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/pattern.c 2009-06-25 12:36:14.000000000 +0200 +@@ -1347,8 +1347,10 @@ { switch (op) { diff -Nru mutt-1.5.21/debian/patches/features/sensible_browser_position mutt-1.5.20/debian/patches/features/sensible_browser_position --- mutt-1.5.21/debian/patches/features/sensible_browser_position 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/sensible_browser_position 2011-02-14 17:04:53.000000000 +0000 @@ -5,9 +5,11 @@ http://lists.df7cb.de/mutt/message/20050309.162127.a244a894.en.html == END PATCH ---- a/menu.c -+++ b/menu.c -@@ -852,8 +852,17 @@ +Index: mutt/menu.c +=================================================================== +--- mutt.orig/menu.c 2009-06-25 12:35:36.000000000 +0200 ++++ mutt/menu.c 2009-06-25 12:36:19.000000000 +0200 +@@ -853,8 +853,17 @@ int mutt_menuLoop (MUTTMENU *menu) { @@ -25,7 +27,7 @@ FOREVER { if (option (OPTMENUCALLER)) -@@ -1081,6 +1090,8 @@ +@@ -1082,6 +1091,8 @@ break; default: @@ -34,9 +36,11 @@ return (i); } } ---- a/browser.c -+++ b/browser.c -@@ -56,6 +56,7 @@ +Index: mutt/browser.c +=================================================================== +--- mutt.orig/browser.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/browser.c 2009-06-25 12:36:19.000000000 +0200 +@@ -55,6 +55,7 @@ int num; } FOLDER; @@ -44,7 +48,7 @@ static char LastDir[_POSIX_PATH_MAX] = ""; static char LastDirBackup[_POSIX_PATH_MAX] = ""; -@@ -536,9 +537,13 @@ +@@ -519,9 +520,13 @@ menu->tagged = 0; if (buffy) @@ -58,7 +62,7 @@ strfcpy (path, LastDir, sizeof (path)); mutt_pretty_mailbox (path, sizeof (path)); #ifdef USE_IMAP -@@ -547,8 +552,22 @@ +@@ -530,8 +535,22 @@ path, NONULL (Mask.pattern)); else #endif @@ -83,7 +87,7 @@ } menu->redraw = REDRAW_FULL; } -@@ -731,7 +750,6 @@ +@@ -714,7 +733,6 @@ #endif ) { @@ -91,8 +95,10 @@ /* save the old directory */ strfcpy (OldLastDir, LastDir, sizeof (OldLastDir)); ---- a/mutt_menu.h -+++ b/mutt_menu.h +Index: mutt/mutt_menu.h +=================================================================== +--- mutt.orig/mutt_menu.h 2009-06-25 12:35:44.000000000 +0200 ++++ mutt/mutt_menu.h 2009-06-25 12:36:19.000000000 +0200 @@ -49,6 +49,7 @@ int offset; /* which screen row to start the index */ int pagelen; /* number of entries per screen */ diff -Nru mutt-1.5.21/debian/patches/features/trash-folder mutt-1.5.20/debian/patches/features/trash-folder --- mutt-1.5.21/debian/patches/features/trash-folder 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/trash-folder 2011-02-14 17:04:53.000000000 +0000 @@ -46,9 +46,11 @@ - Fixed indentation of "appended" in mutt.h. == END PATCH ---- a/commands.c -+++ b/commands.c -@@ -717,6 +717,7 @@ +Index: mutt/commands.c +=================================================================== +--- mutt.orig/commands.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/commands.c 2009-06-25 12:35:48.000000000 +0200 +@@ -716,6 +716,7 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, h, M_TAG, 0); } @@ -56,8 +58,10 @@ return 0; } ---- a/flags.c -+++ b/flags.c +Index: mutt/flags.c +=================================================================== +--- mutt.orig/flags.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/flags.c 2009-06-25 12:35:48.000000000 +0200 @@ -65,7 +65,13 @@ { h->deleted = 0; @@ -91,8 +95,10 @@ case M_NEW: if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) ---- a/globals.h -+++ b/globals.h +Index: mutt/globals.h +=================================================================== +--- mutt.orig/globals.h 2009-06-25 12:35:44.000000000 +0200 ++++ mutt/globals.h 2009-06-25 12:35:48.000000000 +0200 @@ -139,6 +139,7 @@ WHERE char *Status; WHERE char *Tempdir; @@ -101,9 +107,11 @@ WHERE char *Username; WHERE char *Visual; WHERE char *XtermTitle; ---- a/imap/message.c -+++ b/imap/message.c -@@ -876,6 +876,7 @@ +Index: mutt/imap/message.c +=================================================================== +--- mutt.orig/imap/message.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/imap/message.c 2009-06-25 12:35:48.000000000 +0200 +@@ -867,6 +867,7 @@ if (ctx->hdrs[n]->tagged) { mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1); @@ -111,7 +119,7 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0); } -@@ -883,6 +884,7 @@ +@@ -874,6 +875,7 @@ else { mutt_set_flag (ctx, h, M_DELETE, 1); @@ -119,9 +127,11 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (ctx, h, M_TAG, 0); } ---- a/init.h -+++ b/init.h -@@ -3195,6 +3195,16 @@ +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:35:44.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:35:48.000000000 +0200 +@@ -3180,6 +3180,16 @@ ** by \fIyou\fP. The sixth character is used to indicate when a mail ** was sent to a mailing-list you subscribe to. */ @@ -138,8 +148,10 @@ #ifdef USE_SOCKET { "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 }, /* ---- a/mutt.h -+++ b/mutt.h +Index: mutt/mutt.h +=================================================================== +--- mutt.orig/mutt.h 2009-06-25 12:35:44.000000000 +0200 ++++ mutt/mutt.h 2009-06-25 12:35:48.000000000 +0200 @@ -187,6 +187,7 @@ M_DELETE, M_UNDELETE, @@ -148,7 +160,7 @@ M_FLAG, M_TAG, M_UNTAG, -@@ -707,6 +708,7 @@ +@@ -702,6 +703,7 @@ unsigned int mime : 1; /* has a MIME-Version header? */ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; @@ -156,7 +168,7 @@ unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ -@@ -879,6 +881,7 @@ +@@ -874,6 +876,7 @@ int new; /* how many new messages? */ int unread; /* how many unread messages? */ int deleted; /* how many deleted messages */ @@ -164,9 +176,11 @@ int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ ---- a/muttlib.c -+++ b/muttlib.c -@@ -1515,7 +1515,9 @@ +Index: mutt/muttlib.c +=================================================================== +--- mutt.orig/muttlib.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/muttlib.c 2009-06-25 12:35:48.000000000 +0200 +@@ -1460,7 +1460,9 @@ if (magic > 0 && !mx_access (s, W_OK)) { @@ -177,9 +191,11 @@ { snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s); if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO) ---- a/mx.c -+++ b/mx.c -@@ -776,6 +776,53 @@ +Index: mutt/mx.c +=================================================================== +--- mutt.orig/mx.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/mx.c 2009-06-25 12:35:48.000000000 +0200 +@@ -773,6 +773,53 @@ return rc; } @@ -233,7 +249,7 @@ /* save changes and close mailbox */ int mx_close_mailbox (CONTEXT *ctx, int *index_hint) { -@@ -912,6 +959,7 @@ +@@ -909,6 +956,7 @@ if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0) { mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1); @@ -241,7 +257,7 @@ } else { -@@ -936,6 +984,14 @@ +@@ -931,6 +979,14 @@ return 0; } @@ -256,7 +272,7 @@ #ifdef USE_IMAP /* allow IMAP to preserve the deleted flag across sessions */ if (ctx->magic == M_IMAP) -@@ -1133,6 +1189,12 @@ +@@ -1130,6 +1186,12 @@ msgcount = ctx->msgcount; deleted = ctx->deleted; @@ -269,9 +285,11 @@ #ifdef USE_IMAP if (ctx->magic == M_IMAP) rc = imap_sync_mailbox (ctx, purge, index_hint); ---- a/postpone.c -+++ b/postpone.c -@@ -277,6 +277,9 @@ +Index: mutt/postpone.c +=================================================================== +--- mutt.orig/postpone.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/postpone.c 2009-06-25 12:35:48.000000000 +0200 +@@ -276,6 +276,9 @@ /* finished with this message, so delete it. */ mutt_set_flag (PostContext, h, M_DELETE, 1); diff -Nru mutt-1.5.21/debian/patches/features/xtitles mutt-1.5.20/debian/patches/features/xtitles --- mutt-1.5.21/debian/patches/features/xtitles 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features/xtitles 2011-02-14 17:04:53.000000000 +0000 @@ -10,8 +10,10 @@ (cleaner code, no functional change, evades conflict with sidebar patch) == END PATCH ---- a/curs_main.c -+++ b/curs_main.c +Index: mutt/curs_main.c +=================================================================== +--- mutt.orig/curs_main.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/curs_main.c 2009-06-25 12:35:44.000000000 +0200 @@ -110,6 +110,19 @@ extern size_t UngetCount; @@ -32,7 +34,7 @@ void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num) { format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX; -@@ -562,6 +575,13 @@ +@@ -566,6 +579,13 @@ SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); menu->redraw &= ~REDRAW_STATUS; @@ -46,8 +48,10 @@ } menu->redraw = 0; ---- a/globals.h -+++ b/globals.h +Index: mutt/globals.h +=================================================================== +--- mutt.orig/globals.h 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/globals.h 2009-06-25 12:35:44.000000000 +0200 @@ -141,6 +141,8 @@ WHERE char *Tochars; WHERE char *Username; @@ -57,9 +61,11 @@ WHERE char *CurrentFolder; WHERE char *LastFolder; ---- a/init.c -+++ b/init.c -@@ -1873,6 +1873,26 @@ +Index: mutt/init.c +=================================================================== +--- mutt.orig/init.c 2009-06-25 12:35:42.000000000 +0200 ++++ mutt/init.c 2009-06-25 12:35:44.000000000 +0200 +@@ -1892,6 +1892,26 @@ toggle_option (MuttVars[idx].data); else set_option (MuttVars[idx].data); @@ -86,9 +92,11 @@ } else if (myvar || DTYPE (MuttVars[idx].type) == DT_STR || DTYPE (MuttVars[idx].type) == DT_PATH || ---- a/init.h -+++ b/init.h -@@ -3364,6 +3364,27 @@ +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:35:42.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:35:44.000000000 +0200 +@@ -3337,6 +3337,27 @@ ** Also see the $$read_inc, $$net_inc and $$time_inc variables and the ** ``$tuning'' section of the manual for performance considerations. */ @@ -116,9 +124,11 @@ /*--*/ { NULL, 0, 0, 0, 0 } }; ---- a/mutt.h -+++ b/mutt.h -@@ -447,6 +447,7 @@ +Index: mutt/mutt.h +=================================================================== +--- mutt.orig/mutt.h 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/mutt.h 2009-06-25 12:35:44.000000000 +0200 +@@ -446,6 +446,7 @@ OPTWRAPSEARCH, OPTWRITEBCC, /* write out a bcc header? */ OPTXMAILER, @@ -126,9 +136,11 @@ OPTCRYPTUSEGPGME, OPTCRYPTUSEPKA, ---- a/pager.c -+++ b/pager.c -@@ -1812,6 +1812,13 @@ +Index: mutt/pager.c +=================================================================== +--- mutt.orig/pager.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/pager.c 2009-06-25 12:35:44.000000000 +0200 +@@ -1784,6 +1784,13 @@ } BKGDSET (MT_COLOR_NORMAL); SETCOLOR (MT_COLOR_NORMAL); @@ -142,8 +154,10 @@ } if ((redraw & REDRAW_INDEX) && index) ---- a/status.c -+++ b/status.c +Index: mutt/status.c +=================================================================== +--- mutt.orig/status.c 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/status.c 2009-06-25 12:35:44.000000000 +0200 @@ -195,6 +195,8 @@ break; @@ -153,8 +167,10 @@ if (menu->top + menu->pagelen >= menu->max) cp = menu->top ? "end" : "all"; else ---- a/mutt_menu.h -+++ b/mutt_menu.h +Index: mutt/mutt_menu.h +=================================================================== +--- mutt.orig/mutt_menu.h 2009-06-25 12:35:37.000000000 +0200 ++++ mutt/mutt_menu.h 2009-06-25 12:35:44.000000000 +0200 @@ -103,6 +103,8 @@ void menu_current_bottom (MUTTMENU *); void menu_check_recenter (MUTTMENU *); diff -Nru mutt-1.5.21/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime mutt-1.5.20/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime --- mutt-1.5.21/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime 2011-02-14 17:04:53.000000000 +0000 @@ -1,8 +1,10 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description ---- a/globals.h -+++ b/globals.h -@@ -243,6 +243,8 @@ +Index: mutt/globals.h +=================================================================== +--- mutt.orig/globals.h 2009-06-25 12:35:48.000000000 +0200 ++++ mutt/globals.h 2009-06-25 12:36:22.000000000 +0200 +@@ -242,6 +242,8 @@ WHERE char *PgpListSecringCommand; WHERE char *PgpListPubringCommand; WHERE char *PgpGetkeysCommand; @@ -11,9 +13,11 @@ /*-- formerly in smime.h --*/ WHERE char *SmimeDefaultKey; ---- a/init.h -+++ b/init.h -@@ -2556,6 +2556,18 @@ +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:35:48.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:36:22.000000000 +0200 +@@ -2541,6 +2541,18 @@ ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ @@ -32,10 +36,12 @@ ---- a/pgp.c -+++ b/pgp.c -@@ -1129,6 +1129,8 @@ - t->disposition = DISPNONE; +Index: mutt/pgp.c +=================================================================== +--- mutt.orig/pgp.c 2009-06-25 12:35:36.000000000 +0200 ++++ mutt/pgp.c 2009-06-25 12:36:22.000000000 +0200 +@@ -1131,6 +1131,8 @@ + t->disposition = DISPINLINE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); diff -Nru mutt-1.5.21/debian/patches/misc/exchange-2010-imap-chunk.patch mutt-1.5.20/debian/patches/misc/exchange-2010-imap-chunk.patch --- mutt-1.5.21/debian/patches/misc/exchange-2010-imap-chunk.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/misc/exchange-2010-imap-chunk.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,21 @@ +Recent Exchange servers (2007+) will sometimes omit FETCH responses when Mutt +requests "FETCH 1:n" where "n" is some largish (~2000) number. This causes Mutt +to hang because it expects the server to return all FETCH responses. + +http://dev.mutt.org/trac/ticket/3459 + +--- a/imap/message.c 2010-10-03 17:55:58.000000000 +0200 ++++ b/imap/message.c 2010-10-03 17:54:51.000000000 +0200 +@@ -240,7 +240,11 @@ + if (msgno + 1 > fetchlast) + { + fetchlast = msgend + 1; +- ++ /* Microsoft Exchange 2010 violates the IMAP protocol and ++ * starts omitting messages if one FETCHes more than 2047 (or ++ * or somewhere around that number. We therefore split the ++ * FETCH into chunks of 2000 messages each */ ++ if (fetchlast - msgno - 1 > 2000) fetchlast = msgno+1 + 2000; + snprintf (buf, sizeof (buf), + "FETCH %d:%d (UID FLAGS INTERNALDATE RFC822.SIZE %s)", msgno + 1, + fetchlast, hdrreq); diff -Nru mutt-1.5.21/debian/patches/mutt-patched/sidebar mutt-1.5.20/debian/patches/mutt-patched/sidebar --- mutt-1.5.21/debian/patches/mutt-patched/sidebar 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/mutt-patched/sidebar 2011-02-14 17:04:53.000000000 +0000 @@ -29,133 +29,154 @@ - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do not need (Makefile.in). ---- a/buffy.c -+++ b/buffy.c -@@ -312,6 +312,10 @@ - return 0; - } - -+ mailbox->msgcount = 0; -+ mailbox->msg_unread = 0; -+ mailbox->msg_flagged = 0; -+ - while ((de = readdir (dirp)) != NULL) - { - if (*de->d_name == '.') -@@ -329,7 +333,9 @@ - continue; - } - /* one new and undeleted message is enough */ -- mailbox->new = 1; -+ mailbox->has_new = mailbox->new = 1; -+ mailbox->msgcount++; -+ mailbox->msg_unread++; - rc = 1; - break; - } -@@ -337,6 +343,32 @@ - - closedir (dirp); - -+ /* -+ * count read messages (for folderlist (sidebar) we also need to count -+ * messages in cur so that we the total number of messages -+ */ -+ snprintf (path, sizeof (path), "%s/cur", mailbox->path); -+ if ((dirp = opendir (path)) == NULL) -+ { -+ mailbox->magic = 0; -+ } -+ while ((de = readdir (dirp)) != NULL) -+ { -+ char *p; -+ if (*de->d_name != '.') { -+ if ((p = strstr (de->d_name, ":2,"))) { -+ if (!strchr (p + 3, 'T')) { -+ mailbox->msgcount++; -+ if ( !strchr (p + 3, 'S')) -+ mailbox->msg_unread++; -+ if (strchr(p + 3, 'F')) -+ mailbox->msg_flagged++; -+ } -+ } else -+ mailbox->msgcount++; -+ } -+ } -+ - return rc; - } - -@@ -345,14 +377,33 @@ - { - int rc = 0; - int statcheck; +Index: mutt/buffy.c +=================================================================== +--- mutt.orig/buffy.c 2009-06-25 12:36:44.000000000 +0200 ++++ mutt/buffy.c 2009-06-25 12:36:53.000000000 +0200 +@@ -289,6 +289,7 @@ + char path[_POSIX_PATH_MAX]; + struct stat contex_sb; + time_t t; + CONTEXT *ctx; - if (option (OPTCHECKMBOXSIZE)) - statcheck = sb->st_size > mailbox->size; - else - statcheck = sb->st_mtime > sb->st_atime - || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); -- if (statcheck) -+ if (statcheck || mailbox->msgcount == 0) + sb.st_size=0; + contex_sb.st_dev=0; +@@ -328,6 +329,8 @@ + + for (tmp = Incoming; tmp; tmp = tmp->next) { -+ BUFFY b = *mailbox; ++ if ( tmp->new == 1 ) ++ tmp->has_new = 1; + #ifdef USE_IMAP + if (tmp->magic != M_IMAP) + #endif +@@ -384,10 +387,27 @@ + case M_MBOX: + case M_MMDF: + +- if (STAT_CHECK) ++ { ++ if (STAT_CHECK || tmp->msgcount == 0) + { +- BuffyCount++; +- tmp->new = 1; ++ BUFFY b = *tmp; + int msgcount = 0; + int msg_unread = 0; + /* parse the mailbox, to see how much mail there is */ -+ ctx = mx_open_mailbox( mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); ++ ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); + if(ctx) + { -+ msgcount = ctx->msgcount; ++ msgcount = ctx->msgcount; + msg_unread = ctx->unread; + mx_close_mailbox(ctx, 0); + } -+ *mailbox = b; -+ mailbox->msgcount = msgcount; -+ mailbox->msg_unread = msg_unread; -+ if(statcheck) -+ { -+ mailbox->has_new = mailbox->new = 1; -+ } - if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) - { - rc = 1; -@@ -374,9 +425,11 @@ - int mutt_buffy_check (int force) - { - BUFFY *tmp; -+ struct dirent *de, *dp; - struct stat sb; - struct stat contex_sb; - time_t t; -+ CONTEXT *ctx; ++ *tmp = b; ++ tmp->msgcount = msgcount; ++ tmp->msg_unread = msg_unread; ++ if(STAT_CHECK) { ++ tmp->has_new = tmp->new = 1; ++ BuffyCount++; ++ } + } + else if (option(OPTCHECKMBOXSIZE)) + { +@@ -397,35 +417,86 @@ + if (tmp->newly_created && + (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) + tmp->newly_created = 0; +- ++ } + break; + + case M_MAILDIR: + ++ /* count new message */ + snprintf (path, sizeof (path), "%s/new", tmp->path); + if ((dirp = opendir (path)) == NULL) + { + tmp->magic = 0; + break; + } ++ tmp->msgcount = 0; ++ tmp->msg_unread = 0; ++ tmp->msg_flagged = 0; + while ((de = readdir (dirp)) != NULL) + { + char *p; + if (*de->d_name != '.' && + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { +- /* one new and undeleted message is enough */ +- BuffyCount++; +- tmp->new = 1; +- break; ++ tmp->has_new = tmp->new = 1; ++ tmp->msgcount++; ++ tmp->msg_unread++; ++ } ++ } ++ if(tmp->msg_unread) ++ BuffyCount++; ++ ++ closedir (dirp); ++ ++ /* ++ * count read messages (for folderlist (sidebar) we also need to count ++ * messages in cur so that we the total number of messages ++ */ ++ snprintf (path, sizeof (path), "%s/cur", tmp->path); ++ if ((dirp = opendir (path)) == NULL) ++ { ++ tmp->magic = 0; ++ break; ++ } ++ while ((de = readdir (dirp)) != NULL) ++ { ++ char *p; ++ if (*de->d_name != '.') { ++ if ((p = strstr (de->d_name, ":2,"))) { ++ if (!strchr (p + 3, 'T')) { ++ tmp->msgcount++; ++ if ( !strchr (p + 3, 'S')) ++ tmp->msg_unread++; ++ if (strchr(p + 3, 'F')) ++ tmp->msg_flagged++; ++ } ++ } else ++ tmp->msgcount++; + } + } + closedir (dirp); + break; - sb.st_size=0; - contex_sb.st_dev=0; -@@ -456,6 +509,20 @@ case M_MH: ++ { ++ DIR *dp; ++ struct dirent *de; if ((tmp->new = mh_buffy (tmp->path)) > 0) BuffyCount++; + -+ if ((dp = opendir (tmp->path)) == NULL) -+ break; -+ tmp->msgcount = 0; -+ while ((de = readdir (dp))) -+ { -+ if (mh_valid_message (de->d_name)) -+ { -+ tmp->msgcount++; -+ tmp->has_new = tmp->new = 1; -+ } -+ } -+ closedir (dp); -+ ++ if ((dp = opendir (path)) == NULL) ++ break; ++ tmp->msgcount = 0; ++ while ((de = readdir (dp))) ++ { ++ if (mh_valid_message (de->d_name)) ++ { ++ tmp->msgcount++; ++ tmp->has_new = tmp->new = 1; ++ } ++ } ++ closedir (dp); ++ } break; } } ---- a/buffy.h -+++ b/buffy.h +Index: mutt/buffy.h +=================================================================== +--- mutt.orig/buffy.h 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/buffy.h 2009-06-25 12:36:53.000000000 +0200 @@ -25,7 +25,12 @@ char path[_POSIX_PATH_MAX]; off_t size; @@ -169,8 +190,10 @@ short notified; /* user has been notified */ short magic; /* mailbox type */ short newly_created; /* mbox or mmdf just popped into existence */ ---- a/color.c -+++ b/color.c +Index: mutt/color.c +=================================================================== +--- mutt.orig/color.c 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/color.c 2009-06-25 12:36:53.000000000 +0200 @@ -93,6 +93,8 @@ { "bold", MT_COLOR_BOLD }, { "underline", MT_COLOR_UNDERLINE }, @@ -180,8 +203,10 @@ { NULL, 0 } }; ---- a/compose.c -+++ b/compose.c +Index: mutt/compose.c +=================================================================== +--- mutt.orig/compose.c 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/compose.c 2009-06-25 12:36:53.000000000 +0200 @@ -72,7 +72,7 @@ #define HDR_XOFFSET 10 @@ -191,25 +216,38 @@ static char *Prompts[] = { -@@ -112,7 +112,7 @@ - { - int off = 0; - -- mvaddstr (HDR_CRYPT, 0, "Security: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); - - if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) - { -@@ -144,7 +144,7 @@ +@@ -115,16 +115,16 @@ + if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) + { + if (!msg->security) +- mvaddstr (HDR_CRYPT, 0, "Security: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); + else if (msg->security & APPLICATION_SMIME) +- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); + else if (msg->security & APPLICATION_PGP) +- mvaddstr (HDR_CRYPT, 0, " PGP: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); } + else if ((WithCrypto & APPLICATION_SMIME)) +- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); + else if ((WithCrypto & APPLICATION_PGP)) +- mvaddstr (HDR_CRYPT, 0, " PGP: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); + else + return; +@@ -148,7 +148,7 @@ + } clrtoeol (); + - move (HDR_CRYPTINFO, 0); + move (HDR_CRYPTINFO, SidebarWidth); clrtoeol (); - if ((WithCrypto & APPLICATION_PGP) -@@ -161,7 +161,7 @@ + && msg->security & APPLICATION_PGP && msg->security & SIGN) +@@ -164,7 +164,7 @@ && (msg->security & ENCRYPT) && SmimeCryptAlg && *SmimeCryptAlg) { @@ -218,7 +256,7 @@ NONULL(SmimeCryptAlg)); off = 20; } -@@ -175,7 +175,7 @@ +@@ -178,7 +178,7 @@ int c; char *t; @@ -227,7 +265,7 @@ if (!chain) { -@@ -190,7 +190,7 @@ +@@ -193,7 +193,7 @@ if (t && t[0] == '0' && t[1] == '\0') t = ""; @@ -236,7 +274,7 @@ break; addstr (NONULL(t)); -@@ -242,7 +242,7 @@ +@@ -245,7 +245,7 @@ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), addr, 1); @@ -245,7 +283,7 @@ mutt_paddstr (W, buf); } -@@ -252,10 +252,10 @@ +@@ -255,10 +255,10 @@ draw_envelope_addr (HDR_TO, msg->env->to); draw_envelope_addr (HDR_CC, msg->env->cc); draw_envelope_addr (HDR_BCC, msg->env->bcc); @@ -258,7 +296,7 @@ mutt_paddstr (W, fcc); if (WithCrypto) -@@ -266,7 +266,7 @@ +@@ -269,7 +269,7 @@ #endif SETCOLOR (MT_COLOR_STATUS); @@ -267,7 +305,7 @@ BKGDSET (MT_COLOR_STATUS); clrtoeol (); -@@ -304,7 +304,7 @@ +@@ -307,7 +307,7 @@ /* redraw the expanded list so the user can see the result */ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), *addr, 1); @@ -276,7 +314,7 @@ mutt_paddstr (W, buf); return 0; -@@ -549,7 +549,7 @@ +@@ -552,7 +552,7 @@ if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { mutt_str_replace (&msg->env->subject, buf); @@ -285,7 +323,7 @@ clrtoeol (); if (msg->env->subject) mutt_paddstr (W, msg->env->subject); -@@ -566,7 +566,7 @@ +@@ -569,7 +569,7 @@ { strfcpy (fcc, buf, fcclen); mutt_pretty_mailbox (fcc, fcclen); @@ -294,8 +332,10 @@ mutt_paddstr (W, fcc); fccSet = 1; } ---- a/curs_main.c -+++ b/curs_main.c +Index: mutt/curs_main.c +=================================================================== +--- mutt.orig/curs_main.c 2009-06-25 12:36:26.000000000 +0200 ++++ mutt/curs_main.c 2009-06-25 12:36:53.000000000 +0200 @@ -26,7 +26,9 @@ #include "mailbox.h" #include "mapping.h" @@ -306,7 +346,7 @@ #ifdef USE_POP #include "pop.h" -@@ -532,8 +534,12 @@ +@@ -536,8 +538,12 @@ menu->redraw |= REDRAW_STATUS; if (do_buffy_notify) { @@ -321,7 +361,7 @@ } else do_buffy_notify = 1; -@@ -545,6 +551,7 @@ +@@ -549,6 +555,7 @@ if (menu->redraw & REDRAW_FULL) { menu_redraw_full (menu); @@ -329,7 +369,7 @@ mutt_show_error (); } -@@ -567,10 +574,13 @@ +@@ -571,10 +578,13 @@ if (menu->redraw & REDRAW_STATUS) { @@ -343,7 +383,7 @@ mutt_paddstr (COLS, buf); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -@@ -591,7 +601,7 @@ +@@ -595,7 +605,7 @@ menu->oldcurrent = -1; if (option (OPTARROWCURSOR)) @@ -352,7 +392,7 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else -@@ -1089,6 +1099,7 @@ +@@ -1075,6 +1085,7 @@ menu->redraw = REDRAW_FULL; break; @@ -360,7 +400,7 @@ case OP_MAIN_CHANGE_FOLDER: case OP_MAIN_NEXT_UNREAD_MAILBOX: -@@ -1120,7 +1131,11 @@ +@@ -1106,7 +1117,11 @@ { mutt_buffy (buf, sizeof (buf)); @@ -373,7 +413,7 @@ { if (menu->menu == MENU_PAGER) { -@@ -1138,6 +1153,7 @@ +@@ -1124,6 +1139,7 @@ } mutt_expand_path (buf, sizeof (buf)); @@ -381,7 +421,7 @@ if (mx_get_magic (buf) <= 0) { mutt_error (_("%s is not a mailbox."), buf); -@@ -2241,6 +2257,12 @@ +@@ -2216,6 +2232,12 @@ mutt_what_key(); break; @@ -394,8 +434,10 @@ default: if (menu->menu == MENU_MAIN) km_error_key (MENU_MAIN); ---- a/flags.c -+++ b/flags.c +Index: mutt/flags.c +=================================================================== +--- mutt.orig/flags.c 2009-06-25 12:36:14.000000000 +0200 ++++ mutt/flags.c 2009-06-25 12:36:53.000000000 +0200 @@ -22,8 +22,10 @@ #include "mutt.h" @@ -415,9 +457,11 @@ } void mutt_tag_set_flag (int flag, int bf) ---- a/functions.h -+++ b/functions.h -@@ -170,6 +170,11 @@ +Index: mutt/functions.h +=================================================================== +--- mutt.orig/functions.h 2009-06-25 12:36:35.000000000 +0200 ++++ mutt/functions.h 2009-06-25 12:36:53.000000000 +0200 +@@ -169,6 +169,11 @@ { "decrypt-save", OP_DECRYPT_SAVE, NULL }, @@ -429,7 +473,7 @@ { NULL, 0, NULL } }; -@@ -274,6 +279,11 @@ +@@ -270,6 +275,11 @@ { "what-key", OP_WHAT_KEY, NULL }, @@ -441,8 +485,10 @@ { NULL, 0, NULL } }; ---- a/globals.h -+++ b/globals.h +Index: mutt/globals.h +=================================================================== +--- mutt.orig/globals.h 2009-06-25 12:36:22.000000000 +0200 ++++ mutt/globals.h 2009-06-25 12:36:53.000000000 +0200 @@ -117,6 +117,7 @@ WHERE char *SendCharset; WHERE char *Sendmail; @@ -451,7 +497,7 @@ WHERE char *Signature; WHERE char *SimpleSearch; #if USE_SMTP -@@ -210,6 +211,9 @@ +@@ -209,6 +210,9 @@ WHERE short ScoreThresholdRead; WHERE short ScoreThresholdFlag; @@ -461,9 +507,11 @@ #ifdef USE_IMAP WHERE short ImapKeepalive; WHERE short ImapPipelineDepth; ---- a/init.h -+++ b/init.h -@@ -1965,6 +1965,22 @@ +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:36:40.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:36:53.000000000 +0200 +@@ -1953,6 +1953,22 @@ ** not used. ** (PGP only) */ @@ -486,8 +534,10 @@ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, /* ** .pp ---- a/mailbox.h -+++ b/mailbox.h +Index: mutt/mailbox.h +=================================================================== +--- mutt.orig/mailbox.h 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/mailbox.h 2009-06-25 12:36:53.000000000 +0200 @@ -27,6 +27,7 @@ #define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses * safe_fopen() for mbox-style folders. @@ -496,20 +546,24 @@ /* mx_open_new_message() */ #define M_ADD_FROM 1 /* add a From_ line */ ---- a/Makefile.am -+++ b/Makefile.am -@@ -33,7 +33,8 @@ +Index: mutt/Makefile.am +=================================================================== +--- mutt.orig/Makefile.am 2009-06-25 12:36:26.000000000 +0200 ++++ mutt/Makefile.am 2009-06-25 12:36:53.000000000 +0200 +@@ -29,7 +29,8 @@ score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ muttlib.c editmsg.c mbyte.c \ -- url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c -+ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \ -+ sidebar.c +- url.c ascii.c crypt-mod.c crypt-mod.h ++ url.c ascii.c crypt-mod.c crypt-mod.h \ ++ sidebar.c nodist_mutt_SOURCES = $(BUILT_SOURCES) ---- a/mbox.c -+++ b/mbox.c +Index: mutt/mbox.c +=================================================================== +--- mutt.orig/mbox.c 2009-06-25 12:36:45.000000000 +0200 ++++ mutt/mbox.c 2009-06-25 12:36:53.000000000 +0200 @@ -104,6 +104,7 @@ mutt_perror (ctx->path); return (-1); @@ -518,7 +572,7 @@ ctx->mtime = sb.st_mtime; ctx->size = sb.st_size; -@@ -255,6 +256,7 @@ +@@ -259,6 +260,7 @@ ctx->size = sb.st_size; ctx->mtime = sb.st_mtime; @@ -526,8 +580,10 @@ #ifdef NFS_ATTRIBUTE_HACK if (sb.st_mtime > sb.st_atime) ---- a/menu.c -+++ b/menu.c +Index: mutt/menu.c +=================================================================== +--- mutt.orig/menu.c 2009-06-25 12:36:19.000000000 +0200 ++++ mutt/menu.c 2009-06-25 12:36:53.000000000 +0200 @@ -24,6 +24,7 @@ #include "mutt_curses.h" #include "mutt_menu.h" @@ -622,7 +678,7 @@ menu_make_entry (buf, sizeof (buf), menu, menu->current); menu_pad_string (buf, sizeof (buf)); -@@ -884,7 +886,7 @@ +@@ -885,7 +887,7 @@ if (option (OPTARROWCURSOR)) @@ -631,8 +687,10 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else ---- a/mutt_curses.h -+++ b/mutt_curses.h +Index: mutt/mutt_curses.h +=================================================================== +--- mutt.orig/mutt_curses.h 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/mutt_curses.h 2009-06-25 12:36:53.000000000 +0200 @@ -64,6 +64,7 @@ #undef lines #endif /* lines */ @@ -650,9 +708,11 @@ MT_COLOR_MAX }; ---- a/mutt.h -+++ b/mutt.h -@@ -431,6 +431,7 @@ +Index: mutt/mutt.h +=================================================================== +--- mutt.orig/mutt.h 2009-06-25 12:36:26.000000000 +0200 ++++ mutt/mutt.h 2009-06-25 12:36:53.000000000 +0200 +@@ -425,6 +425,7 @@ OPTSAVEEMPTY, OPTSAVENAME, OPTSCORE, @@ -660,7 +720,7 @@ OPTSIGDASHES, OPTSIGONTOP, OPTSORTRE, -@@ -874,6 +875,7 @@ +@@ -864,6 +865,7 @@ { char *path; FILE *fp; @@ -668,7 +728,7 @@ time_t mtime; off_t size; off_t vsize; -@@ -914,6 +916,7 @@ +@@ -904,6 +906,7 @@ unsigned int quiet : 1; /* inhibit status messages? */ unsigned int collapsed : 1; /* are all threads collapsed? */ unsigned int closing : 1; /* mailbox is being closed */ @@ -676,9 +736,11 @@ /* driver hooks */ void *data; /* driver specific data */ ---- a/muttlib.c -+++ b/muttlib.c -@@ -1286,6 +1286,8 @@ +Index: mutt/muttlib.c +=================================================================== +--- mutt.orig/muttlib.c 2009-06-25 12:35:48.000000000 +0200 ++++ mutt/muttlib.c 2009-06-25 12:36:53.000000000 +0200 +@@ -1232,6 +1232,8 @@ pl = pw = 1; /* see if there's room to add content, else ignore */ @@ -687,7 +749,7 @@ if ((col < COLS && wlen < destlen) || soft) { int pad; -@@ -1329,6 +1331,52 @@ +@@ -1274,6 +1276,52 @@ col += wid; src += pl; } @@ -740,8 +802,10 @@ break; /* skip rest of input */ } else if (ch == '|') ---- a/mx.c -+++ b/mx.c +Index: mutt/mx.c +=================================================================== +--- mutt.orig/mx.c 2009-06-25 12:36:45.000000000 +0200 ++++ mutt/mx.c 2009-06-25 12:36:53.000000000 +0200 @@ -595,6 +595,7 @@ * M_APPEND open mailbox for appending * M_READONLY open mailbox in read-only mode @@ -779,11 +843,13 @@ + } +#endif - /* never announce that a mailbox we've just left has new mail. #3290 - * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */ ---- a/OPS -+++ b/OPS -@@ -180,3 +180,8 @@ + if (ctx->mx_close) + ctx->mx_close (ctx); +Index: mutt/OPS +=================================================================== +--- mutt.orig/OPS 2009-06-25 12:36:14.000000000 +0200 ++++ mutt/OPS 2009-06-25 12:36:53.000000000 +0200 +@@ -179,3 +179,8 @@ OP_MAIN_SHOW_LIMIT "show currently active limit pattern" OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread" OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads" @@ -792,8 +858,10 @@ +OP_SIDEBAR_NEXT "go down to next mailbox" +OP_SIDEBAR_PREV "go to previous mailbox" +OP_SIDEBAR_OPEN "open hilighted mailbox" ---- a/pager.c -+++ b/pager.c +Index: mutt/pager.c +=================================================================== +--- mutt.orig/pager.c 2009-06-25 12:36:14.000000000 +0200 ++++ mutt/pager.c 2009-06-25 12:36:53.000000000 +0200 @@ -29,6 +29,7 @@ #include "pager.h" #include "attach.h" @@ -802,15 +870,16 @@ #include "mutt_crypt.h" -@@ -1099,6 +1100,7 @@ - if (check_attachment_marker ((char *)buf) == 0) - wrap_cols = COLS; +@@ -1071,6 +1072,8 @@ + mbstate_t mbstate; + int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap); ++ + wrap_cols -= SidebarWidth; + /* FIXME: this should come from lineInfo */ memset(&mbstate, 0, sizeof(mbstate)); - -@@ -1745,7 +1747,7 @@ +@@ -1717,7 +1720,7 @@ if ((redraw & REDRAW_BODY) || topline != oldtopline) { do { @@ -819,7 +888,7 @@ curline = oldtopline = topline; lines = 0; force_redraw = 0; -@@ -1758,6 +1760,7 @@ +@@ -1730,6 +1733,7 @@ &QuoteList, &q_level, &force_redraw, &SearchRE) > 0) lines++; curline++; @@ -827,7 +896,7 @@ } last_offset = lineInfo[curline].offset; } while (force_redraw); -@@ -1771,6 +1774,7 @@ +@@ -1743,6 +1747,7 @@ addch ('~'); addch ('\n'); lines++; @@ -835,7 +904,7 @@ } /* We are going to update the pager status bar, so it isn't * necessary to reset to normal color now. */ -@@ -1794,11 +1798,11 @@ +@@ -1766,11 +1771,11 @@ /* print out the pager status bar */ SETCOLOR (MT_COLOR_STATUS); BKGDSET (MT_COLOR_STATUS); @@ -849,7 +918,7 @@ size_t l2 = sizeof (buffer); hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr; mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT); -@@ -1808,7 +1812,7 @@ +@@ -1780,7 +1785,7 @@ { char bn[STRING]; snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str); @@ -858,7 +927,7 @@ } BKGDSET (MT_COLOR_NORMAL); SETCOLOR (MT_COLOR_NORMAL); -@@ -1826,18 +1830,23 @@ +@@ -1798,18 +1803,23 @@ /* redraw the pager_index indicator, because the * flags for this message might have changed. */ menu_redraw_current (index); @@ -884,7 +953,7 @@ redraw = 0; if (option(OPTBRAILLEFRIENDLY)) { -@@ -2769,6 +2778,13 @@ +@@ -2742,6 +2752,13 @@ mutt_what_key (); break; @@ -898,8 +967,10 @@ default: ch = -1; break; ---- /dev/null -+++ b/sidebar.c +Index: mutt/sidebar.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mutt/sidebar.c 2009-06-25 12:36:53.000000000 +0200 @@ -0,0 +1,333 @@ +/* + * Copyright (C) ????-2004 Justin Hibbits @@ -1234,8 +1305,10 @@ + draw_sidebar(menu); +} + ---- /dev/null -+++ b/sidebar.h +Index: mutt/sidebar.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mutt/sidebar.h 2009-06-25 12:36:53.000000000 +0200 @@ -0,0 +1,36 @@ +/* + * Copyright (C) ????-2004 Justin Hibbits @@ -1273,8 +1346,10 @@ +void set_buffystats(CONTEXT*); + +#endif /* SIDEBAR_H */ ---- a/doc/Muttrc -+++ b/doc/Muttrc +Index: mutt/doc/Muttrc +=================================================================== +--- mutt.orig/doc/Muttrc 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/doc/Muttrc 2009-06-25 12:36:53.000000000 +0200 @@ -657,6 +657,26 @@ # $crypt_autosign, $crypt_replysign and $smime_is_default. # @@ -1302,8 +1377,10 @@ # set crypt_autosign=no # # Name: crypt_autosign ---- a/imap/imap.c -+++ b/imap/imap.c +Index: mutt/imap/imap.c +=================================================================== +--- mutt.orig/imap/imap.c 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/imap/imap.c 2009-06-25 12:36:53.000000000 +0200 @@ -1521,7 +1521,7 @@ imap_munge_mbox_name (munged, sizeof (munged), name); @@ -1313,9 +1390,11 @@ if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0) { ---- a/imap/command.c -+++ b/imap/command.c -@@ -1011,6 +1011,13 @@ +Index: mutt/imap/command.c +=================================================================== +--- mutt.orig/imap/command.c 2009-06-24 19:37:58.000000000 +0200 ++++ mutt/imap/command.c 2009-06-25 12:36:53.000000000 +0200 +@@ -1009,6 +1009,13 @@ opened */ status->uidnext = oldun; diff -Nru mutt-1.5.21/debian/patches/mutt-patched/sidebar-dotted mutt-1.5.20/debian/patches/mutt-patched/sidebar-dotted --- mutt-1.5.21/debian/patches/mutt-patched/sidebar-dotted 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/mutt-patched/sidebar-dotted 2011-02-14 17:04:53.000000000 +0000 @@ -9,8 +9,10 @@ I hope, it's usefull for someone ;) ---- a/sidebar.c -+++ b/sidebar.c +Index: mutt/sidebar.c +=================================================================== +--- mutt.orig/sidebar.c 2009-06-25 12:36:53.000000000 +0200 ++++ mutt/sidebar.c 2009-06-25 12:36:59.000000000 +0200 @@ -255,14 +255,23 @@ int i; tmp_folder_name = tmp->path + strlen(Maildir); @@ -38,9 +40,11 @@ } } printw( "%.*s", SidebarWidth - delim_len + 1, ---- a/init.h -+++ b/init.h -@@ -1981,6 +1981,11 @@ +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:36:53.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:36:59.000000000 +0200 +@@ -1969,6 +1969,11 @@ ** .pp ** The width of the sidebar. */ @@ -52,9 +56,11 @@ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, /* ** .pp ---- a/mutt.h -+++ b/mutt.h -@@ -432,6 +432,7 @@ +Index: mutt/mutt.h +=================================================================== +--- mutt.orig/mutt.h 2009-06-25 12:36:53.000000000 +0200 ++++ mutt/mutt.h 2009-06-25 12:36:59.000000000 +0200 +@@ -426,6 +426,7 @@ OPTSAVENAME, OPTSCORE, OPTSIDEBAR, diff -Nru mutt-1.5.21/debian/patches/mutt-patched/sidebar-sorted mutt-1.5.20/debian/patches/mutt-patched/sidebar-sorted --- mutt-1.5.21/debian/patches/mutt-patched/sidebar-sorted 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/mutt-patched/sidebar-sorted 2011-02-14 17:04:53.000000000 +0000 @@ -11,8 +11,10 @@ PS: This has to be applied ontop of my sidebar-dotted patch, but it should be easy to adopt it to a vanilla mutt. ---- a/sidebar.c -+++ b/sidebar.c +Index: mutt/sidebar.c +=================================================================== +--- mutt.orig/sidebar.c 2009-06-25 12:36:59.000000000 +0200 ++++ mutt/sidebar.c 2009-06-25 12:37:03.000000000 +0200 @@ -54,6 +54,35 @@ for ( ; tmp->next != 0; tmp = tmp->next ) tmp->next->prev = tmp; @@ -49,9 +51,11 @@ if ( TopBuffy == 0 && BottomBuffy == 0 ) TopBuffy = Incoming; if ( BottomBuffy == 0 ) { ---- a/init.h -+++ b/init.h -@@ -1986,6 +1986,11 @@ +Index: mutt/init.h +=================================================================== +--- mutt.orig/init.h 2009-06-25 12:36:59.000000000 +0200 ++++ mutt/init.h 2009-06-25 12:37:03.000000000 +0200 +@@ -1974,6 +1974,11 @@ ** .pp ** Should the sidebar shorten the path showed. */ @@ -63,9 +67,11 @@ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, /* ** .pp ---- a/mutt.h -+++ b/mutt.h -@@ -433,6 +433,7 @@ +Index: mutt/mutt.h +=================================================================== +--- mutt.orig/mutt.h 2009-06-25 12:36:59.000000000 +0200 ++++ mutt/mutt.h 2009-06-25 12:37:03.000000000 +0200 +@@ -427,6 +427,7 @@ OPTSCORE, OPTSIDEBAR, OPTSIDEBARSHORTPATH, diff -Nru mutt-1.5.21/debian/patches/series mutt-1.5.20/debian/patches/series --- mutt-1.5.21/debian/patches/series 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/series 2011-02-14 17:04:53.000000000 +0000 @@ -1,12 +1,13 @@ # build system patches misc/am-maintainer-mode +misc/hg.pmdef.debugtime +debian-specific/build_doc_adjustments.diff # features features/ifdef features/xtitles features/trash-folder features/purge-message -features/imap_fast_trash features/sensible_browser_position features-old/patch-1.5.4.vk.pgp_verbose_mime features/compressed-folders @@ -21,35 +22,53 @@ debian-specific/document_debian_defaults debian-specific/assumed_charset-compat debian-specific/467432-write_bcc.patch -debian-specific/566076-build_doc_adjustments.patch misc/define-pgp_getkeys_command.diff misc/gpg.rc-paths misc/smime.rc # patches integrated from upstream mercurial # drop them with a new upstream release +upstream/533209-mutt_perror.patch +upstream/533459-unmailboxes.patch +upstream/533439-mbox-time.patch upstream/531430-imapuser.patch +upstream/534543-imap-port.patch +upstream/538128-mh-folder-access.patch upstream/537818-emptycharset.patch +upstream/535096-pop-port.patch +upstream/542910-search-segfault.patch +upstream/533370-pgp-inline.patch +upstream/533520-signature-highlight.patch +upstream/393926-internal-viewer.patch upstream/543467-thread-segfault.patch +upstream/544180-italian-yesorno.patch upstream/542817-smimekeys-tmpdir.patch +upstream/544794-smtp-batch.patch upstream/537694-segv-imap-headers.patch upstream/548577-gpgme-1.2.patch +upstream/548494-swedish-intl.patch upstream/553321-ansi-escape-segfault.patch +upstream/553238-german-intl.patch +upstream/557395-muttrc-crypto.patch +upstream/545316-header-color.patch upstream/568295-references.patch upstream/547980-smime_keys-chaining.patch upstream/528233-readonly-open.patch upstream/228671-pipe-mime.patch upstream/383769-score-match.patch -upstream/578087-header-strchr.patch - -upstream/603288-split-fetches.patch -upstream/537061-dont-recode-saved-attachments.patch -upstream/608706-fix-spelling-errors.patch +upstream/547739-manual-typos.patch +upstream/311296-rand-mktemp.patch +upstream/573823-imap_internal_date +upstream/542344-dont_fold_From_ upstream/path_max - -# Ubuntu cherry-pick from upstream -ubuntu/lp-693244-autoview +misc/hyphen-as-minus.patch +#misc/manpage-typos.patch +misc/smime_keys-manpage.patch + +# Mutt hangs when opening large IMAP mailboxes on an Exchange Server +# http://dev.mutt.org/trac/ticket/3459 +misc/exchange-2010-imap-chunk.patch mutt.org # extra patches for mutt-patched diff -Nru mutt-1.5.21/debian/patches/ubuntu/lp-693244-autoview mutt-1.5.20/debian/patches/ubuntu/lp-693244-autoview --- mutt-1.5.21/debian/patches/ubuntu/lp-693244-autoview 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/ubuntu/lp-693244-autoview 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- a/muttlib.c -+++ b/muttlib.c -@@ -658,6 +658,9 @@ - switch (m->type) - { - case TYPETEXT: -+ if (!ascii_strcasecmp ("html", m->subtype)) -+ return 1; -+ - /* we can display any text, overridable by auto_view */ - return 0; - break; diff -Nru mutt-1.5.21/debian/patches/upstream/228671-pipe-mime.patch mutt-1.5.20/debian/patches/upstream/228671-pipe-mime.patch --- mutt-1.5.21/debian/patches/upstream/228671-pipe-mime.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/228671-pipe-mime.patch 2011-02-14 17:04:53.000000000 +0000 @@ -6,7 +6,7 @@ --- a/imap/message.c +++ b/imap/message.c -@@ -398,7 +398,7 @@ +@@ -392,7 +392,7 @@ int imap_fetch_message (MESSAGE *msg, CO char path[_POSIX_PATH_MAX]; char *pc; long bytes; @@ -15,7 +15,7 @@ int uid; int cacheno; IMAP_CACHE *cache; -@@ -495,9 +495,15 @@ +@@ -489,9 +489,15 @@ int imap_fetch_message (MESSAGE *msg, CO imap_error ("imap_fetch_message()", buf); goto bail; } diff -Nru mutt-1.5.21/debian/patches/upstream/311296-rand-mktemp.patch mutt-1.5.20/debian/patches/upstream/311296-rand-mktemp.patch --- mutt-1.5.21/debian/patches/upstream/311296-rand-mktemp.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/311296-rand-mktemp.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,19 @@ +More random file creation in /tmp to prevent DOS, see CVE CAN-2005-2351 and +upstream http://bugs.mutt.org/3158 + +--- a/muttlib.c ++++ b/muttlib.c +@@ -748,7 +748,12 @@ + + void _mutt_mktemp (char *s, const char *src, int line) + { +- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getuid(), (int) getpid (), Counter++); ++ long sek; ++ ++ time(&sek); ++ srand(sek); ++ snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d-%d%x%x", NONULL (Tempdir), NONULL(Hostname), (int) getuid(), (int) getpid (), ++ Counter++, (unsigned int) rand(), (unsigned int) rand()); + dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); + unlink (s); + } diff -Nru mutt-1.5.21/debian/patches/upstream/350957-postponed-to-bcc.patch mutt-1.5.20/debian/patches/upstream/350957-postponed-to-bcc.patch --- mutt-1.5.21/debian/patches/upstream/350957-postponed-to-bcc.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/350957-postponed-to-bcc.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,15 @@ +For %F, display Bcc recipient if no other recipients found. +Closes http://bugs.mutt.org/3157 +See also http://bugs.debian.org/350957 + +--- a/hdrline.c ++++ b/hdrline.c +@@ -121,6 +121,8 @@ + snprintf (buf, len, "To %s", mutt_get_name (hdr->to)); + else if (me && hdr->cc) + snprintf (buf, len, "Cc %s", mutt_get_name (hdr->cc)); ++ else if (me && hdr->bcc) ++ snprintf (buf, len, "Bcc %s", mutt_get_name (hdr->bcc)); + else if (hdr->from) + strfcpy (buf, mutt_get_name (hdr->from), len); + else diff -Nru mutt-1.5.21/debian/patches/upstream/375530-index-weirdness.patch mutt-1.5.20/debian/patches/upstream/375530-index-weirdness.patch --- mutt-1.5.21/debian/patches/upstream/375530-index-weirdness.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/375530-index-weirdness.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,34 @@ +Actually reopen mbox/mmdf files in case we find modifications. Closes +http://bugs.mutt.org/2725. + +Since the file is changed while we have it open in ctx->fp, we likely +get wrong information when parsing the mailbox. Now we explicitely close +and (re)open it. + +See http://bugs.debian.org/375530 for more info + +--- a/mbox.c ++++ b/mbox.c +@@ -1119,17 +1119,13 @@ + { + case M_MBOX: + case M_MMDF: +- if (fseek (ctx->fp, 0, SEEK_SET) != 0) +- { +- dprint (1, (debugfile, "mutt_reopen_mailbox: fseek() failed\n")); ++ cmp_headers = mbox_strict_cmp_headers; ++ safe_fclose (&ctx->fp); ++ if (!(ctx->fp = safe_fopen (ctx->path, "r"))) + rc = -1; +- } +- else +- { +- cmp_headers = mbox_strict_cmp_headers; ++ else + rc = ((ctx->magic == M_MBOX) ? mbox_parse_mailbox +- : mmdf_parse_mailbox) (ctx); +- } ++ : mmdf_parse_mailbox) (ctx); + break; + + default: diff -Nru mutt-1.5.21/debian/patches/upstream/393926-internal-viewer.patch mutt-1.5.20/debian/patches/upstream/393926-internal-viewer.patch --- mutt-1.5.21/debian/patches/upstream/393926-internal-viewer.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/393926-internal-viewer.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,21 @@ +Display text/x-diff with the internal viewer, see upstream bug +http://bugs.mutt.org/3246 + +--- a/muttlib.c ++++ b/muttlib.c +@@ -622,11 +622,11 @@ + switch (m->type) + { + case TYPETEXT: +- + if (!ascii_strcasecmp ("plain", m->subtype) || +- !ascii_strcasecmp ("rfc822-headers", m->subtype) || +- !ascii_strcasecmp ("enriched", m->subtype)) +- return 0; ++ !ascii_strcasecmp ("rfc822-headers", m->subtype) || ++ !ascii_strcasecmp ("enriched", m->subtype) || ++ !ascii_strcasecmp ("x-diff", m->subtype)) ++ return 0; + break; + + case TYPEAPPLICATION: diff -Nru mutt-1.5.21/debian/patches/upstream/493719-segfault-imap-close.patch mutt-1.5.20/debian/patches/upstream/493719-segfault-imap-close.patch --- mutt-1.5.21/debian/patches/upstream/493719-segfault-imap-close.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/493719-segfault-imap-close.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,20 @@ +IMAP: only close socket when not already disconnected. +closes http://bugs.mutt.org/3161 and +http://bugs.debian.org/493719 + +--- a/imap/imap.c ++++ b/imap/imap.c +@@ -488,8 +488,11 @@ + + void imap_close_connection(IMAP_DATA* idata) + { +- mutt_socket_close (idata->conn); +- idata->state = IMAP_DISCONNECTED; ++ if (idata->state != IMAP_DISCONNECTED) ++ { ++ mutt_socket_close (idata->conn); ++ idata->state = IMAP_DISCONNECTED; ++ } + idata->seqno = idata->nextcmd = idata->lastcmd = idata->status = 0; + memset (idata->cmds, 0, sizeof (IMAP_COMMAND) * idata->cmdslots); + } diff -Nru mutt-1.5.21/debian/patches/upstream/500016-temp-cache-fix.patch mutt-1.5.20/debian/patches/upstream/500016-temp-cache-fix.patch --- mutt-1.5.21/debian/patches/upstream/500016-temp-cache-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/500016-temp-cache-fix.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,29 @@ +message cache partially invalid after network problem +fixed by http://dev.mutt.org/trac/ticket/3163 +changeset http://dev.mutt.org/trac/changeset/da94a92c3ba0 +resolves http://bugs.debian.org/500016 + +--- mutt-1.5.19/bcache.c 2009-01-05 19:20:53.000000000 +0000 ++++ mutt-7ddf1d1cc490/bcache.c 2009-01-27 20:58:15.000000000 +0000 +@@ -136,6 +136,13 @@ + snprintf (path, sizeof (path), "%s%s%s", bcache->path, id, + tmp ? ".tmp" : ""); + ++ if ((fp = safe_fopen (path, "w+"))) ++ goto out; ++ ++ if (errno == EEXIST) ++ /* clean up leftover tmp file */ ++ mutt_unlink (path); ++ + s = strchr (path + 1, '/'); + while (!(fp = safe_fopen (path, "w+")) && errno == ENOENT && s) + { +@@ -147,6 +154,7 @@ + s = strchr (s + 1, '/'); + } + ++ out: + dprint (3, (debugfile, "bcache: put: '%s'\n", path)); + + return fp; diff -Nru mutt-1.5.21/debian/patches/upstream/502628-attach_charset-doc.patch mutt-1.5.20/debian/patches/upstream/502628-attach_charset-doc.patch --- mutt-1.5.21/debian/patches/upstream/502628-attach_charset-doc.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/502628-attach_charset-doc.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,17 @@ +clarify what attach_charset does, see http://bugs.mutt.org/3165 +and http://bugs.debian.org/502628 + +--- a/init.h ++++ b/init.h +@@ -197,7 +197,10 @@ + /* + ** .pp + ** This variable is a colon-separated list of character encoding +- ** schemes for text file attachments. ++ ** schemes for text file attachments. Mutt uses this setting to guess ++ ** which encoding files being attached are encoded in to convert them to ++ ** a proper character set given in $$send_charset. ++ ** .pp + ** If \fIunset\fP, the value of $$charset will be used instead. + ** For example, the following configuration would work for Japanese + ** text handling: diff -Nru mutt-1.5.21/debian/patches/upstream/504530-stunnel-account_hook-doc.patch mutt-1.5.20/debian/patches/upstream/504530-stunnel-account_hook-doc.patch --- mutt-1.5.21/debian/patches/upstream/504530-stunnel-account_hook-doc.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/504530-stunnel-account_hook-doc.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,16 @@ +Mention account-hook in the docs for $tunnel, see http://bugs.mutt.org/3237 +and http://bugs.debian.org/504530 + +--- a/init.h ++++ b/init.h +@@ -2410,6 +2410,10 @@ + ** .pp + ** Note: For this example to work, you must be able to log in to the + ** remote machine without having to enter a password. ++ ** .pp ++ ** When set, Mutt uses the tunnel for all remote connections. ++ ** Please see ``$account-hook'' in the manual for how to use different ++ ** tunnel commands per connection. + */ + #endif /* USE_SOCKET */ + { "print", DT_QUAD, R_NONE, OPT_PRINT, M_ASKNO }, diff -Nru mutt-1.5.21/debian/patches/upstream/508988-inode-sort.patch mutt-1.5.20/debian/patches/upstream/508988-inode-sort.patch --- mutt-1.5.21/debian/patches/upstream/508988-inode-sort.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/508988-inode-sort.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,41 @@ +fixed by http://dev.mutt.org/trac/ticket/3163 +changeset http://dev.mutt.org/trac/changeset/eb918af802ec +resolves http://bugs.debian.org/508988 + +This commit introduces an unconditional inode-sort to fix the slowness with big +maildirs + +--- mutt-1.5.19/mh.c 2009-01-05 19:20:53.000000000 +0000 ++++ mutt-7ddf1d1cc490/mh.c 2009-01-27 20:58:15.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 1996-2002,2007 Michael R. Elkins ++ * Copyright (C) 1996-2002,2007,2009 Michael R. Elkins + * Copyright (C) 1999-2005 Thomas Roessler + * + * This program is free software; you can redistribute it and/or modify +@@ -1027,13 +1027,14 @@ + if (!ctx->quiet && progress) + mutt_progress_update (progress, count, -1); + ++ DO_SORT(); ++ + snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); + + #if USE_HCACHE + if (option(OPTHCACHEVERIFY)) + { +- DO_SORT(); +- ret = stat(fn, &lastchanged); ++ ret = stat(fn, &lastchanged); + } + else + { +@@ -1057,7 +1058,6 @@ + { + #endif /* USE_HCACHE */ + +- DO_SORT(); + if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) + { + p->header_parsed = 1; diff -Nru mutt-1.5.21/debian/patches/upstream/514960-certificate-insecure-algorithm.patch mutt-1.5.20/debian/patches/upstream/514960-certificate-insecure-algorithm.patch --- mutt-1.5.21/debian/patches/upstream/514960-certificate-insecure-algorithm.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/514960-certificate-insecure-algorithm.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,22 @@ +The new version of gnutls introduced this new option which mutt did not +know about, if the cert is signed with an insecure algorithm (md5) it will +set a particular bit; if the cert is in the cache of the user we will +unset all bits so this has to be unset as well +See http://bugs.mutt.org/3229 and http://bugs.debian.org/514960 + +--- a/mutt_ssl_gnutls.c ++++ b/mutt_ssl_gnutls.c +@@ -614,6 +614,13 @@ + in our cache. */ + certstat ^= GNUTLS_CERT_SIGNER_NOT_CA; + } ++ ++ if (certstat & GNUTLS_CERT_INSECURE_ALGORITHM) ++ { ++ /* if the certificate is in the cache the user is happy with ++ using an insecure algorithm */ ++ certstat ^= GNUTLS_CERT_INSECURE_ALGORITHM; ++ } + } + + if (certstat & GNUTLS_CERT_REVOKED) diff -Nru mutt-1.5.21/debian/patches/upstream/524420-segfault-reconnect-sasl.patch mutt-1.5.20/debian/patches/upstream/524420-segfault-reconnect-sasl.patch --- mutt-1.5.21/debian/patches/upstream/524420-segfault-reconnect-sasl.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/524420-segfault-reconnect-sasl.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,14 @@ +Mutt crashes when connection that used SASL is closed +and reopened again (e.g. network problem) +see http://bugs.debian.org/524420 and http://bugs.mutt.org/3206 + +--- a/mutt_sasl.c ++++ b/mutt_sasl.c +@@ -481,6 +481,7 @@ + conn->conn_close = sasldata->msasl_close; + conn->conn_read = sasldata->msasl_read; + conn->conn_write = sasldata->msasl_write; ++ conn->conn_poll = sasldata->msasl_poll; + + /* release sasl resources */ + sasl_dispose (&sasldata->saslconn); diff -Nru mutt-1.5.21/debian/patches/upstream/530661-mandatory-doubledash.patch mutt-1.5.20/debian/patches/upstream/530661-mandatory-doubledash.patch --- mutt-1.5.21/debian/patches/upstream/530661-mandatory-doubledash.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/530661-mandatory-doubledash.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,54 @@ +This patch is taken up from upstream http://bugs.mutt.org/3235 +The new way getopt is called broke the possibility to use +"mutt -a attachfile recipient" +now -- is mandatory to separate file and recipient, even if only +a single file is attached, this patch fixes the documentation +to make -- mandatory + +--- a/doc/mutt.man ++++ b/doc/mutt.man +@@ -82,8 +82,10 @@ + An expanded version of the given alias is passed to stdout. + .IP "-a \fIfile\fP [...]" + Attach a file to your message using MIME. +-To attach multiple files, separating filenames and recipient addresses with +-"\-\-" is mandatory, e.g. \fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP. ++When attaching single or multiple files, separating filenames and recipient addresses with ++"\-\-" is mandatory, e.g. \fBmutt \-a image.jpg \-\- addr1\fP or ++\fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP. ++The \-a option must be placed at the end of command line options. + .IP "-b \fIaddress\fP" + Specify a blind-carbon-copy (BCC) recipient + .IP "-c \fIaddress\fP" +--- a/doc/manual.xml.head ++++ b/doc/manual.xml.head +@@ -6995,9 +6995,6 @@ + + muttrc + +- +-file +- + + address + +@@ -7008,15 +7005,12 @@ + subject + + +- ++ + file ++ ++-- + +--- +- +- +-address +- +- ++ + address + + diff -Nru mutt-1.5.21/debian/patches/upstream/530887-dovecot-imap.patch mutt-1.5.20/debian/patches/upstream/530887-dovecot-imap.patch --- mutt-1.5.21/debian/patches/upstream/530887-dovecot-imap.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/530887-dovecot-imap.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,39 @@ +This patch fixes the following two bugs: +*) http://bugs.debian.org/530887 + mutt: fails to move read messages even with move=yes + +*) http://bugs.debian.org/530671 + mutt: does not want to open dot subdirs via imap anymore + +the second one happens with dovecot which uses / as a delimeter for mailbox, +so without this patch is not possible to access subdirs on imap accounts +hosted on dovecot + +--- a/imap/util.c ++++ b/imap/util.c +@@ -393,19 +393,19 @@ + size_t plen) + { + int i = 0; +- char delim; ++ char delim = '\0'; + + if (idata) + delim = idata->delim; +- else if (ImapDelimChars && ImapDelimChars[0]) +- delim = ImapDelimChars[0]; +- else +- delim = '/'; + + while (mailbox && *mailbox && i < plen - 1) + { +- if (strchr(ImapDelimChars, *mailbox) || *mailbox == delim) ++ if ((ImapDelimChars && strchr(ImapDelimChars, *mailbox)) ++ || *mailbox == delim) + { ++ /* use connection delimiter if known. Otherwise use user delimiter */ ++ if (!idata) ++ delim = *mailbox; + while (*mailbox && + (strchr(ImapDelimChars, *mailbox) || *mailbox == delim)) + mailbox++; diff -Nru mutt-1.5.21/debian/patches/upstream/531430-imapuser.patch mutt-1.5.20/debian/patches/upstream/531430-imapuser.patch --- mutt-1.5.21/debian/patches/upstream/531430-imapuser.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/531430-imapuser.patch 2011-02-14 17:04:53.000000000 +0000 @@ -3,7 +3,7 @@ --- a/account.c +++ b/account.c -@@ -222,7 +222,7 @@ +@@ -218,7 +218,7 @@ else { snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), diff -Nru mutt-1.5.21/debian/patches/upstream/533209-mutt_perror.patch mutt-1.5.20/debian/patches/upstream/533209-mutt_perror.patch --- mutt-1.5.21/debian/patches/upstream/533209-mutt_perror.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/533209-mutt_perror.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,13 @@ +mutt is calling mutt_perror twice, so the error messages are +sometimes confused, see upstream #3268 + +--- a/mx.c ++++ b/mx.c +@@ -415,7 +415,6 @@ + { + dprint (1, (debugfile, "mx_get_magic(): unable to open file %s for reading.\n", + path)); +- mutt_perror (path); + return (-1); + } + diff -Nru mutt-1.5.21/debian/patches/upstream/533370-pgp-inline.patch mutt-1.5.20/debian/patches/upstream/533370-pgp-inline.patch --- mutt-1.5.21/debian/patches/upstream/533370-pgp-inline.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/533370-pgp-inline.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,41 @@ +inline pgp messages were displayed incorrectly when pgp_auto_decode=yes, see +upstream http://bugs.mutt.org/3269 + +--- a/crypt-gpgme.c ++++ b/crypt-gpgme.c +@@ -2371,16 +2371,14 @@ + safe_fclose (&pgpout); + } + } +-#if 0 + else + { +- /* why would we want to display this at all? */ ++ /* A traditional PGP part may mix signed and unsigned content */ + /* XXX - we may wish to recode here */ + if (s->prefix) + state_puts (s->prefix, s); + state_puts (buf, s); + } +-#endif + } + + m->goodsig = (maybe_goodsig && have_any_sigs); +--- a/pgp.c ++++ b/pgp.c +@@ -482,7 +482,6 @@ + state_attach_puts (_("[-- END PGP SIGNED MESSAGE --]\n"), s); + } + } +-#if 0 + else + { + /* why would we want to display this at all? */ +@@ -491,7 +490,6 @@ + state_puts (s->prefix, s); + state_puts (buf, s); + } +-#endif + } + + rc = 0; diff -Nru mutt-1.5.21/debian/patches/upstream/533439-mbox-time.patch mutt-1.5.20/debian/patches/upstream/533439-mbox-time.patch --- mutt-1.5.21/debian/patches/upstream/533439-mbox-time.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/533439-mbox-time.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,113 @@ +upstream test patch to fix the atime issue +(See #533439 and upstream #3271, #1372) + +--- a/mbox.c ++++ b/mbox.c +@@ -685,22 +685,30 @@ + + /* if mailbox has at least 1 new message, sets mtime > atime of mailbox + * so buffy check reports new mail */ +-static void reset_atime (CONTEXT *ctx) ++void mbox_reset_atime (CONTEXT *ctx, struct stat *st) + { + struct utimbuf utimebuf; +- int i; +- time_t now = time (NULL); ++ int i, found = 0; ++ struct stat _st; + +- for (i = 0; i < ctx->msgcount; i++) ++ if (!st) + { +- if (!ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read && !ctx->hdrs[i]->old) +- { +- utimebuf.actime = now - 1; +- utimebuf.modtime = now; +- utime (ctx->path, &utimebuf); ++ if (stat (ctx->path, &_st) < 0) + return; +- } ++ st = &_st; + } ++ ++ utimebuf.actime = st->st_atime; ++ utimebuf.modtime = st->st_mtime; ++ ++ for (i = 0; !found && i < ctx->msgcount; i++) ++ if (!ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read && !ctx->hdrs[i]->old) ++ found = 1; ++ ++ if (found && utimebuf.actime >= utimebuf.modtime) ++ utimebuf.actime = utimebuf.modtime - 1; ++ ++ utime (ctx->path, &utimebuf); + } + + /* return values: +@@ -716,6 +724,7 @@ + int need_sort = 0; /* flag to resort mailbox if new mail arrives */ + int first = -1; /* first message to be written */ + LOFF_T offset; /* location in mailbox to write changed messages */ ++ struct stat statbuf; + struct m_update_t *newOffset = NULL; + struct m_update_t *oldOffset = NULL; + FILE *fp = NULL; +@@ -907,6 +916,15 @@ + } + fp = NULL; + ++ /* Save the state of this folder. */ ++ if (stat (ctx->path, &statbuf) == -1) ++ { ++ mutt_perror (ctx->path); ++ mutt_sleep (5); ++ unlink (tempfile); ++ goto bail; ++ } ++ + if ((fp = fopen (tempfile, "r")) == NULL) + { + mutt_unblock_signals (); +@@ -976,6 +994,9 @@ + return (-1); + } + ++ /* Restore the previous access/modification times */ ++ mbox_reset_atime (ctx, &statbuf); ++ + /* reopen the mailbox in read-only mode */ + if ((ctx->fp = fopen (ctx->path, "r")) == NULL) + { +@@ -1002,11 +1023,6 @@ + unlink (tempfile); /* remove partial copy of the mailbox */ + mutt_unblock_signals (); + +- /* if mailbox has new mail, mangle atime+mtime to make buffy check +- * report new mail for it */ +- if (!option (OPTCHECKMBOXSIZE)) +- reset_atime (ctx); +- + return (0); /* signal success */ + + bail: /* Come here in case of disaster */ +--- a/mx.c ++++ b/mx.c +@@ -1005,6 +1005,8 @@ + { + if (!ctx->quiet) + mutt_message _("Mailbox is unchanged."); ++ if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) ++ mbox_reset_atime (ctx, NULL); + mx_fastclose_mailbox (ctx); + return 0; + } +--- a/mx.h ++++ b/mx.h +@@ -59,6 +59,7 @@ + int mmdf_parse_mailbox (CONTEXT *); + void mbox_unlock_mailbox (CONTEXT *); + int mbox_check_empty (const char *); ++void mbox_reset_atime (CONTEXT *, struct stat *); + + int mh_read_dir (CONTEXT *, const char *); + int mh_sync_mailbox (CONTEXT *, int *); diff -Nru mutt-1.5.21/debian/patches/upstream/533459-unmailboxes.patch mutt-1.5.20/debian/patches/upstream/533459-unmailboxes.patch --- mutt-1.5.21/debian/patches/upstream/533459-unmailboxes.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/533459-unmailboxes.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,13 @@ +mutt segfaults everytime the 'unmailboxes' command is used +(see upstream #3273) + +--- a/buffy.c ++++ b/buffy.c +@@ -236,7 +236,6 @@ + { + if(*tmp) + { +- FREE (&((*tmp)->path)); + tmp1=(*tmp)->next; + FREE (tmp); /* __FREE_CHECKED__ */ + *tmp=tmp1; diff -Nru mutt-1.5.21/debian/patches/upstream/533520-signature-highlight.patch mutt-1.5.20/debian/patches/upstream/533520-signature-highlight.patch --- mutt-1.5.21/debian/patches/upstream/533520-signature-highlight.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/533520-signature-highlight.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,14 @@ +before this patch mutt failed to highlight some signatures if text_flowed was +set to yes (see upstream http://bugs.mutt.org/3275) + +--- a/handler.c ++++ b/handler.c +@@ -1500,7 +1500,7 @@ + l = mutt_strlen (buf); + if (l > 0 && buf[l-1] == '\n') + buf[--l] = 0; +- if (option (OPTTEXTFLOWED)) ++ if (mutt_strcmp (buf, "-- ") != 0 && option (OPTTEXTFLOWED)) + { + while (l > 0 && buf[l-1] == ' ') + buf[--l] = 0; diff -Nru mutt-1.5.21/debian/patches/upstream/534543-imap-port.patch mutt-1.5.20/debian/patches/upstream/534543-imap-port.patch --- mutt-1.5.21/debian/patches/upstream/534543-imap-port.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/534543-imap-port.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,21 @@ +a bug in 1.5.20 upstream prevented mutt from correctly parsing the port +in an IMAP url (imap[s]://...:), this was fixed by upstream bug +3264 and backported to the Debian package in 534543 + +Index: mutt/url.c +=================================================================== +--- mutt.orig/url.c 2009-06-25 12:37:59.000000000 +0200 ++++ mutt/url.c 2009-06-25 12:39:05.000000000 +0200 +@@ -143,9 +143,11 @@ + + if ((p = strchr (t, ':'))) + { ++ int t; + *p++ = '\0'; +- if (mutt_atos (p, (short*) &ciss->port) < 0) ++ if (mutt_atoi (p, &t) < 0 || t < 0 || t > 0xffff) + return NULL; ++ ciss->port = (unsigned short)t; + } + else + ciss->port = 0; diff -Nru mutt-1.5.21/debian/patches/upstream/535096-pop-port.patch mutt-1.5.20/debian/patches/upstream/535096-pop-port.patch --- mutt-1.5.21/debian/patches/upstream/535096-pop-port.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/535096-pop-port.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,30 @@ +This patch will allow the user to specify a port, as it was before 1.5.20, see +upstream bug http://bugs.mutt.org/3322 + +--- a/pop_lib.c ++++ b/pop_lib.c +@@ -43,6 +43,7 @@ + /* Defaults */ + acct->flags = 0; + acct->type = M_ACCT_TYPE_POP; ++ acct->port = 0; + + c = safe_strdup (path); + url_parse_ciss (&url, c); +@@ -60,10 +61,12 @@ + acct->flags |= M_ACCT_SSL; + + service = getservbyname (url.scheme == U_POP ? "pop3" : "pop3s", "tcp"); +- if (service) +- acct->port = ntohs (service->s_port); +- else +- acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;; ++ if (!acct->port) { ++ if (service) ++ acct->port = ntohs (service->s_port); ++ else ++ acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;; ++ } + + FREE (&c); + return 0; diff -Nru mutt-1.5.21/debian/patches/upstream/537061-dont-recode-saved-attachments.patch mutt-1.5.20/debian/patches/upstream/537061-dont-recode-saved-attachments.patch --- mutt-1.5.21/debian/patches/upstream/537061-dont-recode-saved-attachments.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/537061-dont-recode-saved-attachments.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -As a side effect of the fix for http://bugs.mutt.org/3234, mutt is recoding all -save attachments, this is causing problems; a proper fix for this issue is being -tracked on http://bugs.mutt.org/3293 - ---- a/attach.c -+++ b/attach.c -@@ -807,7 +807,6 @@ - STATE s; - - memset (&s, 0, sizeof (s)); -- s.flags |= M_CHARCONV; - - if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) - { diff -Nru mutt-1.5.21/debian/patches/upstream/537818-emptycharset.patch mutt-1.5.20/debian/patches/upstream/537818-emptycharset.patch --- mutt-1.5.21/debian/patches/upstream/537818-emptycharset.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/537818-emptycharset.patch 2011-02-14 17:04:53.000000000 +0000 @@ -3,7 +3,7 @@ --- a/init.c +++ b/init.c -@@ -1732,6 +1732,9 @@ +@@ -1751,6 +1751,9 @@ char *p, *q = NULL, *s = safe_strdup (val); int rc = 0, strict = strcmp (opt->option, "send_charset") == 0; diff -Nru mutt-1.5.21/debian/patches/upstream/538128-mh-folder-access.patch mutt-1.5.20/debian/patches/upstream/538128-mh-folder-access.patch --- mutt-1.5.21/debian/patches/upstream/538128-mh-folder-access.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/538128-mh-folder-access.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,50 @@ +this fixes a problem with new mail detection on MH folder, for a +more detailed history see mutt bugs #3308 and #3312 and debian +bug 538128 + +--- a/mh.c ++++ b/mh.c +@@ -146,7 +146,7 @@ + if ((p = strchr (t, '-'))) + { + *p++ = '\0'; +- if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0) ++ if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0) + return -1; + } + else +@@ -167,7 +167,7 @@ + size_t sz = 0; + + short f; +- int first, last, rc; ++ int first, last, rc = 0; + + char pathname[_POSIX_PATH_MAX]; + snprintf (pathname, sizeof (pathname), "%s/.mh_sequences", path); +@@ -207,7 +207,7 @@ + out: + FREE (&buff); + safe_fclose (&fp); +- return 0; ++ return rc; + } + + static inline mode_t mh_umask (CONTEXT* ctx) +@@ -238,6 +238,7 @@ + for (i = 0; !r && i <= mhs.max; i++) + if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) + r = 1; ++ mhs_free_sequences (&mhs); + return r; + } + +@@ -1155,7 +1156,7 @@ + + if (ctx->magic == M_MH) + { +- if (mh_read_sequences (&mhs, ctx->path) >= 0) ++ if (mh_read_sequences (&mhs, ctx->path) < 0) + return -1; + mh_update_maildir (md, &mhs); + mhs_free_sequences (&mhs); diff -Nru mutt-1.5.21/debian/patches/upstream/542344-dont_fold_From_ mutt-1.5.20/debian/patches/upstream/542344-dont_fold_From_ --- mutt-1.5.21/debian/patches/upstream/542344-dont_fold_From_ 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/542344-dont_fold_From_ 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,54 @@ +changeset: 5945:5f590adfdf1a +branch: HEAD +user: Rocco Rutte +date: Thu Jun 25 17:31:27 2009 +0200 +summary: header folding: treat From_ specially, never wrap on sending side + +--- a/sendlib.c ++++ b/sendlib.c +@@ -1630,9 +1630,9 @@ static int fold_one_header (FILE *fp, co + dprint(4,(debugfile,"mwoh: pfx=[%s], tag=[%s], flags=%d value=[%s]\n", + pfx, tag, flags, value)); + +- if (fprintf (fp, "%s%s: ", NONULL (pfx), tag) < 0) ++ if (tag && *tag && fprintf (fp, "%s%s: ", NONULL (pfx), tag) < 0) + return -1; +- col = mutt_strlen (tag) + 2 + mutt_strlen (pfx); ++ col = mutt_strlen (tag) + (tag && *tag ? 2 : 0) + mutt_strlen (pfx); + + while (p && *p) + { +@@ -1717,9 +1717,12 @@ static int write_one_header (FILE *fp, i + int flags) + { + char *tagbuf, *valbuf, *t; ++ int is_from = ((end - start) > 5 && ++ ascii_strncasecmp (start, "from ", 5) == 0); + +- /* only pass through folding machinery if necessary for sending */ +- if (!(flags & CH_DISPLAY) && pfxw + max <= wraplen) ++ /* only pass through folding machinery if necessary for sending, ++ never wrap From_ headers on sending */ ++ if (!(flags & CH_DISPLAY) && (pfxw + max <= wraplen || is_from)) + { + valbuf = mutt_substrdup (start, end); + dprint(4,(debugfile,"mwoh: buf[%s%s] short enough, " +@@ -1738,8 +1741,16 @@ static int write_one_header (FILE *fp, i + else + { + t = strchr (start, ':'); +- tagbuf = mutt_substrdup (start, t); +- valbuf = mutt_substrdup (t + 2, end); ++ if (is_from) ++ { ++ tagbuf = NULL; ++ valbuf = mutt_substrdup (start, end); ++ } ++ else ++ { ++ tagbuf = mutt_substrdup (start, t); ++ valbuf = mutt_substrdup (t + 2, end); ++ } + dprint(4,(debugfile,"mwoh: buf[%s%s] too long, " + "max width = %d > %dn", + NONULL(pfx), valbuf, max, wraplen)); diff -Nru mutt-1.5.21/debian/patches/upstream/542910-search-segfault.patch mutt-1.5.20/debian/patches/upstream/542910-search-segfault.patch --- mutt-1.5.21/debian/patches/upstream/542910-search-segfault.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/542910-search-segfault.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,20 @@ +Fixes a segfault that happened when searching "~b something =", see upstream +bugs http://bugs.mutt.org/3314 and http://bugs.mutt.org/3315 + +--- a/pattern.c ++++ b/pattern.c +@@ -822,7 +822,13 @@ + case '%': + case '=': + case '~': +- if (*(ps.dptr + 1) == '(') ++ if (!*(ps.dptr + 1)) ++ { ++ snprintf (err->data, err->dsize, _("missing pattern: %s"), ps.dptr); ++ mutt_pattern_free (&curlist); ++ return NULL; ++ } ++ if (*(ps.dptr + 1) == '(') + { + ps.dptr ++; /* skip ~ */ + p = find_matching_paren (ps.dptr + 1); diff -Nru mutt-1.5.21/debian/patches/upstream/544180-italian-yesorno.patch mutt-1.5.20/debian/patches/upstream/544180-italian-yesorno.patch --- mutt-1.5.21/debian/patches/upstream/544180-italian-yesorno.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/544180-italian-yesorno.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,14 @@ +patch to fix a problem in the Italian translation, it was submitted to upstream +on bugs http://bugs.mutt.org/3336 + +--- a/po/it.po ++++ b/po/it.po +@@ -3233,7 +3233,7 @@ + + #: muttlib.c:938 + msgid "yna" +-msgstr "yna" ++msgstr "snt" + + #: muttlib.c:954 + msgid "File is a directory, save under it?" diff -Nru mutt-1.5.21/debian/patches/upstream/544794-smtp-batch.patch mutt-1.5.20/debian/patches/upstream/544794-smtp-batch.patch --- mutt-1.5.21/debian/patches/upstream/544794-smtp-batch.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/544794-smtp-batch.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,68 @@ +Without this patch mutt fails to send messages and ask for a password even if +smtp_user and smtp_pass are defined in .muttrc, see upstream bug +http://bugs.mutt.org/3289 + +--- a/account.c ++++ b/account.c +@@ -155,6 +155,8 @@ + else if ((account->type == M_ACCT_TYPE_POP) && PopUser) + strfcpy (account->user, PopUser, sizeof (account->user)); + #endif ++ else if (option (OPTNOCURSES)) ++ return -1; + /* prompt (defaults to unix username), copy into account->user */ + else + { +@@ -215,6 +217,8 @@ + else if ((account->type == M_ACCT_TYPE_SMTP) && SmtpPass) + strfcpy (account->pass, SmtpPass, sizeof (account->pass)); + #endif ++ else if (option (OPTNOCURSES)) ++ return -1; + else + { + snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), +--- a/mutt_sasl.c ++++ b/mutt_sasl.c +@@ -304,7 +304,7 @@ + + snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt); + resp[0] = '\0'; +- if (mutt_get_field (prompt, resp, sizeof (resp), 0)) ++ if (option (OPTNOCURSES) || mutt_get_field (prompt, resp, sizeof (resp), 0)) + return SASL_FAIL; + + interaction->len = mutt_strlen (resp)+1; +--- a/smtp.c ++++ b/smtp.c +@@ -172,7 +172,7 @@ + progress_t progress; + struct stat st; + int r, term = 0; +- size_t buflen; ++ size_t buflen = 0; + + fp = fopen (msgfile, "r"); + if (!fp) +@@ -454,12 +454,6 @@ + } + + #ifdef USE_SASL +- if (!(conn->account.flags & M_ACCT_PASS) && option (OPTNOCURSES)) +- { +- mutt_error (_("Interactive SMTP authentication not supported")); +- mutt_sleep (1); +- return -1; +- } + return smtp_auth (conn); + #else + mutt_error (_("SMTP authentication requires SASL")); +@@ -603,7 +597,7 @@ + } + } + strfcpy (buf + len, "\r\n", sizeof (buf) - len); +- } while (rc == smtp_ready); ++ } while (rc == smtp_ready && saslrc != SASL_FAIL); + + if (smtp_success (rc)) + { diff -Nru mutt-1.5.21/debian/patches/upstream/545316-header-color.patch mutt-1.5.20/debian/patches/upstream/545316-header-color.patch --- mutt-1.5.21/debian/patches/upstream/545316-header-color.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/545316-header-color.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,13 @@ +Do not store the header color into hcache, see http://bugs.mutt.org/3376 and +http://dev.mutt.org/trac/changeset/b7d2cb7c7ce1 for more info + +--- a/hcache.c ++++ b/hcache.c +@@ -623,6 +623,7 @@ + nh.limited = 0; + nh.num_hidden = 0; + nh.recipient = 0; ++ nh.pair = 0; + nh.attach_valid = 0; + nh.path = NULL; + nh.tree = NULL; diff -Nru mutt-1.5.21/debian/patches/upstream/547739-manual-typos.patch mutt-1.5.20/debian/patches/upstream/547739-manual-typos.patch --- mutt-1.5.21/debian/patches/upstream/547739-manual-typos.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/547739-manual-typos.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,127 @@ +Minor typos in manual.txt, see upstream http://bugs.mutt.org/3379 + +--- a/doc/manual.xml.head ++++ b/doc/manual.xml.head +@@ -1511,7 +1511,7 @@ + + + After editing the initial message text and before entering +-the compose menu, Mutt properly space-stuffes the message. ++the compose menu, Mutt properly space-stuffs the message. + Space-stuffing is required by RfC3676 defining + format=flowed and means to prepend a space to: + +@@ -2507,7 +2507,7 @@ + + + attachment +-bold (hiliting bold patterns in the body of messages) ++bold (highlighting bold patterns in the body of messages) + error (error messages printed by Mutt) + hdrdefault (default color of the message header in the pager) + indicator (arrow or bar used to indicate the current item in a menu) +@@ -2516,11 +2516,11 @@ + normal + quoted (text matching $quote_regexp in the body of a message) + quoted1, quoted2, ..., quotedN (higher levels of quoting) +-search (hiliting of words in the pager) ++search (highlighting of words in the pager) + signaturestatus (mode lines used to display info about the mailbox or message) + tilde (the ˜ used to pad blank lines in the pager) + tree (thread tree drawn in the message index and attachment menu) +-underline (hiliting underlined patterns in the body of messages) ++underline (highlighting underlined patterns in the body of messages) + + + +@@ -3095,7 +3095,7 @@ + the command is executed, so if these names contain shortcut characters (such as = and !), any variable + definition that affects these characters (like $folder and $spoolfile) + should be set before the mailboxes command. If +-none of these shorcuts are used, a local path should be absolute as ++none of these shortcuts are used, a local path should be absolute as + otherwise Mutt tries to find it relative to the directory + from where Mutt was started which may not always be desired. + +@@ -5841,7 +5841,7 @@ + If the command is empty, this operation is + disabled for this file type. In this case, the folder will be open and + closed again (using open-hook and +-close-hookrespectively) each time you ++close-hook respectively) each time you + will add to it. + + +@@ -6811,7 +6811,7 @@ + ## line is unnecessary if you already have "attach-allow */.*", of + ## course. These are off by default! The MIME elements contained + ## within a message/* or multipart/* are still examined, even if the +-## containers themseves don't qualify. ++## containers themselves don't qualify. + ## + #attachments +A message/.* multipart/.* + #attachments +I message/.* multipart/.* +@@ -7465,7 +7465,7 @@ + the current chain position, use <select-entry> or <append>. + You can also delete entries from the chain, using the corresponding + function. Finally, to abandon your changes, leave the menu, or +-<accept> them pressing (by default) the Return key. ++<accept> them, pressing (by default) the Return key. + + + +--- a/doc/Muttrc ++++ b/doc/Muttrc +@@ -1991,7 +1991,7 @@ + # + # + # The default mailbox type used when creating new folders. May be any of +-# ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overriden by the ++# ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overridden by the + # -m command-line option. + # + # +--- a/doc/manual.txt ++++ b/doc/manual.txt +@@ -7405,7 +7405,7 @@ + Default: mbox + + The default mailbox type used when creating new folders. May be any of ?mbox?, +-?MMDF?, ?MH? and ?Maildir?. This is overriden by the -m command-line option. ++?MMDF?, ?MH? and ?Maildir?. This is overridden by the -m command-line option. + + 3.128. menu_context + +--- a/edit.c ++++ b/edit.c +@@ -39,7 +39,7 @@ + * declared "static" (sigh) + */ + static char* EditorHelp1 = N_("\ +-~~ insert a line begining with a single ~\n\ ++~~ insert a line beginning with a single ~\n\ + ~b users add users to the Bcc: field\n\ + ~c users add users to the Cc: field\n\ + ~f messages include messages\n\ +--- a/recvattach.c ++++ b/recvattach.c +@@ -698,7 +698,7 @@ + { + if (!mutt_can_decode (top)) + { +- mutt_error (_("I dont know how to print %s attachments!"), type); ++ mutt_error (_("I don't know how to print %s attachments!"), type); + return (0); + } + } +--- a/init.h ++++ b/init.h +@@ -1413,7 +1413,7 @@ + /* + ** .pp + ** The default mailbox type used when creating new folders. May be any of +- ** ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overriden by the ++ ** ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overridden by the + ** \fC-m\fP command-line option. + */ + { "menu_context", DT_NUM, R_NONE, UL &MenuContext, 0 }, diff -Nru mutt-1.5.21/debian/patches/upstream/548494-swedish-intl.patch mutt-1.5.20/debian/patches/upstream/548494-swedish-intl.patch --- mutt-1.5.21/debian/patches/upstream/548494-swedish-intl.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/548494-swedish-intl.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,113 @@ +Fix a swedish word, the patch was forwarded upstream to +http://dev.mutt.org/trac/ticket/3370 + +--- a/po/sv.po ++++ b/po/sv.po +@@ -74,7 +74,7 @@ + #: alias.c:307 send.c:206 + #, c-format + msgid "Error: '%s' is a bad IDN." +-msgstr "Fel: '%s' är ett dåligt IDN." ++msgstr "Fel: '%s' är ett felaktigt IDN." + + #: alias.c:319 + msgid "Personal name: " +@@ -417,7 +417,7 @@ + #: commands.c:298 recvcmd.c:190 + #, c-format + msgid "Bad IDN: '%s'" +-msgstr "Dåligt IDN: \"%s\"" ++msgstr "Felaktigt IDN: \"%s\"" + + #: commands.c:309 recvcmd.c:204 + #, c-format +@@ -640,7 +640,7 @@ + #: compose.c:302 + #, c-format + msgid "Warning: '%s' is a bad IDN." +-msgstr "Varning: \"%s\" är ett dåligt IDN." ++msgstr "Varning: \"%s\" är ett felaktigt IDN." + + #: compose.c:325 + msgid "You may not delete the only attachment." +@@ -649,7 +649,7 @@ + #: compose.c:600 send.c:1591 + #, c-format + msgid "Bad IDN in \"%s\": '%s'" +-msgstr "Dåligt IDN i \"%s\": \"%s\"" ++msgstr "Felaktigt IDN i \"%s\": \"%s\"" + + #: compose.c:683 + msgid "Attaching selected files..." +@@ -1788,7 +1788,7 @@ + #: edit.c:446 + #, c-format + msgid "Bad IDN in %s: '%s'\n" +-msgstr "Dåligt IDN i %s: \"%s\"\n" ++msgstr "Felaktigt IDN i %s: \"%s\"\n" + + #: edit.c:464 + #, c-format +@@ -1999,7 +1999,7 @@ + #: history.c:77 history.c:114 history.c:140 + #, c-format + msgid "Bad history file format (line %d)" +-msgstr "Dåligt filformat för historia (rad %d)" ++msgstr "Felaktigt filformat för historik (rad %d)" + + #: hook.c:251 + #, c-format +@@ -2186,7 +2186,7 @@ + + #: imap/imap.c:1826 + msgid "Bad mailbox name" +-msgstr "Dåligt namn på brevlåda" ++msgstr "Felaktigt namn på brevlåda" + + #: imap/imap.c:1851 + #, c-format +@@ -2260,7 +2260,7 @@ + #: init.c:466 + #, c-format + msgid "Bad regexp: %s" +-msgstr "Dåligt reguljärt uttryck: %s" ++msgstr "Felaktigt reguljärt uttryck: %s" + + #: init.c:523 + #, c-format +@@ -2282,7 +2282,7 @@ + #: init.c:901 + #, c-format + msgid "Warning: Bad IDN '%s'.\n" +-msgstr "Varning: Dåligt IDN \"%s\".\n" ++msgstr "Varning: Felaktigtt IDN \"%s\".\n" + + #: init.c:1109 + msgid "attachments: no disposition" +@@ -2307,7 +2307,7 @@ + #: init.c:1359 + #, c-format + msgid "Warning: Bad IDN '%s' in alias '%s'.\n" +-msgstr "Varning: Dåligt IDN \"%s\" i alias \"%s\".\n" ++msgstr "Varning: Felaktigt IDN \"%s\" i alias \"%s\".\n" + + #: init.c:1447 + msgid "invalid header field" +@@ -2925,7 +2925,7 @@ + #: mutt_socket.c:470 mutt_socket.c:529 + #, c-format + msgid "Bad IDN \"%s\"." +-msgstr "Dåligt IDN \"%s\"." ++msgstr "Felaktigt IDN \"%s\"." + + #: mutt_socket.c:478 mutt_socket.c:537 + #, c-format +@@ -4066,7 +4066,7 @@ + #: sendlib.c:2500 + #, c-format + msgid "Bad IDN %s while preparing resent-from." +-msgstr "Dåligt IDN %s vid förberedning av \"resent-from\"." ++msgstr "Felaktigt IDN %s vid förberedning av \"resent-from\"." + + #: signal.c:43 + #, c-format diff -Nru mutt-1.5.21/debian/patches/upstream/548577-gpgme-1.2.patch mutt-1.5.20/debian/patches/upstream/548577-gpgme-1.2.patch --- mutt-1.5.21/debian/patches/upstream/548577-gpgme-1.2.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/548577-gpgme-1.2.patch 2011-02-14 17:04:53.000000000 +0000 @@ -3,9 +3,9 @@ --- a/init.c +++ b/init.c -@@ -53,6 +53,10 @@ +@@ -51,6 +51,10 @@ + #include #include - #include +#if defined(CRYPT_BACKEND_GPGME) +#include diff -Nru mutt-1.5.21/debian/patches/upstream/553238-german-intl.patch mutt-1.5.20/debian/patches/upstream/553238-german-intl.patch --- mutt-1.5.21/debian/patches/upstream/553238-german-intl.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/553238-german-intl.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,14 @@ +Small fix in a German translation, the original bug submission was amended after +consulting a native speaker (gregoa@) + +--- a/po/de.po ++++ b/po/de.po +@@ -1648,7 +1648,7 @@ + + #: curs_main.c:1317 curs_main.c:1361 + msgid "No undeleted messages." +-msgstr "Alle Nachrichten gelscht." ++msgstr "Keine ungelschten Nachrichten." + + #: curs_main.c:1354 curs_main.c:1378 + msgid "You are on the first message." diff -Nru mutt-1.5.21/debian/patches/upstream/553321-ansi-escape-segfault.patch mutt-1.5.20/debian/patches/upstream/553321-ansi-escape-segfault.patch --- mutt-1.5.21/debian/patches/upstream/553321-ansi-escape-segfault.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/553321-ansi-escape-segfault.patch 2011-02-14 17:04:53.000000000 +0000 @@ -6,7 +6,7 @@ --- a/pager.c +++ b/pager.c -@@ -1053,7 +1053,7 @@ +@@ -1028,7 +1028,7 @@ q = *fmt; while (*p) { diff -Nru mutt-1.5.21/debian/patches/upstream/557395-muttrc-crypto.patch mutt-1.5.20/debian/patches/upstream/557395-muttrc-crypto.patch --- mutt-1.5.21/debian/patches/upstream/557395-muttrc-crypto.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/557395-muttrc-crypto.patch 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,13 @@ +Small fix to the muttrc manpage + +--- a/init.h ++++ b/init.h +@@ -559,7 +559,7 @@ + ** .pp + ** If \fI``yes''\fP, always attempt to verify PGP or S/MIME signatures. + ** If \fI``ask-*''\fP, ask whether or not to verify the signature. +- ** If \Fi``no''\fP, never attempt to verify cryptographic signatures. ++ ** If \fI``no''\fP, never attempt to verify cryptographic signatures. + ** (Crypto only) + */ + { "date_format", DT_STR, R_BOTH, UL &DateFmt, UL "!%a, %b %d, %Y at %I:%M:%S%p %Z" }, diff -Nru mutt-1.5.21/debian/patches/upstream/573823-imap_internal_date mutt-1.5.20/debian/patches/upstream/573823-imap_internal_date --- mutt-1.5.21/debian/patches/upstream/573823-imap_internal_date 1970-01-01 00:00:00.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/573823-imap_internal_date 2011-02-14 17:04:53.000000000 +0000 @@ -0,0 +1,76 @@ +changeset: 5949:b2b97c7a2ae6 +branch: HEAD +user: Brendan Cully +date: Fri Jun 26 21:47:34 2009 -0700 +summary: Set internaldate of messages appended to IMAP mailboxes + +--- a/imap/imap_private.h ++++ b/imap/imap_private.h +@@ -70,6 +70,9 @@ + #define IMAP_CMD_PASS (1<<1) + #define IMAP_CMD_QUEUE (1<<2) + ++/* length of "DD-MMM-YYYY HH:MM:SS +ZZzz" (null-terminated) */ ++#define IMAP_DATELEN 27 ++ + enum + { + IMAP_FATAL = 1, +@@ -281,6 +284,7 @@ char* imap_get_qualifier (char* buf); + int imap_mxcmp (const char* mx1, const char* mx2); + char* imap_next_word (char* s); + time_t imap_parse_date (char* s); ++void imap_make_date (char* buf, time_t timestamp); + void imap_qualify_path (char *dest, size_t len, IMAP_MBOX *mx, char* path); + void imap_quote_string (char* dest, size_t slen, const char* src); + void imap_unquote_string (char* s); +--- a/imap/message.c ++++ b/imap/message.c +@@ -600,6 +600,7 @@ int imap_append_message (CONTEXT *ctx, M + char buf[LONG_STRING]; + char mbox[LONG_STRING]; + char mailbox[LONG_STRING]; ++ char internaldate[IMAP_DATELEN]; + size_t len; + progress_t progressbar; + size_t sent; +@@ -641,12 +642,14 @@ int imap_append_message (CONTEXT *ctx, M + M_PROGRESS_SIZE, NetInc, len); + + imap_munge_mbox_name (mbox, sizeof (mbox), mailbox); +- snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox, ++ imap_make_date (internaldate, msg->received); ++ snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) \"%s\" {%lu}", mbox, + msg->flags.read ? "\\Seen" : "", + msg->flags.read && (msg->flags.replied || msg->flags.flagged) ? " " : "", + msg->flags.replied ? "\\Answered" : "", + msg->flags.replied && msg->flags.flagged ? " " : "", + msg->flags.flagged ? "\\Flagged" : "", ++ internaldate, + (unsigned long) len); + + imap_cmd_start (idata, buf); +--- a/imap/util.c ++++ b/imap/util.c +@@ -577,6 +577,21 @@ time_t imap_parse_date (char *s) + return (mutt_mktime (&t, 0) + tz); + } + ++/* format date in IMAP style: DD-MMM-YYYY HH:MM:SS +ZZzz. ++ * Caller should provide a buffer of IMAP_DATELEN bytes */ ++void imap_make_date (char *buf, time_t timestamp) ++{ ++ struct tm* tm = localtime (×tamp); ++ time_t tz = mutt_local_tz (timestamp); ++ ++ tz /= 60; ++ ++ snprintf (buf, IMAP_DATELEN, "%02d-%s-%d %02d:%02d:%02d %+03d%02d", ++ tm->tm_mday, Months[tm->tm_mon], tm->tm_year + 1900, ++ tm->tm_hour, tm->tm_min, tm->tm_sec, ++ (int) tz / 60, (int) abs (tz) % 60); ++} ++ + /* imap_qualify_path: make an absolute IMAP folder target, given IMAP_MBOX + * and relative path. */ + void imap_qualify_path (char *dest, size_t len, IMAP_MBOX *mx, char* path) diff -Nru mutt-1.5.21/debian/patches/upstream/578087-header-strchr.patch mutt-1.5.20/debian/patches/upstream/578087-header-strchr.patch --- mutt-1.5.21/debian/patches/upstream/578087-header-strchr.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/578087-header-strchr.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -This fixes a segfault that can happen on a malformed message; patch comes from -upstream http://bugs.mutt.org/3483 - ---- a/sendlib.c -+++ b/sendlib.c -@@ -1799,7 +1799,7 @@ - else - { - t = strchr (start, ':'); -- if (t > end) -+ if (!t || t > end) - { - dprint (1, (debugfile, "mwoh: warning: header not in " - "'key: value' format!\n")); diff -Nru mutt-1.5.21/debian/patches/upstream/603288-split-fetches.patch mutt-1.5.20/debian/patches/upstream/603288-split-fetches.patch --- mutt-1.5.21/debian/patches/upstream/603288-split-fetches.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/603288-split-fetches.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -A workaround for Exchange 2010 IMAP protocol, tracked in -http://bugs.mutt.org/3459, already merged in the ubuntu version of mutt - ---- a/imap/message.c -+++ b/imap/message.c -@@ -242,6 +242,15 @@ - char *cmd; - - fetchlast = msgend + 1; -+ /* Microsoft Exchange 2010 violates the IMAP protocol and -+ * starts omitting messages if one FETCHes more than 2047 (or -+ * or somewhere around that number. We therefore split the -+ * FETCH into chunks of 2000 messages each */ -+ if (fetchlast - msgno - 1 > 2000) -+ { -+ fetchlast = msgno+1 + 2000; -+ } -+ - safe_asprintf (&cmd, "FETCH %d:%d (UID FLAGS INTERNALDATE RFC822.SIZE %s)", - msgno + 1, fetchlast, hdrreq); - imap_cmd_start (idata, cmd); diff -Nru mutt-1.5.21/debian/patches/upstream/608706-fix-spelling-errors.patch mutt-1.5.20/debian/patches/upstream/608706-fix-spelling-errors.patch --- mutt-1.5.21/debian/patches/upstream/608706-fix-spelling-errors.patch 2011-02-14 17:04:52.000000000 +0000 +++ mutt-1.5.20/debian/patches/upstream/608706-fix-spelling-errors.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,426 +0,0 @@ -Simple patch to fix some spelling errors, forwarded upstream on: -http://bugs.mutt.org/3493 - ---- a/copy.c -+++ b/copy.c -@@ -77,7 +77,7 @@ - if ((fgets (buf, sizeof (buf), in)) == NULL) - break; - -- /* Is it the begining of a header? */ -+ /* Is it the beginning of a header? */ - if (nl && buf[0] != ' ' && buf[0] != '\t') - { - ignore = 1; -@@ -147,7 +147,7 @@ - if ((fgets (buf, sizeof (buf), in)) == NULL) - break; - -- /* Is it the begining of a header? */ -+ /* Is it the beginning of a header? */ - if (nl && buf[0] != ' ' && buf[0] != '\t') - { - /* Do we have anything pending? */ ---- a/edit.c -+++ b/edit.c -@@ -39,7 +39,7 @@ - * declared "static" (sigh) - */ - static char* EditorHelp1 = N_("\ --~~ insert a line begining with a single ~\n\ -+~~ insert a line beginning with a single ~\n\ - ~b users add users to the Bcc: field\n\ - ~c users add users to the Cc: field\n\ - ~f messages include messages\n\ ---- a/enter.c -+++ b/enter.c -@@ -435,7 +435,7 @@ - break; - - case OP_EDITOR_KILL_WORD: -- /* delete to begining of word */ -+ /* delete to beginning of word */ - if (state->curpos != 0) - { - i = state->curpos; ---- a/crypt.c -+++ b/crypt.c -@@ -224,7 +224,7 @@ - /* free tmp_body if messages was signed AND encrypted ... */ - if (tmp_smime_pbody != msg->content && tmp_smime_pbody != tmp_pbody) - { -- /* detatch and dont't delete msg->content, -+ /* detatch and don't delete msg->content, - which tmp_smime_pbody->parts after signing. */ - tmp_smime_pbody->parts = tmp_smime_pbody->parts->next; - msg->content->next = NULL; ---- a/init.c -+++ b/init.c -@@ -2543,7 +2543,7 @@ - Matches[Num_matched++] = User_typed; - - /* All matches are stored. Longest non-ambiguous string is "" -- * i.e. dont change 'buffer'. Fake successful return this time */ -+ * i.e. don't change 'buffer'. Fake successful return this time */ - if (User_typed[0] == 0) - return 1; - } -@@ -2599,7 +2599,7 @@ - Matches[Num_matched++] = User_typed; - - /* All matches are stored. Longest non-ambiguous string is "" -- * i.e. dont change 'buffer'. Fake successful return this time */ -+ * i.e. don't change 'buffer'. Fake successful return this time */ - if (User_typed[0] == 0) - return 1; - } -@@ -2646,7 +2646,7 @@ - Matches[Num_matched++] = User_typed; - - /* All matches are stored. Longest non-ambiguous string is "" -- * i.e. dont change 'buffer'. Fake successful return this time */ -+ * i.e. don't change 'buffer'. Fake successful return this time */ - if (User_typed[0] == 0) - return 1; - } ---- a/po/mutt.pot -+++ b/po/mutt.pot -@@ -3620,7 +3620,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "" - - #: recvattach.c:775 ---- a/recvattach.c -+++ b/recvattach.c -@@ -707,7 +707,7 @@ - { - if (!mutt_can_decode (top)) - { -- mutt_error (_("I dont know how to print %s attachments!"), type); -+ mutt_error (_("I don't know how to print %s attachments!"), type); - return (0); - } - } ---- a/po/bg.po -+++ b/po/bg.po -@@ -3899,7 +3899,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr " %s !" - - #: recvattach.c:775 ---- a/po/ca.po -+++ b/po/ca.po -@@ -4054,7 +4054,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Es desconeix com imprimir adjuncions de tipus «%s»." - - #: recvattach.c:775 ---- a/po/cs.po -+++ b/po/cs.po -@@ -3781,7 +3781,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Nevím, jak vytisknout přílohy typu %s!." - - #: recvattach.c:775 ---- a/po/da.po -+++ b/po/da.po -@@ -3850,7 +3850,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Kan ikke udskrive %s-brevdele." - - #: recvattach.c:775 ---- a/po/de.po -+++ b/po/de.po -@@ -3779,7 +3779,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Kann %s Anhnge nicht drucken!" - - #: recvattach.c:775 ---- a/po/el.po -+++ b/po/el.po -@@ -4528,7 +4528,7 @@ - # - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr " %s !" - - # ---- a/po/eo.po -+++ b/po/eo.po -@@ -3772,7 +3772,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Mi ne scias presi %s-partojn!" - - #: recvattach.c:775 ---- a/po/es.po -+++ b/po/es.po -@@ -3898,7 +3898,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "No s cmo imprimir archivos adjuntos %s!" - - #: recvattach.c:775 ---- a/po/et.po -+++ b/po/et.po -@@ -3875,7 +3875,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Ma ei tea, kuidas trkkida %s lisasid!" - - #: recvattach.c:775 ---- a/po/eu.po -+++ b/po/eu.po -@@ -3764,7 +3764,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Ez dakit nola inprimatu %s gehigarriak!" - - #: recvattach.c:775 ---- a/po/fr.po -+++ b/po/fr.po -@@ -3958,7 +3958,7 @@ - # , c-format - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Je ne sais pas comment imprimer %s attachements!" - - #: recvattach.c:775 ---- a/po/ga.po -+++ b/po/ga.po -@@ -3809,7 +3809,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "N eol dom conas a phriontil iatin %s!" - - #: recvattach.c:775 ---- a/po/gl.po -+++ b/po/gl.po -@@ -3912,7 +3912,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Non sei cmo imprimir adxuntos %s!" - - #: recvattach.c:775 ---- a/po/hu.po -+++ b/po/hu.po -@@ -3888,7 +3888,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Nem tudom hogyan kell nyomtatni a(z) %s csatolst!" - - #: recvattach.c:775 ---- a/po/id.po -+++ b/po/id.po -@@ -3773,7 +3773,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Saya tidak tahu bagaimana mencetak lampiran %s!" - - #: recvattach.c:775 ---- a/po/it.po -+++ b/po/it.po -@@ -3859,7 +3859,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Non so come stampare allegati %s!" - - #: recvattach.c:775 ---- a/po/ja.po -+++ b/po/ja.po -@@ -3797,7 +3797,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "ɤΤ褦źեե %s 뤫!" - - #: recvattach.c:775 ---- a/po/ko.po -+++ b/po/ko.po -@@ -3863,7 +3863,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "÷ι %s !" - - #: recvattach.c:775 ---- a/po/lt.po -+++ b/po/lt.po -@@ -3904,7 +3904,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "A neinau kaip spausdinti %s priedus!" - - #: recvattach.c:775 ---- a/po/nl.po -+++ b/po/nl.po -@@ -3771,7 +3771,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Kan %s bijlagen niet afdrukken!" - - #: recvattach.c:775 ---- a/po/pl.po -+++ b/po/pl.po -@@ -3788,7 +3788,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Nie wiem jak wydrukowa %s zacznikw!" - - #: recvattach.c:775 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -3932,7 +3932,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Eu no sei como imprimir anexos %s!" - - #: recvattach.c:775 ---- a/po/ru.po -+++ b/po/ru.po -@@ -3795,7 +3795,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr " %s !" - - #: recvattach.c:775 ---- a/po/sk.po -+++ b/po/sk.po -@@ -3920,7 +3920,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Neviem ako tlai prlohy %s!" - - #: recvattach.c:775 ---- a/po/sv.po -+++ b/po/sv.po -@@ -3784,7 +3784,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "Jag vet inte hur %s bilagor ska skrivas ut!" - - #: recvattach.c:775 ---- a/po/tr.po -+++ b/po/tr.po -@@ -3806,7 +3806,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "%s eklerinin nasıl yazdırılacağı bilinmiyor!" - - #: recvattach.c:775 ---- a/po/uk.po -+++ b/po/uk.po -@@ -3846,7 +3846,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr " , %s!" - - #: recvattach.c:775 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -3763,7 +3763,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "我不知道要怎么打印附件 %s！" - - #: recvattach.c:775 ---- a/po/zh_TW.po -+++ b/po/zh_TW.po -@@ -3900,7 +3900,7 @@ - - #: recvattach.c:710 - #, c-format --msgid "I dont know how to print %s attachments!" -+msgid "I don't know how to print %s attachments!" - msgstr "我不知道要怎麼列印 %s 附件!" - - #: recvattach.c:775 diff -Nru mutt-1.5.21/doc/advancedusage.html mutt-1.5.20/doc/advancedusage.html --- mutt-1.5.21/doc/advancedusage.html 2010-09-15 17:10:15.000000000 +0000 +++ mutt-1.5.20/doc/advancedusage.html 2009-06-14 18:54:36.000000000 +0000 @@ -1,6 +1,6 @@ -Chapter 4. Advanced Usage
Chapter 4. Advanced Usage
Prev   Next

Chapter 4. Advanced Usage

Table of Contents

1. Character Set Handling
2. Regular Expressions
3. Patterns: Searching, Limiting and Tagging
3.1. Pattern Modifier
3.2. Simple Searches
3.3. Nesting and Boolean Operators
3.4. Searching by Date
4. Using Tags
5. Using Hooks
5.1. Message Matching in Hooks
6. External Address Queries
7. Mailbox Formats
8. Mailbox Shortcuts
9. Handling Mailing Lists
10. New Mail Detection
10.1. How New Mail Detection Works
10.2. Polling For New Mail
11. Editing Threads
11.1. Linking Threads
11.2. Breaking Threads
12. Delivery Status Notification (DSN) Support
13. Start a WWW Browser on URLs
14. Miscellany

1. Character Set Handling

-A “character set” is basically a mapping between bytes and -glyphs and implies a certain character encoding scheme. For example, for -the ISO 8859 family of character sets, an encoding of 8bit per character -is used. For the Unicode character set, different character encodings -may be used, UTF-8 being the most popular. In UTF-8, a character is -represented using a variable number of bytes ranging from 1 to 4. -

-Since Mutt is a command-line tool run from a shell, and delegates -certain tasks to external tools (such as an editor for composing/editing -messages), all of these tools need to agree on a character set and -encoding. There exists no way to reliably deduce the character set a -plain text file has. Interoperability is gained by the use of -well-defined environment variables. The full set can be printed by -issuing locale on the command line. -

-Upon startup, Mutt determines the character set on its own using -routines that inspect locale-specific environment variables. Therefore, -it is generally not necessary to set the $charset -variable in Mutt. It may even be counter-productive as Mutt uses system -and library functions that derive the character set themselves and on -which Mutt has no influence. It's safest to let Mutt work out the locale -setup itself. -

-If you happen to work with several character sets on a regular basis, -it's highly advisable to use Unicode and an UTF-8 locale. Unicode can -represent nearly all characters in a message at the same time. When not -using a Unicode locale, it may happen that you receive messages with -characters not representable in your locale. When displaying such a -message, or replying to or forwarding it, information may get lost -possibly rendering the message unusable (not only for you but also for -the recipient, this breakage is not reversible as lost information -cannot be guessed). -

-A Unicode locale makes all conversions superfluous which eliminates the -risk of conversion errors. It also eliminates potentially wrong -expectations about the character set between Mutt and external programs. -

-The terminal emulator used also must be properly configured for the -current locale. Terminal emulators usually do not -derive the locale from environment variables, they need to be configured -separately. If the terminal is incorrectly configured, Mutt may display -random and unexpected characters (question marks, octal codes, or just -random glyphs), format strings may not work as expected, you may not be -abled to enter non-ascii characters, and possible more. Data is always -represented using bytes and so a correct setup is very important as to -the machine, all character sets “look” the same. -

-Warning: A mismatch between what system and library functions think the -locale is and what Mutt was told what the locale is may make it behave -badly with non-ascii input: it will fail at seemingly random places. -This warning is to be taken seriously since not only local mail handling -may suffer: sent messages may carry wrong character set information the -receiver has too deal with. The need to set -$charset directly in most cases points at terminal -and environment variable setup problems, not Mutt problems. -

-A list of officially assigned and known character sets can be found at -IANA, -a list of locally supported locales can be obtained by running -locale -a. -

2. Regular Expressions

-All string patterns in Mutt including those in more complex patterns must be specified using regular -expressions (regexp) in the “POSIX extended” syntax (which +

Chapter 4. Advanced Usage
Prev   Next

Chapter 4. Advanced Usage

Table of Contents

1. Regular Expressions
2. Patterns: Searching, Limiting and Tagging
2.1. Pattern Modifier
2.2. Simple Searches
2.3. Nesting and Boolean Operators
2.4. Searching by Date
3. Using Tags
4. Using Hooks
4.1. Message Matching in Hooks
5. External Address Queries
6. Mailbox Formats
7. Mailbox Shortcuts
8. Handling Mailing Lists
9. Handling multiple folders
10. Editing Threads
10.1. Linking Threads
10.2. Breaking Threads
11. Delivery Status Notification (DSN) Support
12. Start a WWW Browser on URLs
13. Miscellany

1. Regular Expressions

+All string patterns in Mutt including those in more complex +patterns must be specified +using regular expressions (regexp) in the “POSIX extended” syntax (which is more or less the syntax used by egrep and GNU awk). For your convenience, we have included below a brief description of this syntax.

The search is case sensitive if the pattern contains at least one upper case letter, and case insensitive otherwise. -

Note

-“\” must be quoted if used for a regular expression in an -initialization command: “\\”. +

Note

+“\” +must be quoted if used for a regular expression in an initialization +command: “\\”.

A regular expression is a pattern that describes a set of strings. Regular expressions are constructed analogously to arithmetic expressions, by using various operators to combine smaller expressions. -

Note

-The regular expression can be enclosed/delimited by either " or ' which -is useful if the regular expression includes a white-space character. -See Syntax of Initialization Files for more information on " and ' -delimiter processing. To match a literal " or ' you must preface it -with \ (backslash). +

Note

+The regular expression can be enclosed/delimited by either " +or ' which is useful if the regular expression includes a white-space +character. See Syntax of Initialization Files +for more information on " and ' delimiter processing. To match a +literal " or ' you must preface it with \ (backslash).

-The fundamental building blocks are the regular expressions that match a -single character. Most characters, including all letters and digits, +The fundamental building blocks are the regular expressions that match +a single character. Most characters, including all letters and digits, are regular expressions that match themselves. Any metacharacter with special meaning may be quoted by preceding it with a backslash.

-The period “.” matches any single character. The caret -“^” and the dollar sign “$” are metacharacters -that respectively match the empty string at the beginning and end of a -line. -

-A list of characters enclosed by “[” and “]” -matches any single character in that list; if the first character of the -list is a caret “^” then it matches any character -not in the list. For example, the regular -expression [0123456789] matches any single digit. -A range of ASCII characters may be specified by giving the first and -last characters, separated by a hyphen “-”. Most -metacharacters lose their special meaning inside lists. To include a -literal “]” place it first in the list. Similarly, to -include a literal “^” place it anywhere but first. -Finally, to include a literal hyphen “-” place it last. +The period “.” matches any single character. The caret “^” and +the dollar sign “$” are metacharacters that respectively match +the empty string at the beginning and end of a line. +

+A list of characters enclosed by “[” and “]” matches any +single character in that list; if the first character of the list +is a caret “^” then it matches any character not in the +list. For example, the regular expression [0123456789] +matches any single digit. A range of ASCII characters may be specified +by giving the first and last characters, separated by a hyphen +“-”. Most metacharacters lose their special meaning inside +lists. To include a literal “]” place it first in the list. +Similarly, to include a literal “^” place it anywhere but first. +Finally, to include a literal hyphen “-” place it last.

Certain named classes of characters are predefined. Character classes -consist of “[:”, a keyword denoting the class, and -“:]”. The following classes are defined by the POSIX -standard in +consist of “[:”, a keyword denoting the class, and “:]”. +The following classes are defined by the POSIX standard in Table 4.1, “POSIX regular expression character classes” -

Table 4.1. POSIX regular expression character classes

Character classDescription
[:alnum:]Alphanumeric characters
[:alpha:]Alphabetic characters
[:blank:]Space or tab characters
[:cntrl:]Control characters
[:digit:]Numeric characters
[:graph:]Characters that are both printable and visible. (A space is printable, but not visible, while an “a” is both)
[:lower:]Lower-case alphabetic characters
[:print:]Printable characters (characters that are not control characters)
[:punct:]Punctuation characters (characters that are not letter, digits, control characters, or space characters)
[:space:]Space characters (such as space, tab and formfeed, to name a few)
[:upper:]Upper-case alphabetic characters
[:xdigit:]Characters that are hexadecimal digits

+

Table 4.1. POSIX regular expression character classes

Character classDescription
[:alnum:]Alphanumeric characters
[:alpha:]Alphabetic characters
[:blank:]Space or tab characters
[:cntrl:]Control characters
[:digit:]Numeric characters
[:graph:]Characters that are both printable and visible. (A space is printable, but not visible, while an “a” is both)
[:lower:]Lower-case alphabetic characters
[:print:]Printable characters (characters that are not control characters)
[:punct:]Punctuation characters (characters that are not letter, digits, control characters, or space characters)
[:space:]Space characters (such as space, tab and formfeed, to name a few)
[:upper:]Upper-case alphabetic characters
[:xdigit:]Characters that are hexadecimal digits

A character class is only valid in a regular expression inside the brackets of a character list. -

Note

-Note that the brackets in these class names are part of the symbolic -names, and must be included in addition to the brackets delimiting the -bracket list. For example, [[:digit:]] is -equivalent to [0-9]. +

Note

+Note that the brackets in these +class names are part of the symbolic names, and must be included +in addition to the brackets delimiting the bracket list. For +example, [[:digit:]] is equivalent to +[0-9].

Two additional special sequences can appear in character lists. These apply to non-ASCII character sets, which can have single symbols (called @@ -153,21 +90,17 @@ sorting purposes:

Collating Symbols

A collating symbol is a multi-character collating element enclosed in -“[.” and “.]”. For example, if -“ch” is a collating element, then -[[.ch.]] is a regexp that matches this collating -element, while [ch] is a regexp that matches either -“c” or “h”. +“[.” and “.]”. For example, if “ch” is a collating +element, then [[.ch.]] is a regexp that matches +this collating element, while [ch] is a regexp that +matches either “c” or “h”.

Equivalence Classes

-An equivalence class is a locale-specific name for a list of characters -that are equivalent. The name is enclosed in “[=” and -“=]”. For example, the name “e” might be used -to represent all of “e” with grave -(“è”), “e” with acute -(“é”) and “e”. In this case, -[[=e=]] is a regexp that matches any of: -“e” with grave (“è”), “e” -with acute (“é”) and “e”. +An equivalence class is a locale-specific name for a list of +characters that are equivalent. The name is enclosed in “[=” +and “=]”. For example, the name “e” might be used to +represent all of “è” “é” and “e”. In this case, +[[=e=]] is a regexp that matches any of +“è”, “é” and “e”.

A regular expression matching a single character may be followed by one of several repetition operators described in Table 4.2, “Regular expression repetition operators”. @@ -176,272 +109,258 @@ expression matches any string formed by concatenating two substrings that respectively match the concatenated subexpressions.

-Two regular expressions may be joined by the infix operator -“|”; the resulting regular expression matches any string -matching either subexpression. +Two regular expressions may be joined by the infix operator “|”; +the resulting regular expression matches any string matching either +subexpression.

Repetition takes precedence over concatenation, which in turn takes precedence over alternation. A whole subexpression may be enclosed in parentheses to override these precedence rules. -

Note

+

Note

If you compile Mutt with the included regular expression engine, the -following operators may also be used in regular expressions as described -in Table 4.3, “GNU regular expression extensions”. +following operators may also be used in regular expressions as described in Table 4.3, “GNU regular expression extensions”.

Table 4.3. GNU regular expression extensions

ExpressionDescription
\\yMatches the empty string at either the beginning or the end of a word
\\BMatches the empty string within a word
\\<Matches the empty string at the beginning of a word
\\>Matches the empty string at the end of a word
\\wMatches any word-constituent character (letter, digit, or underscore)
\\WMatches any character that is not word-constituent
\\`Matches the empty string at the beginning of a buffer (string)
\\'Matches the empty string at the end of a buffer

Please note however that these operators are not defined by POSIX, so they may or may not be available in stock libraries on various systems. -

3. Patterns: Searching, Limiting and Tagging

3.1. Pattern Modifier

+

2. Patterns: Searching, Limiting and Tagging

2.1. Pattern Modifier

Many of Mutt's commands allow you to specify a pattern to match (limit, tag-pattern, delete-pattern, etc.). Table 4.4, “Pattern modifiers” shows several ways to select messages. -

Table 4.4. Pattern modifiers

Pattern modifierDescription
~Aall messages
~b EXPRmessages which contain EXPR in the message body
=b STRINGmessages which contain STRING in the message body. If IMAP is enabled, searches for STRING on the server, rather than downloading each message and searching it locally.
~B EXPRmessages which contain EXPR in the whole message
~c EXPRmessages carbon-copied to EXPR
%c GROUPmessages carbon-copied to any member of GROUP
~C EXPRmessages either to: or cc: EXPR
%C GROUPmessages either to: or cc: to any member of GROUP
~d [MIN]-[MAX]messages with “date-sent” in a Date range
~Ddeleted messages
~e EXPRmessages which contains EXPR in the “Sender” field
%e GROUPmessages which contain a member of GROUP in the “Sender” field
~Eexpired messages
~Fflagged messages
~f EXPRmessages originating from EXPR
%f GROUPmessages originating from any member of GROUP
~gcryptographically signed messages
~Gcryptographically encrypted messages
~h EXPRmessages which contain EXPR in the message header
~H EXPRmessages with a spam attribute matching EXPR
~i EXPRmessages which match EXPR in the “Message-ID” field
~kmessages which contain PGP key material
~L EXPRmessages either originated or received by EXPR
%L GROUPmessage either originated or received by any member of GROUP
~lmessages addressed to a known mailing list
~m [MIN]-[MAX]messages in the range MIN to MAX *)
~n [MIN]-[MAX]messages with a score in the range MIN to MAX *)
~Nnew messages
~Oold messages
~pmessages addressed to you (consults alternates)
~Pmessages from you (consults alternates)
~Qmessages which have been replied to
~r [MIN]-[MAX]messages with “date-received” in a Date range
~Rread messages
~s EXPRmessages having EXPR in the “Subject” field.
~Ssuperseded messages
~t EXPRmessages addressed to EXPR
~Ttagged messages
~umessages addressed to a subscribed mailing list
~Uunread messages
~vmessages part of a collapsed thread.
~Vcryptographically verified messages
~x EXPRmessages which contain EXPR in the “References” or “In-Reply-To” field
~X [MIN]-[MAX]messages with MIN to MAX attachments *)
~y EXPRmessages which contain EXPR in the “X-Label” field
~z [MIN]-[MAX]messages with a size in the range MIN to MAX *) **)
~=duplicated messages (see $duplicate_threads)
~$unreferenced messages (requires threaded view)
~(PATTERN)messages in threads +

Table 4.4. Pattern modifiers

Pattern modifierDescription
~Aall messages
~b EXPRmessages which contain EXPR in the message body
=b STRINGmessages which contain STRING in the message body. If IMAP is enabled, searches for STRING on the server, rather than downloading each message and searching it locally.
~B EXPRmessages which contain EXPR in the whole message
~c EXPRmessages carbon-copied to EXPR
%c GROUPmessages carbon-copied to any member of GROUP
~C EXPRmessages either to: or cc: EXPR
%C GROUPmessages either to: or cc: to any member of GROUP
~d [MIN]-[MAX]messages with “date-sent” in a Date range
~Ddeleted messages
~e EXPRmessages which contains EXPR in the “Sender” field
%e GROUPmessages which contain a member of GROUP in the “Sender” field
~Eexpired messages
~Fflagged messages
~f EXPRmessages originating from EXPR
%f GROUPmessages originating from any member of GROUP
~gcryptographically signed messages
~Gcryptographically encrypted messages
~h EXPRmessages which contain EXPR in the message header
~H EXPRmessages with a spam attribute matching EXPR
~i EXPRmessages which match EXPR in the “Message-ID” field
~kmessages which contain PGP key material
~L EXPRmessages either originated or received by EXPR
%L GROUPmessage either originated or received by any member of GROUP
~lmessages addressed to a known mailing list
~m [MIN]-[MAX]messages in the range MIN to MAX *)
~n [MIN]-[MAX]messages with a score in the range MIN to MAX *)
~Nnew messages
~Oold messages
~pmessages addressed to you (consults alternates)
~Pmessages from you (consults alternates)
~Qmessages which have been replied to
~r [MIN]-[MAX]messages with “date-received” in a Date range
~Rread messages
~s EXPRmessages having EXPR in the “Subject” field.
~Ssuperseded messages
~t EXPRmessages addressed to EXPR
~Ttagged messages
~umessages addressed to a subscribed mailing list
~Uunread messages
~vmessages part of a collapsed thread.
~Vcryptographically verified messages
~x EXPRmessages which contain EXPR in the “References” or “In-Reply-To” field
~X [MIN]-[MAX]messages with MIN to MAX attachments *)
~y EXPRmessages which contain EXPR in the “X-Label” field
~z [MIN]-[MAX]messages with a size in the range MIN to MAX *) **)
~=duplicated messages (see $duplicate_threads)
~$unreferenced messages (requires threaded view)
~(PATTERN)messages in threads containing messages matching PATTERN, e.g. all threads containing messages from you: ~(~P)

-Where EXPR is a regular expression, and GROUP is an -address group. +Where EXPR is a +regular expression.

-*) The forms “<[MAX]”, -“>[MIN]”, -“[MIN]-” and -“-[MAX]” are allowed, too. -

-**) The suffixes “K” and “M” are allowed to -specify kilobyte and megabyte respectively. -

-Special attention has to be payed when using regular expressions inside -of patterns. Specifically, Mutt's parser for these patterns will strip -one level of backslash (“\”), which is normally used for -quoting. If it is your intention to use a backslash in the regular -expression, you will need to use two backslashes instead -(“\\”). You can force Mutt to treat -EXPR as a simple string instead of a regular -expression by using = instead of ~ in the pattern name. For example, -=b *.* will find all messages that contain the -literal string “*.*”. Simple string matches are less -powerful than regular expressions but can be considerably faster. This -is especially true for IMAP folders, because string matches can be -performed on the server instead of by fetching every message. IMAP -treats =h specially: it must be of the form -“header: substring” and will not partially match header -names. The substring part may be omitted if you simply wish to find -messages containing a particular header without regard to its value. -

-Patterns matching lists of addresses (notably c, C, p, P and t) match if -there is at least one match in the whole list. If you want to make sure -that all elements of that list match, you need to prefix your pattern -with “^”. This example matches all mails which only has -recipients from Germany. +*) The forms “<[MAX]”, “>[MIN]”, +“[MIN]-” and “-[MAX]” +are allowed, too. +

+**) The suffixes “K” and “M” are allowed to specify kilobyte and megabyte respectively. +

+Special attention has to be +payed when using regular expressions inside of patterns. Specifically, +Mutt's parser for these patterns will strip one level of backslash (“\”), +which is normally used for quoting. If it is your intention to use a +backslash in the regular expression, you will need to use two backslashes +instead (“\\”). You can force Mutt to treat EXPR as a simple string +instead of a regular expression by using = instead of ˜ in the +pattern name. For example, =b *.* will find all messages that contain +the literal string “*.*”. Simple string matches are less powerful than +regular expressions but can be considerably faster. This is especially +true for IMAP folders, because string matches can be performed on the +server instead of by fetching every message. IMAP treats =h specially: +it must be of the form “header: substring” and will not partially +match header names. The substring part may be omitted if you simply +wish to find messages containing a particular header without regard to +its value. +

+Patterns matching lists of addresses (notably c, C, p, P and t) +match if there is at least one match in the whole list. If you want to +make sure that all elements of that list match, you need to prefix your +pattern with “^”. +This example matches all mails which only has recipients from Germany.

Example 4.1. Matching all addresses in address lists

 ^~C \.de$
-

3.2. Simple Searches

-Mutt supports two versions of so called “simple -searches”. These are issued if the query entered for searching, -limiting and similar operations does not seem to contain a valid pattern -modifier (i.e. it does not contain one of these characters: -“~”, “=” or “%”). If the query is -supposed to contain one of these special characters, they must be -escaped by prepending a backslash (“\”). +


2.2. Simple Searches

+Mutt supports two versions of so called “simple searches”. These are +issued if the query entered for searching, limiting and similar +operations does not seem to contain a valid pattern modifier (i.e. it does not contain +one of these characters: “˜”, “=” or “%”). If the query is +supposed to contain one of these special characters, they must be escaped +by prepending a backslash (“\”).

The first type is by checking whether the query string equals a keyword case-insensitively from Table 4.5, “Simple search keywords”: If that is the case, Mutt will use the shown pattern modifier instead. If a keyword would conflict with your search keyword, you need to turn it into a regular expression to avoid matching the keyword table. For -example, if you want to find all messages matching “flag” -(using $simple_search) +example, if you want to find all messages matching “flag” +(using $simple_search) but don't want to match flagged messages, simply search for -“[f]lag”. +“[f]lag”.

Table 4.5. Simple search keywords

KeywordPattern modifier
all~A
.~A
^~A
del~D
flag~F
new~N
old~O
repl~Q
read~R
tag~T
unread~U

-The second type of simple search is to build a complex search pattern -using $simple_search as a -template. Mutt will insert your query properly quoted and search for the -composed complex query. -

3.3. Nesting and Boolean Operators

+The second type of simple search is to build a complex search +pattern using $simple_search +as a template. Mutt will insert your query properly quoted and search +for the composed complex query. +

2.3. Nesting and Boolean Operators

Logical AND is performed by specifying more than one criterion. For example: 

 ~t mutt ~f elkins

-would select messages which contain the word “mutt” in the -list of recipients and that have the word -“elkins” in the “From” header field. -

-Mutt also recognizes the following operators to create more complex -search patterns: -

  • +would select messages which contain the word “mutt” in the list of +recipients and that have the word “elkins” in the “From” header +field. +

    +Mutt also recognizes the following operators to create more complex search +patterns: +

    • ! — logical NOT operator -

    • +

    • | — logical OR operator -

    • +

    • () — logical grouping operator

    -Here is an example illustrating a complex search pattern. This pattern -will select all messages which do not contain “mutt” in the -“To” or “Cc” field and which are from -“elkins”. +Here is an example illustrating a complex search pattern. This pattern will +select all messages which do not contain “mutt” in the “To” or “Cc” +field and which are from “elkins”.

    Example 4.2. Using boolean operators in patterns

     !(~t mutt|~c mutt) ~f elkins

    -Here is an example using white space in the regular expression (note the -“'” and “"” delimiters). For this to match, -the mail's subject must match the “^Junk +From +Me$” and it -must be from either “Jim +Somebody” or “Ed -+SomeoneElse”: -

    -'~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")'
-

    Note

    -If a regular expression contains parenthesis, or a vertical bar ("|"), -you must enclose the expression in double or single -quotes since those characters are also used to separate different parts -of Mutt's pattern language. For example: ~f -"me@(mutt\.org|cs\.hmc\.edu)" Without the quotes, the -parenthesis wouldn't end. This would be separated to two OR'd patterns: -~f me@(mutt\.org and -cs\.hmc\.edu). They are never what you want. -

3.4. Searching by Date

-Mutt supports two types of dates, absolute and -relative. -

3.4.1. Absolute Dates

-Dates must be in DD/MM/YY format (month and year -are optional, defaulting to the current month and year). An example of -a valid range of dates is: +Here is an example using white space in the regular expression (note +the ' and " delimiters). For this to match, the mail's subject must +match the “^Junk +From +Me$” and it must be from either “Jim +Somebody” +or “Ed +SomeoneElse”: +

+ '~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")'
+

Note

+If a regular expression contains parenthesis, or a vertical bar +("|"), you must enclose the expression in double or single quotes since +those characters are also used to separate different parts of Mutt's +pattern language. For example: ~f "me@(mutt\.org|cs\.hmc\.edu)" +Without the quotes, the parenthesis wouldn't end. +This would be separated to two OR'd patterns: ˜f me@(mutt\.org +and cs\.hmc\.edu). They are never what you want. +

2.4. Searching by Date

+Mutt supports two types of dates, absolute and relative. +

2.4.1. Absolute Dates

+Dates must be in DD/MM/YY format (month and year are +optional, defaulting to the current month and year). An example of a valid +range of dates is: 

 Limit to messages matching: ~d 20/1/95-31/10

-If you omit the minimum (first) date, and just specify -“-DD/MM/YY”, all messages before the -given date will be selected. If you omit the maximum (second) date, and -specify “DD/MM/YY-”, all messages -after the given date will be selected. If you -specify a single date with no dash (“-”), only messages -sent on the given date will be selected. -

-You can add error margins to absolute dates. An error margin is a sign -(+ or -), followed by a digit, followed by one of the units in Table 4.6, “Date units”. As a special case, you can replace the sign -by a “*” character, which is equivalent to giving identical -plus and minus error margins. +If you omit the minimum (first) date, and just specify “-DD/MM/YY”, all +messages before the given date will be selected. If you omit the maximum +(second) date, and specify “DD/MM/YY-”, all messages after the given +date will be selected. If you specify a single date with no dash (“-”), +only messages sent on the given date will be selected. +

+You can add error margins to absolute dates. +An error margin is a sign (+ or -), followed by a digit, followed by +one of the units in Table 4.6, “Date units”. As a special case, you can replace the +sign by a “*” character, which is equivalent to giving identical plus and minus error margins.

Table 4.6. Date units

UnitDescription
yYears
mMonths
wWeeks
dDays

-Example: To select any messages two weeks around January 15, 2001, you'd -use the following pattern: +Example: To select any messages two weeks around January 15, 2001, +you'd use the following pattern: 

 Limit to messages matching: ~d 15/1/2001*2w
-

3.4.2. Relative Dates

-This type of date is relative to the current date, and may be specified -as: -

  • ->offset for messages older than -offset units -

  • -<offset for messages newer than -offset units -

  • -=offset for messages exactly -offset units old +

2.4.2. Relative Dates

+This type of date is relative to the current date, and may +be specified as: +

  • +>offset for messages older than offset units +

  • +<offset for messages newer than offset units +

  • +=offset for messages exactly offset units old

-offset is specified as a positive number with one -of the units from Table 4.6, “Date units”. +offset is specified as a positive number with one of the units from Table 4.6, “Date units”.

Example: to select messages less than 1 month old, you would use 

 Limit to messages matching: ~d <1m
-

Note

+

Note

All dates used when searching are relative to the -local time zone, so unless you change the setting -of your $index_format to include a -%[...] format, these are not the -dates shown in the main index. -

4. Using Tags

-Sometimes it is desirable to perform an operation on a group of messages -all at once rather than one at a time. An example might be to save -messages to a mailing list to a separate folder, or to delete all -messages with a given subject. To tag all messages matching a pattern, -use the <tag-pattern> function, which is bound -to “shift-T” by default. Or you can select individual -messages by hand using the <tag-message> -function, which is bound to “t” by default. See patterns for Mutt's pattern matching syntax. +local time zone, so unless you change the setting of your $index_format to include a +%[...] format, these are not the dates shown +in the main index. +

3. Using Tags

+Sometimes it is desirable to perform an operation on a group of +messages all at once rather than one at a time. An example might be +to save messages to a mailing list to a separate folder, or to +delete all messages with a given subject. To tag all messages +matching a pattern, use the <tag-pattern> function, which is bound to +“shift-T” by default. Or you can select individual messages by +hand using the <tag-message> function, which is bound to “t” by +default. See patterns for Mutt's pattern +matching syntax.

Once you have tagged the desired messages, you can use the -“tag-prefix” operator, which is the “;” -(semicolon) key by default. When the “tag-prefix” operator -is used, the next operation will be applied to all -tagged messages if that operation can be used in that manner. If the -$auto_tag variable is set, the next -operation applies to the tagged messages automatically, without -requiring the “tag-prefix”. -

-In macros or push commands, you can use the -<tag-prefix-cond> operator. If there are no -tagged messages, Mutt will “eat” the rest of the macro to -abort it's execution. Mutt will stop “eating” the macro -when it encounters the <end-cond> operator; -after this operator the rest of the macro will be executed as normal. -

5. Using Hooks

-A hook is a concept found in many other programs -which allows you to execute arbitrary commands before performing some -operation. For example, you may wish to tailor your configuration based -upon which mailbox you are reading, or to whom you are sending mail. In -the Mutt world, a hook consists of a regular expression or pattern along with a configuration -option/command. See: +“tag-prefix” operator, which is the “;” (semicolon) key by default. +When the “tag-prefix” operator is used, the next operation will +be applied to all tagged messages if that operation can be used in that +manner. If the $auto_tag +variable is set, the next operation applies to the tagged messages +automatically, without requiring the “tag-prefix”. +

+In macros or push commands, +you can use the <tag-prefix-cond> operator. If there are no tagged +messages, Mutt will “eat” the rest of the macro to abort it's execution. +Mutt will stop “eating” the macro when it encounters the <end-cond> +operator; after this operator the rest of the macro will be executed as +normal. +

4. Using Hooks

+A hook is a concept found in many other programs which allows you to +execute arbitrary commands before performing some operation. For example, +you may wish to tailor your configuration based upon which mailbox you are +reading, or to whom you are sending mail. In the Mutt world, a hook +consists of a regular expression or +pattern along with a +configuration option/command. See: -

  • +

    for specific details on each type of hook available. -

    Note

    -If a hook changes configuration settings, these changes remain effective -until the end of the current Mutt session. As this is generally not -desired, a “default” hook needs to be added before all -other hooks of that type to restore configuration defaults. -

    Example 4.3. Specifying a “default” hook

    +
    Note
    
+If a hook changes configuration settings, these changes remain
+effective until the end of the current Mutt session. As this is generally
+not desired, a “default” hook needs to be added before all
+other hooks  of that type to restore configuration defaults.
+
    Example 4.3. Specifying a “default” hook
     send-hook . 'unmy_hdr From:'
 send-hook ~C'^b@b\.b$' my_hdr from: c@c.c
 

    
-In Example 4.3, “Specifying a “default” hook”, by default the value of $from and $realname is not overridden. When sending
-messages either To: or Cc: to <b@b.b>, the
-From: header is changed to <c@c.c>.
-
    5.1. Message Matching in Hooks
    
-Hooks that act upon messages (message-hook,
-reply-hook, send-hook,
-send2-hook, save-hook,
-fcc-hook) are evaluated in a slightly different
-manner. For the other types of hooks, a regular
-expression is sufficient.  But in dealing with messages a finer
-grain of control is needed for matching since for different purposes you
-want to match different criteria.
-
    
-Mutt allows the use of the search
-pattern language for matching messages in hook commands.  This
-works in exactly the same way as it would when
-limiting or searching the
-mailbox, except that you are restricted to those operators which match
-information Mutt extracts from the header of the message (i.e., from,
-to, cc, date, subject, etc.).
+In Example 4.3, “Specifying a default hook”, by default the value of
+$from
+and $realname
+is not overridden. When sending messages either To: or Cc:
+to <b@b.b>, the From: header is changed to
+<c@c.c>.
+
    4.1. Message Matching in Hooks
    
+Hooks that act upon messages (message-hook, reply-hook,
+send-hook, send2-hook, save-hook, fcc-hook) are evaluated in a
+slightly different manner. For the other
+types of hooks, a regular expression is
+sufficient.  But in dealing with messages a finer grain of control is
+needed for matching since for different purposes you want to match
+different criteria.
+
    
+Mutt allows the use of the search pattern
+language for matching messages in hook commands.  This works in
+exactly the same way as it would when limiting or
+searching the mailbox, except that you are restricted to those
+operators which match information Mutt extracts from the header of
+the message (i.e., from, to, cc, date, subject, etc.).
 
    
 For example, if you wanted to set your return address based upon sending
 mail to a specific address, you could do something like:
@@ -451,20 +370,21 @@
 which would execute the given command when sending mail to
 me@cs.hmc.edu.
 
    
-However, it is not required that you write the pattern to match using
-the full searching language.  You can still specify a simple
-regular expression like the other hooks, in which
-case Mutt will translate your pattern into the full language, using the
-translation specified by the $default_hook variable.  The pattern is
-translated at the time the hook is declared, so the value of $default_hook that is in effect at that
-time will be used.
-
    6. External Address Queries
    
+However, it is not required that you write the pattern to match using the
+full searching language.  You can still specify a simple regular
+expression like the other hooks, in which case Mutt will translate your
+pattern into the full language, using the translation specified by the
+$default_hook variable.  The
+pattern is translated at the time the hook is declared, so the value of
+$default_hook that is in effect
+at that time will be used.
+

    5. External Address Queries

    Mutt supports connecting to external directory databases such as LDAP, ph/qi, bbdb, or NIS through a wrapper script which connects to Mutt -using a simple interface. Using the $query_command variable, you specify the -wrapper command to use. For example: +using a simple interface. Using the $query_command variable, you specify the wrapper +command to use. For example: 

    -set query_command = "mutt_ldap_query.pl %s"
+set query_command = "mutt_ldap_query.pl '%s'"

    The wrapper script should accept the query on the command-line. It should return a one line message, then each matching response on a @@ -480,294 +400,273 @@ roessler@does-not-exist.org Thomas Roessler mutt pgp

    There are two mechanisms for accessing the query function of Mutt. One -is to do a query from the index menu using the -<query> function (default: Q). This will -prompt for a query, then bring up the query menu which will list the -matching responses. From the query menu, you can select addresses to -create aliases, or to mail. You can tag multiple addresses to mail, -start a new query, or have a new query appended to the current +is to do a query from the index menu using the <query> function (default: Q). +This will prompt for a query, then bring up the query menu which will +list the matching responses. From the query menu, you can select +addresses to create aliases, or to mail. You can tag multiple addresses +to mail, start a new query, or have a new query appended to the current responses.

    The other mechanism for accessing the query function is for address completion, similar to the alias completion. In any prompt for address -entry, you can use the <complete-query> -function (default: ^T) to run a query based on the current address you -have typed. Like aliases, Mutt will look for what you have typed back -to the last space or comma. If there is a single response for that -query, Mutt will expand the address in place. If there are multiple -responses, Mutt will activate the query menu. At the query menu, you -can select one or more addresses to be added to the prompt. -

    7. Mailbox Formats

    -Mutt supports reading and writing of four different local mailbox -formats: mbox, MMDF, MH and Maildir. The mailbox type is auto detected, -so there is no need to use a flag for different mailbox types. When -creating new mailboxes, Mutt uses the default specified with the $mbox_type variable. A short description of -the formats follows. -

    -mbox. This is a widely used mailbox format for -UNIX. All messages are stored in a single file. Each message has a -line of the form: +entry, you can use the <complete-query> function (default: ^T) to run a +query based on the current address you have typed. Like aliases, Mutt +will look for what you have typed back to the last space or comma. If +there is a single response for that query, Mutt will expand the address +in place. If there are multiple responses, Mutt will activate the query +menu. At the query menu, you can select one or more addresses to be +added to the prompt. +

    6. Mailbox Formats

    +Mutt supports reading and writing of four different local mailbox formats: +mbox, MMDF, MH and Maildir. The mailbox type is autodetected, so there +is no need to use a flag for different mailbox types. When creating new +mailboxes, Mutt uses the default specified with the +$mbox_type variable. A +short description of the formats follows. +

    +mbox. This is a widely used mailbox format for UNIX. All +messages are stored in a single file. Each message has a line of the form: 

     From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST

    to denote the start of a new message (this is often referred to as the -“From_” line). The mbox format requires mailbox locking, is -prone to mailbox corruption with concurrently writing clients or -misinterpreted From_ lines. Depending on the environment, new mail -detection can be unreliable. Mbox folders are fast to open and easy to -archive. -

    -MMDF. This is a variant of the -mbox format. Each message is surrounded by lines -containing “^A^A^A^A” (four times control-A's). The same -problems as for mbox apply (also with finding the right message -separator as four control-A's may appear in message bodies). +“From_” line). The mbox format requires mailbox +locking, is prone to mailbox corruption with concurrently writing +clients or misinterpreted From_ lines. Depending on the +environment, new mail detection can be unreliable. Mbox folders are fast +to open and easy to archive. +

    +MMDF. This is a variant of +the mbox format. Each message is surrounded by +lines containing “^A^A^A^A” (four +control-A's). The same problems as for mbox apply (also with finding the +right message separator as four control-A's may appear in message +bodies).

    -MH. A radical departure from -mbox and MMDF, a mailbox +MH. A radical departure from mbox and MMDF, a mailbox consists of a directory and each message is stored in a separate file. The filename indicates the message number (however, this is may not correspond to the message number Mutt displays). Deleted messages are -renamed with a comma (“,”) prepended to the filename. Mutt -detects this type of mailbox by looking for either -.mh_sequences or .xmhcache files -(needed to distinguish normal directories from MH mailboxes). MH is more -robust with concurrent clients writing the mailbox, but still may suffer -from lost flags; message corruption is less likely to occur than with -mbox/mmdf. It's usually slower to open compared to mbox/mmdf since many -small files have to be read (Mutt provides Section 7.1, “Header Caching” to greatly speed this process up). Depending -on the environment, MH is not very disk-space efficient. -

    -Maildir. The newest of the mailbox formats, used -by the Qmail MTA (a replacement for sendmail). Similar to -MH, except that it adds three subdirectories of the -mailbox: tmp, new and -cur. Filenames for the messages are chosen in such -a way they are unique, even when two programs are writing the mailbox -over NFS, which means that no file locking is needed and corruption is -very unlikely. Maildir maybe slower to open without caching in Mutt, it -too is not very disk-space efficient depending on the environment. Since -no additional files are used for metadata (which is embedded in the -message filenames) and Maildir is locking-free, it's easy to sync across -different machines using file-level synchronization tools. -

    8. Mailbox Shortcuts

    -There are a number of built in shortcuts which refer to specific -mailboxes. These shortcuts can be used anywhere you are prompted for a -file or mailbox path or in path-related configuration variables. Note -that these only work at the beginning of a string. -

    Table 4.7. Mailbox shortcuts

    ShortcutRefers to...
    !your $spoolfile (incoming) mailbox
    >your $mbox file
    <your $record file
    ^the current mailbox
    - or !!the file you've last visited
    ~your home directory
    = or +your $folder directory
    @aliasto the default save folder as determined by the address of the alias

    +renamed with a comma (“,”) prepended to the filename. Mutt +detects this type of mailbox by looking for either .mh_sequences +or .xmhcache files (needed to distinguish normal directories from MH +mailboxes). MH is more robust with concurrent clients writing the mailbox, +but still may suffer from lost flags; message corruption is less likely +to occur than with mbox/mmdf. It's usually slower to open compared to +mbox/mmdf since many small files have to be read (Mutt provides +Section 7.1, “Header Caching” to greatly speed this process up). +Depending on the environment, MH is not very disk-space efficient. +

    +Maildir. The newest of the mailbox formats, used by the Qmail MTA (a +replacement for sendmail). Similar to MH, except that it adds three +subdirectories of the mailbox: tmp, new and cur. Filenames +for the messages are chosen in such a way they are unique, even when two +programs are writing the mailbox over NFS, which means that no file locking +is needed and corruption is very unlikely. Maildir maybe +slower to open without caching in Mutt, it too is not very +disk-space efficient depending on the environment. Since no additional +files are used for metadata (which is embedded in the message filenames) +and Maildir is locking-free, it's easy to sync across different machines +using file-level synchronization tools. +

    7. Mailbox Shortcuts

    +There are a number of built in shortcuts which refer to specific mailboxes. +These shortcuts can be used anywhere you are prompted for a file or mailbox +path or in path-related configuration variables. Note that these only +work at the beginning of a string. +

    • +! — refers to your $spoolfile (incoming) mailbox +

    • +> — refers to your $mbox file +

    • +< — refers to your $record file +

    • +^ — refers to the current mailbox +

    • +- or !! — refers to the file you've last visited +

    • +˜ — refers to your home directory +

    • += or + — refers to your $folder directory +

    • +@alias — refers to the default save folder as determined by the address of the alias +

    For example, to store a copy of outgoing messages in the folder they -were composed in, a folder-hook can be used -to set $record: +were composed in, +a folder-hook can +be used to set $record: 

    -folder-hook . 'set record=^'

    9. Handling Mailing Lists

    +folder-hook . 'set record=^'

    8. Handling Mailing Lists

    Mutt has a few configuration options that make dealing with large -amounts of mail easier. The first thing you must do is to let Mutt know -what addresses you consider to be mailing lists (technically this does -not have to be a mailing list, but that is what it is most often used -for), and what lists you are subscribed to. This is accomplished -through the use of the lists -and subscribe commands in your -.muttrc. +amounts of mail easier. The first thing you must do is to let Mutt +know what addresses you consider to be mailing lists (technically +this does not have to be a mailing list, but that is what it is most +often used for), and what lists you are subscribed to. This is +accomplished through the use of the lists and subscribe commands in your .muttrc.

    Now that Mutt knows what your mailing lists are, it can do several things, the first of which is the ability to show the name of a list -through which you received a message (i.e., of a subscribed list) in the -index menu display. This is useful to distinguish -between personal and list mail in the same mailbox. In the $index_format variable, the expando -“%L” will print the string “To <list>” -when “list” appears in the “To” field, and -“Cc <list>” when it appears in the “Cc” +through which you received a message (i.e., of a subscribed list) in +the index menu display. This is useful to distinguish between +personal and list mail in the same mailbox. In the $index_format variable, the expando “%L” +will print the string “To <list>” when “list” appears in the +“To” field, and “Cc <list>” when it appears in the “Cc” field (otherwise it prints the name of the author).

    -Often times the “To” and “Cc” fields in -mailing list messages tend to get quite large. Most people do not bother -to remove the author of the message they reply to from the list, -resulting in two or more copies being sent to that person. The -<list-reply> function, which by default is -bound to “L” in the index menu and -pager, helps reduce the clutter by only replying to -the known mailing list addresses instead of all recipients (except as +Often times the “To” and “Cc” fields in mailing list messages +tend to get quite large. Most people do not bother to remove the +author of the message they reply to from the list, resulting in +two or more copies being sent to that person. The <list-reply> +function, which by default is bound to “L” in the index menu +and pager, helps reduce the clutter by only replying to the +known mailing list addresses instead of all recipients (except as specified by Mail-Followup-To, see below).

    -Mutt also supports the Mail-Followup-To header. When -you send a message to a list of recipients which includes one or several -subscribed mailing lists, and if the $followup_to option is set, Mutt will -generate a Mail-Followup-To header which contains all the recipients to -whom you send this message, but not your address. This indicates that -group-replies or list-replies (also known as “followups”) -to this message should only be sent to the original recipients of the +Mutt also supports the Mail-Followup-To header. When you send +a message to a list of recipients which includes one or several +subscribed mailing lists, and if the $followup_to option is set, Mutt will generate +a Mail-Followup-To header which contains all the recipients to whom +you send this message, but not your address. This indicates that +group-replies or list-replies (also known as “followups”) to this +message should only be sent to the original recipients of the message, and not separately to you - you'll receive your copy through one of the mailing lists you are subscribed to.

    -Conversely, when group-replying or list-replying to a message which has -a Mail-Followup-To header, Mutt will respect this -header if the $honor_followup_to configuration -variable is set. Using list-reply -will in this case also make sure that the reply goes to the mailing -list, even if it's not specified in the list of recipients in the -Mail-Followup-To. -

    Note

    +Conversely, when group-replying or list-replying to a message which +has a Mail-Followup-To header, Mutt will respect this header if +the $honor_followup_to configuration +variable is set. Using list-reply will in this case also make sure +that the reply goes to the mailing list, even if it's not specified +in the list of recipients in the Mail-Followup-To. +

    Note

    When header editing is enabled, you can create a -Mail-Followup-To header manually. Mutt will only -auto-generate this header if it doesn't exist when you send the message. +Mail-Followup-To header manually. Mutt will only auto-generate +this header if it doesn't exist when you send the message.

    The other method some mailing list admins use is to generate a -“Reply-To” field which points back to the mailing list -address rather than the author of the message. This can create problems -when trying to reply directly to the author in private, since most mail -clients will automatically reply to the address given in the -“Reply-To” field. Mutt uses the $reply_to variable to help decide which -address to use. If set to ask-yes or -ask-no, you will be prompted as to whether or not -you would like to use the address given in the “Reply-To” -field, or reply directly to the address given in the “From” -field. When set to yes, the -“Reply-To” field will be used when present. -

    -The “X-Label:” header field can be used to further identify -mailing lists or list subject matter (or just to annotate messages -individually). The $index_format -variable's “%y” and “%Y” expandos can be used -to expand “X-Label:” fields in the index, and Mutt's -pattern-matcher can match regular expressions to “X-Label:” -fields with the “~y” selector. “X-Label:” is -not a standard message header field, but it can easily be inserted by -procmail and other mail filtering agents. -

    -Lastly, Mutt has the ability to sort the -mailbox into threads. A thread is a -group of messages which all relate to the same subject. This is usually -organized into a tree-like structure where a message and all of its -replies are represented graphically. If you've ever used a threaded -news client, this is the same concept. It makes dealing with large -volume mailing lists easier because you can easily delete uninteresting -threads and quickly find topics of value. -

    10. New Mail Detection

    -Mutt supports setups with multiple folders, allowing all of them to be -monitored for new mail (see Section 14, “Monitoring Incoming Mail” for details). -

    10.1. How New Mail Detection Works

    -For Mbox and Mmdf folders, new mail is detected by comparing access -and/or modification times of files: Mutt assumes a folder has new mail -if it wasn't accessed after it was last modified. Utilities like -biff or frm or any other program -which accesses the mailbox might cause Mutt to never detect new mail for -that mailbox if they do not properly reset the access time. Other -possible causes of Mutt not detecting new mail in these folders are -backup tools (updating access times) or filesystems mounted without -access time update support (for Linux systems, see the -relatime option). -

    Note

    -Contrary to older Mutt releases, it now maintains the new mail status of -a folder by properly resetting the access time if the folder contains at -least one message which is neither read, nor deleted, nor marked as old. -

    -In cases where new mail detection for Mbox or Mmdf folders appears to be -unreliable, the $check_mbox_size -option can be used to make Mutt track and consult file sizes for new -mail detection instead which won't work for size-neutral changes. -

    -New mail for Maildir is assumed if there is one message in the -new/ subdirectory which is not marked deleted (see -$maildir_trash). For MH folders, a -mailbox is considered having new mail if there's at least one message in -the “unseen” sequence as specified by $mh_seq_unseen. -

    -Mutt does not poll POP3 folders for new mail, it only periodically -checks the currently opened folder (if it's a POP3 folder). -

    -For IMAP, by default Mutt uses recent message counts provided by the -server to detect new mail. If the $imap_idle option is set, it'll use the IMAP -IDLE extension if advertised by the server. -

    10.2. Polling For New Mail

    -When in the index menu and being idle (also see $timeout), Mutt periodically checks for new -mail in all folders which have been configured via the +“Reply-To” field which points back to the mailing list address rather +than the author of the message. This can create problems when trying +to reply directly to the author in private, since most mail clients +will automatically reply to the address given in the “Reply-To” +field. Mutt uses the $reply_to +variable to help decide which address to use. If set to ask-yes or +ask-no, you will be +prompted as to whether or not you would like to use the address given in +the “Reply-To” field, or reply directly to the address given in the +“From” field. When set to yes, the “Reply-To” field will be used when +present. +

    +The “X-Label:” header field can be used to further identify mailing +lists or list subject matter (or just to annotate messages +individually). The $index_format variable's “%y” and +“%Y” expandos can be used to expand “X-Label:” fields in the +index, and Mutt's pattern-matcher can match regular expressions to +“X-Label:” fields with the “˜y” selector. “X-Label:” is not a +standard message header field, but it can easily be inserted by procmail +and other mail filtering agents. +

    +Lastly, Mutt has the ability to sort the mailbox into +threads. A thread is a group of messages which all relate to the same +subject. This is usually organized into a tree-like structure where a +message and all of its replies are represented graphically. If you've ever +used a threaded news client, this is the same concept. It makes dealing +with large volume mailing lists easier because you can easily delete +uninteresting threads and quickly find topics of value. +

    9. Handling multiple folders

    +Mutt supports setups with multiple folders, allowing all of them to +be monitored for new mail (see Section 14, “Monitoring Incoming Mail” for details). +

    +When in the index menu and being idle (also see +$timeout), Mutt periodically checks +for new mail in all folders which have been configured via the mailboxes command. The interval depends on the folder -type: for local/IMAP folders it consults $mail_check and $pop_checkinterval for POP folders. -

    -Outside the index menu the directory browser supports checking for new -mail using the <check-new> function which is -unbound by default. Pressing TAB will bring up a menu showing the files -specified by the mailboxes command, and indicate -which contain new messages. Mutt will automatically enter this mode when -invoked from the command line with the -y option. +type: for local/IMAP folders it consults +$mail_check and +$pop_checkinterval +for POP folders. +

    +Outside the index menu the directory browser supports checking +for new mail using the <check-new> function which is +unbound by default. Pressing TAB will bring up a +menu showing the files specified by the mailboxes command, +and indicate which contain new messages. Mutt will automatically enter this +mode when invoked from the command line with the -y option.

    For the pager, index and directory browser menus, Mutt contains the -<buffy-list> function (bound to -“.” by default) which will print a list of folders with new -mail in the command line at the bottom of the screen. +<buffy-list> function (bound to “.” by default) +which will print a list of folders with new mail in the command line at +the bottom of the screen.

    For the index, by default Mutt displays the number of mailboxes with new -mail in the status bar, please refer to the $status_format variable for details. +mail in the status bar, please refer to the +$status_format +variable for details.

    When changing folders, Mutt fills the prompt with the first folder from the mailboxes list containing new mail (if any), pressing -<Space> will cycle through folders with new -mail. The (by default unbound) function -<next-unread-mailbox> in the index can be used -to immediately open the next folder with unread mail (if any). -

    11. Editing Threads

    +space will cycle through folders with new mail. +

    10. Editing Threads

    Mutt has the ability to dynamically restructure threads that are broken either by misconfigured software or bad behavior from some correspondents. This allows to clean your mailboxes from these annoyances which make it hard to follow a discussion. -

    11.1. Linking Threads

    -Some mailers tend to “forget” to correctly set the -“In-Reply-To:” and “References:” headers when -replying to a message. This results in broken discussions because Mutt -has not enough information to guess the correct threading. You can fix -this by tagging the reply, then moving to the parent message and using -the <link-threads> function (bound to & by -default). The reply will then be connected to this parent message. -

    -You can also connect multiple children at once, tagging them and using -the <tag-prefix> command (“;”) or -the $auto_tag option. -

    11.2. Breaking Threads

    +

    10.1. Linking Threads

    +Some mailers tend to “forget” to correctly set the “In-Reply-To:” and +“References:” headers when replying to a message. This results in broken +discussions because Mutt has not enough information to guess the correct +threading. +You can fix this by tagging the reply, then moving to the parent message +and using the <link-threads> function (bound to & by default). The +reply will then be connected to this parent message. +

    +You can also connect multiple children at once, tagging them and using the +<tag-prefix> command (';') or the $auto_tag option. +

    10.2. Breaking Threads

    On mailing lists, some people are in the bad habit of starting a new -discussion by hitting “reply” to any message from the list -and changing the subject to a totally unrelated one. You can fix such -threads by using the <break-thread> function -(bound by default to #), which will turn the subthread starting from the +discussion by hitting “reply” to any message from the list and changing +the subject to a totally unrelated one. +You can fix such threads by using the <break-thread> function (bound +by default to #), which will turn the subthread starting from the current message into a whole different thread. -

    12. Delivery Status Notification (DSN) Support

    +

    11. Delivery Status Notification (DSN) Support

    RFC1894 defines a set of MIME content types for relaying information -about the status of electronic mail messages. These can be thought of -as “return receipts.” +about the status of electronic mail messages. These can be thought of as +“return receipts.”

    To support DSN, there are two variables. $dsn_notify is used to request receipts for different results (such as failed message, message delivered, etc.). -$dsn_return requests how much of your -message should be returned with the receipt (headers or full message). -

    -When using $sendmail for mail delivery, -you need to use either Berkeley sendmail 8.8.x (or greater) a MTA -supporting DSN command line options compatible to Sendmail: The -N and --R options can be used by the mail client to make requests as to what -type of status messages should be returned. Please consider your MTA -documentation whether DSN is supported. -

    -For SMTP delivery using $smtp_url, it -depends on the capabilities announced by the server whether Mutt will -attempt to request DSN or not. -

    13. Start a WWW Browser on URLs

    -If a message contains URLs, it is efficient to get a menu with all the -URLs and start a WWW browser on one of them. This functionality is -provided by the external urlview program which can be retrieved at +$dsn_return requests how much +of your message should be returned with the receipt (headers or full +message). +

    +When using $sendmail for mail +delivery, you need to use either Berkeley sendmail 8.8.x (or greater) a MTA +supporting DSN command line options compatible to Sendmail: The -N and -R +options can be used by the mail client to make requests as to what type of +status messages should be returned. Please consider your MTA documentation +whether DSN is supported. +

    +For SMTP delivery using $smtp_url, it depends on the +capabilities announced by the server whether Mutt will attempt to +request DSN or not. +

    12. Start a WWW Browser on URLs

    +If a message contains URLs, it is efficient to get +a menu with all the URLs and start a WWW browser on one of them. This +functionality is provided by the external urlview program which can be +retrieved at ftp://ftp.mutt.org/mutt/contrib/ and the configuration commands: 

     macro index \cb |urlview\n
 macro pager \cb |urlview\n
-

    14. Miscellany

    +

    13. Miscellany

    This section documents various features that fit nowhere else.

    Address normalization

    Mutt normalizes all e-mail addresses to the simplest form possible. If -an address contains a realname, the form Joe User -<joe@example.com> is used and the pure e-mail address -without angle brackets otherwise, i.e. just +an address contains a realname, the form +Joe User <joe@example.com> is used and the +pure e-mail address without angle brackets otherwise, i.e. just joe@example.com.

    This normalization affects all headers Mutt generates including aliases. @@ -779,7 +678,8 @@ present. Otherwise, the value of $MAILDIR is taken into account. If that isn't present either, Mutt takes the user's mailbox in the mailspool as determined at compile-time (which may also -reside in the home directory). The $spoolfile setting overrides this -selection. Highest priority has the mailbox given with the +reside in the home directory). The +$spoolfile setting overrides +this selection. Highest priority has the mailbox given with the -f command line option.

    Prev   Next
    Chapter 3. Configuration Home Chapter 5. Mutt's MIME Support
    diff -Nru mutt-1.5.21/doc/configuration.html mutt-1.5.20/doc/configuration.html --- mutt-1.5.21/doc/configuration.html 2010-09-15 17:10:14.000000000 +0000 +++ mutt-1.5.20/doc/configuration.html 2009-06-14 18:54:35.000000000 +0000 @@ -1,6 +1,6 @@ -Chapter 3. Configuration
    Chapter 3. Configuration
    Prev   Next

    Chapter 3. Configuration

    Table of Contents

    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Header Display
    10.2. Selecting Headers
    10.3. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    26.4. Type Conversions
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding

    1. Location of Initialization Files

    -While the default configuration (or “preferences”) make -Mutt usable right out of the box, it is often desirable to tailor Mutt -to suit your own tastes. When Mutt is first invoked, it will attempt to -read the “system” configuration file (defaults set by your -local system administrator), unless the “-n” command line option is specified. This -file is typically /usr/local/share/mutt/Muttrc or -/etc/Muttrc. Mutt will next look for a file named -.muttrc in your home directory. If this file does -not exist and your home directory has a subdirectory named -.mutt, Mutt tries to load a file named +

    Chapter 3. Configuration
    Prev   Next

    Chapter 3. Configuration

    Table of Contents

    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Selecting Headers
    10.2. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding

    1. Location of Initialization Files

    +While the default configuration (or “preferences”) make Mutt +usable right out of the box, it is often desirable to tailor Mutt to +suit your own tastes. When Mutt is first invoked, it will attempt to +read the “system” configuration file (defaults set by your local +system administrator), unless the “-n” command line option is specified. This file is typically +/usr/local/share/mutt/Muttrc or /etc/Muttrc. Mutt +will next look for a file named .muttrc in your home +directory. If this file does not exist and your home directory has +a subdirectory named .mutt, Mutt tries to load a file named .mutt/muttrc.

    -.muttrc is the file where you will usually place your -commands to configure Mutt. +.muttrc is the file where you will usually place your commands to configure Mutt.

    In addition, Mutt supports version specific configuration files that are -parsed instead of the default files as explained above. For instance, -if your system has a Muttrc-0.88 file in the system -configuration directory, and you are running version 0.88 of Mutt, this -file will be sourced instead of the Muttrc file. The -same is true of the user configuration file, if you have a file -.muttrc-0.88.6 in your home directory, when you run -Mutt version 0.88.6, it will source this file instead of the default -.muttrc file. The version number is the same which -is visible using the “-v” command line switch or using the -show-version key (default: V) from the index menu. -

    2. Syntax of Initialization Files

    -An initialization file consists of a series of commands. Each line of the file may contain -one or more commands. When multiple commands are used, they must be -separated by a semicolon (“;”). +parsed instead of the default files as explained above. For instance, if +your system has a Muttrc-0.88 file in the system configuration +directory, and you are running version 0.88 of Mutt, this file will be +sourced instead of the Muttrc file. The same is true of the user +configuration file, if you have a file .muttrc-0.88.6 in your home +directory, when you run Mutt version 0.88.6, it will source this file +instead of the default .muttrc file. The version number is the +same which is visible using the “-v” command line switch or using the show-version key (default: +V) from the index menu. +

    2. Syntax of Initialization Files

    +An initialization file consists of a series of commands. Each line of the file may contain one or more commands. +When multiple commands are used, they must be separated by a semicolon +(“;”).

    Example 3.1. Multiple configuration commands per line

     set realname='Mutt user' ; ignore x-

    -The hash mark, or pound sign (“#”), is used as a -“comment” character. You can use it to annotate your -initialization file. All text after the comment character to the end of -the line is ignored. +The hash mark, or pound sign +(“#”), is used as a “comment” character. You can use it to +annotate your initialization file. All text after the comment character +to the end of the line is ignored.

    Example 3.2. Commenting configuration files

    -my_hdr X-Disclaimer: Why are you listening to me? # This is a comment
+my_hdr X-Disclaimer: Why are you listening to me? # This is a comment

    -Single quotes (“'”) and double quotes (“"”) -can be used to quote strings which contain spaces or other special -characters. The difference between the two types of quotes is similar -to that of many popular shell programs, namely that a single quote is -used to specify a literal string (one that is not interpreted for shell -variables or quoting with a backslash [see next paragraph]), while -double quotes indicate a string for which should be evaluated. For -example, backticks are evaluated inside of double quotes, but -not for single quotes. -

    -“\” quotes the next character, just as in shells such as -bash and zsh. For example, if want to put quotes “"” -inside of a string, you can use “\” to force the next -character to be a literal instead of interpreted character. -

    Example 3.3. Escaping quotes in configuration files

    +Single quotes (“'”) and double quotes (“"”) can be used to quote strings
+which contain spaces or other special characters.  The difference between
+the two types of quotes is similar to that of many popular shell programs,
+namely that a single quote is used to specify a literal string (one that is
+not interpreted for shell variables or quoting with a backslash [see
+next paragraph]), while double quotes indicate a string for which
+should be evaluated.  For example, backticks are evaluated inside of double
+quotes, but not for single quotes.
+
    
+“\” quotes the next character, just as in shells such as bash and zsh.
+For example, if want to put quotes “"” inside of a string, you can use
+“\” to force the next character to be a literal instead of interpreted
+character.
+
    Example 3.3. Escaping quotes in congfiguration files
     set realname="Michael \"MuttDude\" Elkins"
 

    
-“\\” means to insert a literal “\” into the line.
-“\n” and “\r” have their usual C meanings of linefeed and
+“\\” means to insert a literal “\” into the line.
+“\n” and “\r” have their usual C meanings of linefeed and
 carriage-return, respectively.
 
    
-A “\” at the end of a line can be used to split commands
-over multiple lines as it “escapes” the line end, provided
-that the split points don't appear in the middle of command names. Lines
-are first concatenated before interpretation so that a multi-line can be
-commented by commenting out the first line only.
+A “\” at the end of a line can be used to split commands over
+multiple lines as it “escapes” the line end, provided that the split points don't appear in the
+middle of command names. Lines are first concatenated before
+interpretation so that a multi-line can be commented by commenting out
+the first line only.
 
    Example 3.4. Splitting long configuration commands over several lines
     set status_format="some very \
 long value split \
@@ -102,51 +96,52 @@
 It is also possible to substitute the output of a Unix command in an
 initialization file.  This is accomplished by enclosing the command in
 backticks (``). In Example 3.5, “Using external command's output in configuration files”, the output of the
-Unix command “uname -a” will be substituted before the line
-is parsed.  Since initialization files are line oriented, only the first
-line of output from the Unix command will be substituted.
+Unix command “uname -a” will be substituted before the
+line is parsed.
+Since initialization files are line oriented, only
+the first line of output from the Unix command will be substituted.
 
    Example 3.5. Using external command's output in configuration files
     my_hdr X-Operating-System: `uname -a`
 

    
 Both environment variables and Mutt variables can be accessed by
-prepending “$” to the name of the variable. For example,
+prepending “$” to the name of the variable. For example,
 
    Example 3.6. Using environment variables in configuration files
     set record=+sent_on_$HOSTNAME
 

    
 will cause Mutt to save outgoing messages to a folder named
-“sent_on_kremvax” if the environment variable
-$HOSTNAME is set to “kremvax.” (See
-$record for details.)
+“sent_on_kremvax” if the environment variable $HOSTNAME is set to
+“kremvax.” (See $record for
+details.)
 
    
 Mutt expands the variable when it is assigned, not when it is used. If
-the value of a variable on the right-hand side of an assignment changes
-after the assignment, the variable on the left-hand side will not be
-affected.
+the value of a variable on the right-hand side of an assignment
+changes after the assignment, the variable on the left-hand side will
+not be affected.
 
    
 The commands understood by Mutt are explained in the next paragraphs.
-For a complete list, see the command
-reference.
+For a complete list, see the command reference.
 
    
 All configuration files are expected to be in the current locale as
-specified by the $charset variable which
-doesn't have a default value since it's determined by Mutt at startup.
+specified by the $charset variable
+which doesn't have a default value since it's determined by Mutt at startup.
 If a configuration file is not encoded in the same character set the
-$config_charset variable should be
-used: all lines starting with the next are recoded from $config_charset to $charset.
-
    
-This mechanism should be avoided if possible as it has the following
-implications:
-
    • These variables should be set early in a configuration
-file with $charset preceding $config_charset so Mutt knows what
-character set to convert to.
    • If $config_charset
-is set, it should be set in each configuration file because the value is
-global and not per configuration
-file.
    • Because Mutt first recodes a line before it attempts to
-parse it, a conversion introducing question marks or other characters as
-part of errors (unconvertable characters, transliteration) may introduce
-syntax errors or silently change the meaning of certain tokens
-(e.g. inserting question marks into regular
-expressions).
    3. Address Groups
    Usage:
    group  [
+$config_charset
+variable should be used: all lines starting with the next are recoded
+from $config_charset
+to $charset.
+
    
+This mechanism should be avoided if possible as it has the
+following implications:
+
    • These variables should be set early in a configuration
+file with $charset preceding
+$config_charset so Mutt
+knows what character set to convert to.
    • If $config_charset is set, it should be set
+in each configuration file because the value is global and not
+per configuration file.
    • Because Mutt first recodes a line before it attempts to parse it,
+a conversion introducing question marks or other characters as
+part of errors (unconvertable characters, transliteration) may introduce syntax
+errors or silently change the meaning of certain tokens (e.g. inserting
+question marks into regular expressions).
    3. Address Groups
    Usage:
    group  [
 -group
 name
 ...] { 
@@ -167,51 +162,30 @@
 -addr
 expr
 ... }
    
-Mutt supports grouping addresses logically into named groups. An address
-or address pattern can appear in several groups at the same time. These
-groups can be used in patterns (for searching, limiting and tagging) and
-in hooks by using group patterns. This can be useful to classify mail
-and take certain actions depending on in what groups the message is.
-For example, the mutt user's mailing list would fit into the categories
-“mailing list” and “mutt-related”. Using send-hook, the sender can
-be set to a dedicated one for writing mailing list messages, and the
-signature could be set to a mutt-related one for writing to a mutt list
-— for other lists, the list sender setting still applies but a
-different signature can be selected. Or, given a group only containing
-recipients known to accept encrypted mail,
-“auto-encryption” can be achieved easily.
-
    
-The group command is used to directly add either
-addresses or regular expressions to the specified group or groups. The
-different categories of arguments to the group
-command can be in any order. The flags -rx and
+group is used to directly add either addresses or
+regular expressions to the specified group or groups. The different
+categories of arguments to the group command can be
+in any order. The flags -rx and
 -addr specify what the following strings (that cannot
 begin with a hyphen) should be interpreted as: either a regular
 expression or an email address, respectively.
 
    
-These address groups can also be created implicitly by the alias, lists, subscribe and alternates commands by
-specifying the optional -group option. For example,
-
    -alternates -group me address1 address2
-alternates -group me -group work address3
-
    
-would create a group named “me” which contains all your
-addresses and a group named “work” which contains only your
-work address address3. Besides many other
-possibilities, this could be used to automatically mark your own
-messages in a mailing list folder as read or use a special signature for
-work-related messages.
-
    
-The ungroup command is used to remove addresses or
-regular expressions from the specified group or groups. The syntax is
-similar to the group command, however the special
-character * can be used to empty a group of all of
-its contents. As soon as a group gets empty because all addresses and
-regular expressions have been removed, it'll internally be removed, too
-(i.e. there cannot be an empty group). When removing regular expressions
-from a group, the pattern must be specified exactly as given to the
-group command or -group argument.
-
    4. Defining/Using Aliases
    Usage:
    alias  [
+These address groups can also be created implicitly by the
+alias, lists,
+subscribe and
+alternates commands by specifying the
+optional -group option.
+
    
+Once defined, these address groups can be used in
+patterns to search for and limit the
+display to messages matching a group.
+
    
+ungroup is used to remove addresses or regular
+expressions from the specified group or groups. The syntax is similar to
+the group command, however the special character
+* can be used to empty a group of all of its
+contents.
+
    4. Defining/Using Aliases
    Usage:
    alias  [
 -group
 name
 ...]  
@@ -228,57 +202,53 @@
   |   
 key
 ... }
    
-It's usually very cumbersome to remember or type out the address of
-someone you are communicating with.  Mutt allows you to create
-“aliases” which map a short string to a full address.
-
    Note
    
-If you want to create an alias for more than one address, you
-must separate the addresses with a comma
-(“,”).
+It's usually very cumbersome to remember or type out the address of someone
+you are communicating with.  Mutt allows you to create “aliases” which map
+a short string to a full address.
+
    Note
    
+If you want to create an alias for more than
+one address, you must separate the addresses with a comma (“,”).
 
    
 The optional -group argument to
 alias causes the aliased address(es) to be added to
 the named group.
 
    
-To remove an alias or aliases (“*” means all aliases):
+To remove an alias or aliases (“*” means all aliases):
 
     alias muttdude me@cs.hmc.edu (Michael Elkins)
 alias theguys manny, moe, jack
 
    
-Unlike other mailers, Mutt doesn't require aliases to be defined in a
-special file.  The alias command can appear anywhere
-in a configuration file, as long as this file is sourced.  Consequently, you
-can have multiple alias files, or you can have all aliases defined in
-your .muttrc.
+Unlike other mailers, Mutt doesn't require aliases to be defined
+in a special file.  The alias command can appear anywhere in
+a configuration file, as long as this file is sourced.  Consequently, you can have multiple alias files, or
+you can have all aliases defined in your .muttrc.
 
    
 On the other hand, the <create-alias>
 function can use only one file, the one pointed to by the $alias_file variable (which is
-~/.muttrc by default). This file is not special
-either, in the sense that Mutt will happily append aliases to any file,
-but in order for the new aliases to take effect you need to explicitly
-source this file too.
+˜/.muttrc by default). This file is not special either,
+in the sense that Mutt will happily append aliases to any file, but in
+order for the new aliases to take effect you need to explicitly source this file too.
 
    Example 3.7. Configuring external alias files
     source /usr/local/share/Mutt.aliases
 source ~/.mail_aliases
 set alias_file=~/.mail_aliases
 

    
 To use aliases, you merely use the alias at any place in Mutt where Mutt
-prompts for addresses, such as the To: or
-Cc: prompt.  You can also enter aliases in your
-editor at the appropriate headers if you have the $edit_headers variable set.
-
    
-In addition, at the various address prompts, you can use the tab
-character to expand a partial alias to the full alias.  If there are
-multiple matches, Mutt will bring up a menu with the matching aliases.
-In order to be presented with the full list of aliases, you must hit tab
-without a partial alias, such as at the beginning of the prompt or after
-a comma denoting multiple addresses.
+prompts for addresses, such as the To: or Cc: prompt.  You can
+also enter aliases in your editor at the appropriate headers if you have the
+$edit_headers variable set.
+
    
+In addition, at the various address prompts, you can use the tab character
+to expand a partial alias to the full alias.  If there are multiple matches,
+Mutt will bring up a menu with the matching aliases.  In order to be
+presented with the full list of aliases, you must hit tab without a partial
+alias, such as at the beginning of the prompt or after a comma denoting
+multiple addresses.
 
    
 In the alias menu, you can select as many aliases as you want with the
-select-entry key (default: <Return>), and use
-the exit key (default: q) to return to the address
-prompt.
-
    5. Changing the Default Key Bindings
    Usage:
    bind   
+select-entry key (default: <Return>), and use the
+exit key (default: q) to return to the address prompt.
+
    5. Changing the Default Key Bindings
    Usage:
    bind   
 map
    
 key
@@ -288,30 +258,26 @@
 This command allows you to change the default key bindings (operation
 invoked when pressing a key).
 
    
-map specifies in which menu the binding belongs.
-Multiple maps may be specified by separating them with commas (no
-additional whitespace is allowed). The currently defined maps are:
+map specifies in which menu the binding belongs.  Multiple maps may
+be specified by separating them with commas (no additional whitespace is
+allowed). The currently defined maps are:
 
    generic
    
 This is not a real menu, but is used as a fallback for all of the other
 menus except for the pager and editor modes.  If a key is not defined in
-another menu, Mutt will look for a binding to use in this menu.  This
-allows you to bind a key to a certain function in multiple menus instead
-of having multiple bind statements to accomplish the
-same task.
+another menu, Mutt will look for a binding to use in this menu.  This allows
+you to bind a key to a certain function in multiple menus instead of having
+multiple bind statements to accomplish the same task.
 
    alias
    
 The alias menu is the list of your personal aliases as defined in your
-.muttrc.  It is the mapping from a short alias name
-to the full email address(es) of the recipient(s).
+.muttrc.  It is the mapping from a short alias name to the full email
+address(es) of the recipient(s).
 
    attach
    
-The attachment menu is used to access the attachments on received
-messages.
+The attachment menu is used to access the attachments on received messages.
 
    browser
    
-The browser is used for both browsing the local directory structure, and
-for listing all of your incoming mailboxes.
+The browser is used for both browsing the local directory structure, and for
+listing all of your incoming mailboxes.
 
    editor
    
-The editor is used to allow the user to enter a single line of text, such as
-the To or Subject prompts in the
-compose menu.
+The editor is the line-based editor the user enters text data.
 
    index
    
 The index is the list of messages contained in a mailbox.
 
    compose
    
@@ -323,44 +289,35 @@
 The pgp menu is used to select the OpenPGP keys used to encrypt outgoing
 messages.
 
    smime
    
-The smime menu is used to select the OpenSSL certificates used to
-encrypt outgoing messages.
+The smime menu is used to select the OpenSSL certificates used to encrypt outgoing
+messages.
 
    postpone
    
 The postpone menu is similar to the index menu, except is used when
 recalling a message the user was composing, but saved until later.
 
    query
    
-The query menu is the browser for results returned by $query_command.
+The query menu is the browser for results returned by
+$query_command.
 
    mix
    
 The mixmaster screen is used to select remailer options for outgoing
 messages (if Mutt is compiled with Mixmaster support).
 
    
-key is the key (or key sequence) you wish to bind.
-To specify a control character, use the sequence
-\Cx, where x is the letter of
-the control character (for example, to specify control-A use
-“\Ca”).  Note that the case of x as
-well as \C is ignored, so that
-\CA, \Ca,
-\cA and \ca are all
+key is the key (or key sequence) you wish to bind.  To specify a
+control character, use the sequence \Cx, where x is the
+letter of the control character (for example, to specify control-A use
+“\Ca”).  Note that the case of x as well as \C is
+ignored, so that \CA, \Ca, \cA and \ca are all
 equivalent.  An alternative form is to specify the key as a three digit
-octal number prefixed with a “\” (for example
-\177 is equivalent to \c?). In
-addition, key may be a symbolic name as shown in
-Table 3.1, “Symbolic key names”.
+octal number prefixed with a “\” (for example \177 is
+equivalent to \c?). In addition, key may
+be a symbolic name as shown in Table 3.1, “Symbolic key names”.
 
    Table 3.1. Symbolic key names
    Symbolic nameMeaning
    \ttab
    <tab>tab
    <backtab>backtab / shift-tab
    \rcarriage return
    \nnewline
    \eescape
    <esc>escape
    <up>up arrow
    <down>down arrow
    <left>left arrow
    <right>right arrow
    <pageup>Page Up
    <pagedown>Page Down
    <backspace>Backspace
    <delete>Delete
    <insert>Insert
    <enter>Enter
    <return>Return
    <home>Home
    <end>End
    <space>Space bar
    <f1>function key 1
    <f10>function key 10

    
-key does not need to be enclosed in quotes unless
-it contains a space (“ ”) or semi-colon
-(“;”).
-
    
-function specifies which action to take when
-key is pressed.  For a complete list of functions,
-see the reference. Note that the
-bind expects function to be
-specified without angle brackets.
-
    
-The special function <noop> unbinds the
-specified key sequence.
-
    6. Defining Aliases for Character Sets
    Usage:
    charset-hook   
+key does not need to be enclosed in quotes unless it contains a
+space (“ ”) or semi-colon (“;”).
+
    
+function specifies which action to take when key is pressed.
+For a complete list of functions, see the reference.  The special function <noop> unbinds the specified key
+sequence.
+
    6. Defining Aliases for Character Sets
    Usage:
    charset-hook   
 alias
    
 charset
@@ -369,52 +326,50 @@
    
 local-charset
  
    
-The charset-hook command defines an alias for a
-character set.  This is useful to properly display messages which are
-tagged with a character set name not known to Mutt.
-
    
-The iconv-hook command defines a system-specific name
-for a character set.  This is helpful when your systems character
-conversion library insists on using strange, system-specific names for
-character sets.
-
    7. Setting Variables Based Upon Mailbox
    Usage:
    folder-hook   
+The charset-hook command defines an alias for a character set.
+This is useful to properly display messages which are tagged with a
+character set name not known to Mutt.
+
    
+The iconv-hook command defines a system-specific name for a
+character set.  This is helpful when your systems character
+conversion library insists on using strange, system-specific names
+for character sets.
+
    7. Setting Variables Based Upon Mailbox
    Usage:
    folder-hook   
 [!]regexp
    
 command
  
    
 It is often desirable to change settings based on which mailbox you are
-reading.  The folder-hook command provides a method
-by which you can execute any configuration command.
-regexp is a regular expression specifying in which
-mailboxes to execute command before loading.  If a
-mailbox matches multiple folder-hooks, they are
-executed in the order given in the .muttrc.
-
    Note
    
-If you use the “!” shortcut for $spoolfile at the beginning of the pattern,
-you must place it inside of double or single quotes in order to
-distinguish it from the logical not operator for
-the expression.
-
    Note
    
-Settings are not restored when you leave the
-mailbox.  For example, a command action to perform is to change the
-sorting method based upon the mailbox being read:
+reading.  The folder-hook command provides a method by which you can execute
+any configuration command.  regexp is a regular expression specifying
+in which mailboxes to execute command before loading.  If a mailbox
+matches multiple folder-hooks, they are executed in the order given in the
+.muttrc.
+
    Note
    
+If you use the “!” shortcut for $spoolfile at the beginning of the pattern, you must place it
+inside of double or single quotes in order to distinguish it from the
+logical not operator for the expression.
+
    Note
    
+Settings are not restored when you leave the mailbox.
+For example, a command action to perform is to change the sorting method
+based upon the mailbox being read:
+
 
     folder-hook mutt "set sort=threads"
    
+
 However, the sorting method is not restored to its previous value when
-reading a different mailbox.  To specify a default
-command, use the pattern “.” before other
-folder-hooks adjusting a value on a per-folder basis
-because folder-hooks are evaluated in the order given
-in the configuration file.
+reading a different mailbox.  To specify a default command, use the
+pattern “.” before other folder-hooks adjusting a value on a per-folder basis
+because folder-hooks are evaluated in the order given in the
+configuration file.
 
    
-The following example will set the sort
-variable to date-sent for all folders but to
-threads for all folders containing
-“mutt” in their name.
+The following example will set the sort variable
+to date-sent for all folders but to threads
+for all folders containing “mutt” in their name.
 
    Example 3.8. Setting sort method based on mailbox name
     folder-hook . "set sort=date-sent"
 folder-hook mutt "set sort=threads"
-

    8. Keyboard Macros
    Usage:
    macro   
+

    8. Keyboard Macros

    Usage:

    macro menu key @@ -423,43 +378,39 @@ [ description ]

    -Macros are useful when you would like a single key to perform a series -of actions. When you press key in menu -menu, Mutt will behave as if you had typed -sequence. So if you have a common sequence of -commands you type, you can create a macro to execute those commands with -a single key or fewer keys. -

    -menu is the map which -the macro will be bound in. Multiple maps may be specified by -separating multiple menu arguments by commas. Whitespace may not be used -in between the menu arguments and the commas separating them. -

    -key and sequence are expanded -by the same rules as the key bindings with -some additions. The first is that control characters in -sequence can also be specified as -^x. In order to get a caret (“^”) you -need to use ^^. Secondly, to specify a certain key -such as up or to invoke a function directly, you -can use the format <key name> and -<function name>. For a listing of key names -see the section on key bindings. Functions +Macros are useful when you would like a single key to perform a series of +actions. When you press key in menu menu, Mutt will behave as if +you had typed sequence. So if you have a common sequence of commands +you type, you can create a macro to execute those commands with a single +key or fewer keys. +

    +menu is the map which the macro will be bound in. +Multiple maps may be specified by separating multiple menu arguments by +commas. Whitespace may not be used in between the menu arguments and the +commas separating them. +

    +key and sequence are expanded by the same rules as the +key bindings with some additions. The +first is that control characters in sequence can also be specified +as ^x. In order to get a caret (“^”) you need to use +^^. Secondly, to specify a certain key such as up +or to invoke a function directly, you can use the format +<key name> and <function name>. For a listing of key +names see the section on key bindings. Functions are listed in the reference.

    The advantage with using function names directly is that the macros will -work regardless of the current key bindings, so they are not dependent -on the user having particular key definitions. This makes them more -robust and portable, and also facilitates defining of macros in files -used by more than one user (e.g., the system Muttrc). -

    -Optionally you can specify a descriptive text after -sequence, which is shown in the help screens if -they contain a description. -

    Note

    +work regardless of the current key bindings, so they are not dependent on +the user having particular key definitions. This makes them more robust +and portable, and also facilitates defining of macros in files used by more +than one user (e.g., the system Muttrc). +

    +Optionally you can specify a descriptive text after sequence, +which is shown in the help screens if they contain a description. +

    Note

    Macro definitions (if any) listed in the help screen(s), are silently truncated at the screen width, and are not wrapped. -

    9. Using Color and Mono Video Attributes

    Usage:

    color +

    9. Using Color and Mono Video Attributes

    Usage:

    color object foreground @@ -494,61 +445,48 @@ | pattern ... }

    -If your terminal supports color, you can spice up Mutt by creating your -own color scheme. To define the color of an object (type of -information), you must specify both a foreground color -and a background color (it is not possible to only -specify one or the other). -

    -header and body match -regexp in the header/body of a message, -index matches pattern (see -Section 3, “Patterns: Searching, Limiting and Tagging”) in the message index. +If your terminal supports color, you can spice up Mutt by creating your own +color scheme. To define the color of an object (type of information), you +must specify both a foreground color and a background color (it is not +possible to only specify one or the other). +

    +header and body match regexp +in the header/body of a message, index matches pattern +(see Section 2, “Patterns: Searching, Limiting and Tagging”) in the message index.

    object can be one of: -

    • attachment

    • bold (highlighting bold patterns in the body of messages)

    • error (error messages printed by Mutt)

    • hdrdefault (default color of the message header in the pager)

    • indicator (arrow or bar used to indicate the current item in a menu)

    • markers (the “+” markers at the beginning of wrapped lines in the pager)

    • message (informational messages)

    • normal

    • quoted (text matching $quote_regexp in the body of a message)

    • quoted1, quoted2, ..., quotedN (higher levels of quoting)

    • search (highlighting of words in the pager)

    • signature

    • status (mode lines used to display info about the mailbox or message)

    • tilde (the “~” used to pad blank lines in the pager)

    • tree (thread tree drawn in the message index and attachment menu)

    • underline (highlighting underlined patterns in the body of messages)

    -foreground and background can -be one of the following: -

    • white

    • black

    • green

    • magenta

    • blue

    • cyan

    • yellow

    • red

    • default

    • colorx

    -foreground can optionally be prefixed with the -keyword bright to make the foreground color boldfaced -(e.g., brightred). -

    -If your terminal supports it, the special keyword -default can be used as a transparent color. The -value brightdefault is also valid. If Mutt is -linked against the S-Lang library, you also need to -set the $COLORFGBG environment variable to the -default colors of your terminal for this to work; for example (for -Bourne-like shells): +

    • attachment

    • bold (hiliting bold patterns in the body of messages)

    • error (error messages printed by Mutt)

    • hdrdefault (default color of the message header in the pager)

    • indicator (arrow or bar used to indicate the current item in a menu)

    • markers (the “+” markers at the beginning of wrapped lines in the pager)

    • message (informational messages)

    • normal

    • quoted (text matching $quote_regexp in the body of a message)

    • quoted1, quoted2, ..., quotedN (higher levels of quoting)

    • search (hiliting of words in the pager)

    • signature

    • status (mode lines used to display info about the mailbox or message)

    • tilde (the “˜” used to pad blank lines in the pager)

    • tree (thread tree drawn in the message index and attachment menu)

    • underline (hiliting underlined patterns in the body of messages)

    +foreground and background can be one of the following: +

    • white

    • black

    • green

    • magenta

    • blue

    • cyan

    • yellow

    • red

    • default

    • colorx

    +foreground can optionally be prefixed with the keyword bright to make +the foreground color boldfaced (e.g., brightred). +

    +If your terminal supports it, the special keyword default can be +used as a transparent color. The value brightdefault is also valid. +If Mutt is linked against the S-Lang library, you also need to set +the $COLORFGBG environment variable to the default colors of your +terminal for this to work; for example (for Bourne-like shells): 

     set COLORFGBG="green;black"
 export COLORFGBG
-

    Note

    -The S-Lang library requires you to use the -lightgray and brown keywords -instead of white and yellow -when setting this variable. -

    Note

    -The uncolor command can be applied to the index, -header and body objects only. It removes entries from the list. You -must specify the same pattern specified in the -color command for it to be removed. The pattern -“*” is a special token which means to clear the color list -of all entries. +

    Note

    +The S-Lang library requires you to use the lightgray +and brown keywords instead of white and yellow when +setting this variable. +

    Note

    +The uncolor command can be applied to the index, header and body objects only. It +removes entries from the list. You must specify the same pattern +specified in the color command for it to be removed. The pattern “*” is +a special token which means to clear the color list of all entries.

    -Mutt also recognizes the keywords color0, -color1, ..., -colorN-1 -(N being the number of colors supported by your -terminal). This is useful when you remap the colors for your display -(for example by changing the color associated with -color2 for your xterm), since color names may then -lose their normal meaning. +Mutt also recognizes the keywords color0, color1, …, +colorN-1 (N being the number of colors supported +by your terminal). This is useful when you remap the colors for your +display (for example by changing the color associated with color2 +for your xterm), since color names may then lose their normal meaning.

    -If your terminal does not support color, it is still possible change the -video attributes through the use of the “mono” -command. Usage: +If your terminal does not support color, it is still possible change the video +attributes through the use of the “mono” command. Usage:

    mono object @@ -578,15 +516,9 @@ | pattern ... }

    -For object, see the color -command. attribute can be one of the following: -

    • none

    • bold

    • underline

    • reverse

    • standout

    10. Message Header Display

    10.1. Header Display

    -When displaying a message in the pager, Mutt folds long header lines at -$wrap columns. Though there're precise rules -about where to break and how, Mutt always folds headers using a tab for -readability. (Note that the sending side is not affected by this, Mutt -tries to implement standards compliant folding.) -

    10.2. Selecting Headers

    Usage:

    ignore +For object, see the color command. attribute +can be one of the following: +

    • none

    • bold

    • underline

    • reverse

    • standout

    10. Message Header Display

    10.1. Selecting Headers

    Usage:

    ignore pattern [ pattern @@ -595,30 +527,26 @@ | pattern ... }

    -Messages often have many header fields added by automatic processing -systems, or which may not seem useful to display on the screen. This -command allows you to specify header fields which you don't normally -want to see in the pager. +Messages often have many header fields added by automatic processing systems, +or which may not seem useful to display on the screen. This command allows +you to specify header fields which you don't normally want to see in the pager.

    You do not need to specify the full header field name. For example, -“ignore content-” will ignore all header fields that begin -with the pattern “content-”. “ignore *” will -ignore all headers. -

    -To remove a previously added token from the list, use the -“unignore” command. The “unignore” command -will make Mutt display headers with the given pattern. For example, if -you do “ignore x-” it is possible to “unignore -x-mailer”. +“ignore content-” will ignore all header fields that begin with the pattern +“content-”. “ignore *” will ignore all headers.

    -“unignore *” will remove all tokens from the ignore list. +To remove a previously added token from the list, use the “unignore” command. +The “unignore” command will make Mutt display headers with the given pattern. +For example, if you do “ignore x-” it is possible to “unignore x-mailer”. +

    +“unignore *” will remove all tokens from the ignore list.

    Example 3.9. Header weeding

    -# Sven's draconian header weeding
+# Sven's draconian header weeding
 ignore *
 unignore from date subject to cc
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
 unignore posted-to:
-

    10.3. Ordering Displayed Headers

    Usage:

    hdr_order +


    10.2. Ordering Displayed Headers

    Usage:

    hdr_order header [ header @@ -627,16 +555,14 @@ | header ... }

    -With the hdr_order command you can specify an order -in which Mutt will attempt to present these headers to you when viewing -messages. +With the hdr_order command you can specify an order in +which Mutt will attempt to present these headers to you when viewing messages.

    -“unhdr_order *” will clear all previous -headers from the order list, thus removing the header order effects set -by the system-wide startup file. +“unhdr_order *” will clear all previous headers from the order list, +thus removing the header order effects set by the system-wide startup file.

    Example 3.10. Configuring header display order

     hdr_order From Date: From: To: Cc: Subject:
-

    11. Alternative Addresses

    Usage:

    alternates [ +


    11. Alternative Addresses

    Usage:

    alternates [ -group name ...] @@ -651,17 +577,17 @@ | regexp ... }

    -With various functions, Mutt will treat messages differently, depending -on whether you sent them or whether you received them from someone else. -For instance, when replying to a message that you sent to a different -party, Mutt will automatically suggest to send the response to the -original message's recipients — responding to yourself won't make -much sense in many cases. (See $reply_to.) +With various functions, Mutt will treat messages differently, +depending on whether you sent them or whether you received them from +someone else. For instance, when replying to a message that you +sent to a different party, Mutt will automatically suggest to send +the response to the original message's recipients — responding to +yourself won't make much sense in many cases. (See $reply_to.)

    Many users receive e-mail under a number of different addresses. To -fully use Mutt's features here, the program must be able to recognize -what e-mail addresses you receive mail under. That's the purpose of the -alternates command: It takes a list of regular +fully use Mutt's features here, the program must be able to +recognize what e-mail addresses you receive mail under. That's the +purpose of the alternates command: It takes a list of regular expressions, each of which can identify an address under which you receive e-mail.

    @@ -671,38 +597,38 @@ 

     alternates user@example

    -Mutt will consider “some-user@example” -as being your address, too which may not be desired. As a solution, in -such cases addresses should be specified as: +Mutt will consider “some-user@example” as +being your address, too which may not be desired. As a solution, in such +cases addresses should be specified as: 

     alternates '^user@example$'

    -The -group flag causes all of the subsequent regular -expressions to be added to the named group. +The -group flag causes all of the subsequent regular expressions +to be added to the named group.

    -The unalternates command can be used to write -exceptions to alternates patterns. If an address -matches something in an alternates command, but you -nonetheless do not think it is from you, you can list a more precise -pattern under an unalternates command. -

    -To remove a regular expression from the alternates -list, use the unalternates command with exactly the -same regexp. Likewise, if the -regexp for an alternates command -matches an entry on the unalternates list, that -unalternates entry will be removed. If the -regexp for unalternates is -“*”, all entries on -alternates will be removed. -

    12. Mailing Lists

    Usage:

    lists [ +The unalternates command can be used to write exceptions to +alternates patterns. If an address matches something in an +alternates command, but you nonetheless do not think it is +from you, you can list a more precise pattern under an unalternates +command. +

    +To remove a regular expression from the alternates list, use the +unalternates command with exactly the same regexp. +Likewise, if the regexp for an alternates command matches +an entry on the unalternates list, that unalternates +entry will be removed. If the regexp for unalternates +is “*”, all entries on alternates will be removed. +

    12. Mailing Lists

    Usage:

    lists [ -group name ...] regexp [ regexp -...]
    unlists { +...]
    unlists [ +-group +name +...] { * | regexp @@ -713,84 +639,84 @@ regexp [ regexp -...]
    unsubscribe { +...]
    unsubscribe [ +-group +name +...] { * | regexp ... }

    -Mutt has a few nice features for handling -mailing lists. In order to take advantage of them, you must -specify which addresses belong to mailing lists, and which mailing lists -you are subscribed to. Mutt also has limited support for auto-detecting -mailing lists: it supports parsing mailto: links in -the common List-Post: header which has the same -effect as specifying the list address via the lists -command (except the group feature). Once you have done this, the <list-reply> -function will work for all known lists. Additionally, when you send a -message to a subscribed list, Mutt will add a Mail-Followup-To header to -tell other users' mail user agents not to send copies of replies to your -personal address. -

    Note

    +Mutt has a few nice features for handling mailing lists. In order to take advantage of them, you must +specify which addresses belong to mailing lists, and which mailing +lists you are subscribed to. Mutt also has limited support for +auto-detecting mailing lists: it supports parsing +mailto: links in the common +List-Post: header which has the same effect as +specifying the list address via the lists command +(except the group feature). Once you have done this, the +<list-reply> +function will work for all known lists. +Additionally, when you send a message to a subscribed list, Mutt will +add a Mail-Followup-To header to tell other users' mail user agents +not to send copies of replies to your personal address. +

    Note

    The Mail-Followup-To header is a non-standard extension which is not -supported by all mail user agents. Adding it is not bullet-proof -against receiving personal CCs of list messages. Also note that the -generation of the Mail-Followup-To header is controlled by the $followup_to configuration variable since -it's common practice on some mailing lists to send Cc upon replies -(which is more a group- than a list-reply). +supported by all mail user agents. Adding it is not bullet-proof against +receiving personal CCs of list messages. Also note that the generation +of the Mail-Followup-To header is controlled by the +$followup_to +configuration variable since it's common practice on some mailing lists +to send Cc upons replies (which is more a group- than a list-reply).

    -More precisely, Mutt maintains lists of patterns for the addresses of -known and subscribed mailing lists. Every subscribed mailing list is -known. To mark a mailing list as known, use the list +More precisely, Mutt maintains lists of patterns for the addresses +of known and subscribed mailing lists. Every subscribed mailing +list is known. To mark a mailing list as known, use the list command. To mark it as subscribed, use subscribe.

    -You can use regular expressions with both commands. To mark all messages -sent to a specific bug report's address on Debian's bug tracking system -as list mail, for instance, you could say +You can use regular expressions with both commands. To mark all +messages sent to a specific bug report's address on Debian's bug +tracking system as list mail, for instance, you could say 

     subscribe [0-9]*.*@bugs.debian.org

    -as it's often sufficient to just give a portion of the list's e-mail -address. +as it's often, it's sufficient to just give a portion of the list's e-mail address.

    Specify as much of the address as you need to to remove ambiguity. For -example, if you've subscribed to the Mutt mailing list, you will receive -mail addressed to mutt-users@mutt.org. So, to tell -Mutt that this is a mailing list, you could add lists -mutt-users@ to your initialization file. To tell Mutt that -you are subscribed to it, add subscribe -mutt-users to your initialization file instead. If you also -happen to get mail from someone whose address is +example, if you've subscribed to the Mutt mailing list, you will receive mail +addressed to mutt-users@mutt.org. So, to tell Mutt +that this is a mailing list, you could add lists mutt-users@ to your +initialization file. To tell Mutt that you are subscribed to it, +add subscribe mutt-users to your initialization file instead. +If you also happen to get mail from someone whose address is mutt-users@example.com, you could use -lists ^mutt-users@mutt\\.org$ or -subscribe ^mutt-users@mutt\\.org$ -to match only mail from the actual list. -

    -The -group flag adds all of the subsequent regular -expressions to the named address group -in addition to adding to the specified address list. -

    -The “unlists” command is used to remove a token from the -list of known and subscribed mailing-lists. Use “unlists *” -to remove all tokens. -

    -To remove a mailing list from the list of subscribed mailing lists, but -keep it on the list of known mailing lists, use -unsubscribe. -

    13. Using Multiple Spool Mailboxes

    Usage:

    mbox-hook +lists ^mutt-users@mutt\\.org$ +or subscribe ^mutt-users@mutt\\.org$ to +match only mail from the actual list. +

    +The -group flag adds all of the subsequent regular expressions +to the named group. +

    +The “unlists” command is used to remove a token from the list of +known and subscribed mailing-lists. Use “unlists *” to remove all +tokens. +

    +To remove a mailing list from the list of subscribed mailing lists, +but keep it on the list of known mailing lists, use unsubscribe. +

    13. Using Multiple Spool Mailboxes

    Usage:

    mbox-hook [!]pattern mailbox

    This command is used to move read messages from a specified mailbox to a different mailbox automatically when you quit or change folders. -pattern is a regular expression specifying the -mailbox to treat as a “spool” mailbox and -mailbox specifies where mail should be saved when +pattern is a regular expression specifying the mailbox to treat as a +“spool” mailbox and mailbox specifies where mail should be saved when read.

    -Unlike some of the other hook commands, only the -first matching pattern is used (it is not possible -to save read mail in more than a single mailbox). -

    14. Monitoring Incoming Mail

    Usage:

    mailboxes +Unlike some of the other hook commands, only the first matching +pattern is used (it is not possible to save read mail in more than a single +mailbox). +

    14. Monitoring Incoming Mail

    Usage:

    mailboxes mailbox [ mailbox @@ -799,119 +725,132 @@ | mailbox ... }

    -This command specifies folders which can receive mail and which will be -checked for new messages periodically. +This command specifies folders which can receive mail and +which will be checked for new messages periodically.

    folder can either be a local file or directory (Mbox/Mmdf or Maildir/Mh). If Mutt was built with POP and/or IMAP support, folder can also be a POP/IMAP folder -URL. The URL syntax is described in Section 1.2, “URL Syntax”, POP -and IMAP are described in Section 3, “POP3 Support” and Section 4, “IMAP Support” respectively. +URL. The URL syntax is described in Section 1.2, “URL Syntax”, +POP and IMAP are described in Section 3, “POP3 Support” and Section 4, “IMAP Support” +respectively.

    Mutt provides a number of advanced features for handling (possibly many) -folders and new mail within them, please refer to Section 10, “New Mail Detection” for details (including in what situations and how -often Mutt checks for new mail). -

    -The “unmailboxes” command is used to remove a token from -the list of folders which receive mail. Use “unmailboxes *” -to remove all tokens. -

    Note

    -The folders in the mailboxes command are resolved -when the command is executed, so if these names contain shortcut characters (such as “=” -and “!”), any variable definition that affects these -characters (like $folder and $spoolfile) should be set before the -mailboxes command. If none of these shortcuts are -used, a local path should be absolute as otherwise Mutt tries to find it -relative to the directory from where Mutt was started which may not -always be desired. -

    15. User-Defined Headers

    Usage:

    my_hdr +folders and new mail within them, please refer to +Section 9, “Handling multiple folders” for details (including in what +situations and how often Mutt checks for new mail). +

    +The “unmailboxes” command is used to remove a token from the list +of folders which receive mail. Use “unmailboxes *” to remove all +tokens. +

    Note

    +The folders in the mailboxes command are resolved when +the command is executed, so if these names contain shortcut characters (such as “=” and “!”), any variable +definition that affects these characters (like $folder and $spoolfile) +should be set before the mailboxes command. If +none of these shorcuts are used, a local path should be absolute as +otherwise Mutt tries to find it relative to the directory +from where Mutt was started which may not always be desired. +

    +For Mbox and Mmdf folders, new mail is detected by comparing access and/or +modification times of files: Mutt assumes a folder has new mail if it wasn't +accessed after it was last modified. Utilities like biff or +frm or any other program which accesses the mailbox might cause +Mutt to never detect new mail for that mailbox if they do not properly reset the +access time. Other possible causes of Mutt not detecting new mail in these folders +are backup tools (updating access times) or filesystems mounted without +access time update support. +

    +In cases where new mail detection for Mbox or Mmdf folders appears to be +unreliable, the +$check_mbox_size +option can be used to make Mutt track and consult file sizes for new +mail detection instead which won't work for size-neutral changes. +

    15. User-Defined Headers

    Usage:

    my_hdr string
    unmy_hdr { * | field ... }

    -The my_hdr command allows you to create your own -header fields which will be added to every message you send and appear -in the editor if $edit_headers is -set. -

    -For example, if you would like to add an “Organization:” -header field to all of your outgoing messages, you can put the command -something like shown in Example 3.11, “Defining custom headers” in your -.muttrc. +The my_hdr command allows you to create your own header +fields which will be added to every message you send and appear in the +editor if $edit_headers is set. +

    +For example, if you would like to add an “Organization:” header field to +all of your outgoing messages, you can put the command something like +shown in Example 3.11, “Defining custom headers” in your .muttrc.

    Example 3.11. Defining custom headers

     my_hdr Organization: A Really Big Company, Anytown, USA
-

    Note

    -Space characters are not allowed between the -keyword and the colon (“:”). The standard for electronic -mail (RFC2822) says that space is illegal there, so Mutt enforces the -rule. +


    Note

    +Space characters are not allowed between the keyword and +the colon (“:”). The standard for electronic mail (RFC2822) says that +space is illegal there, so Mutt enforces the rule.

    If you would like to add a header field to a single message, you should -either set the $edit_headers -variable, or use the <edit-headers> function -(default: “E”) in the compose menu so that you can edit the -header of your message along with the body. -

    -To remove user defined header fields, use the -unmy_hdr command. You may specify an asterisk -(“*”) to remove all header fields, or the fields to -remove. For example, to remove all “To” and -“Cc” header fields, you could use: +either set the $edit_headers variable, +or use the <edit-headers> function (default: “E”) in the compose menu so +that you can edit the header of your message along with the body. +

    +To remove user defined header fields, use the unmy_hdr +command. You may specify an asterisk (“*”) to remove all header +fields, or the fields to remove. For example, to remove all “To” and +“Cc” header fields, you could use: 

     unmy_hdr to cc
-

    16. Specify Default Save Mailbox

    Usage:

    save-hook +

    16. Specify Default Save Mailbox

    Usage:

    save-hook [!]pattern mailbox

    This command is used to override the default mailbox used when saving -messages. mailbox will be used as the default if -the message matches pattern, see Message Matching in Hooks for information on the exact format. +messages. mailbox will be used as the default if the message +matches pattern, see Message Matching in Hooks for information +on the exact format.

    -To provide more flexibility and good defaults, Mutt applies the expandos -of $index_format to +To provide more flexibility and good defaults, Mutt applies the +expandos of $index_format to mailbox after it was expanded.

    Example 3.12. Using %-expandos in save-hook

    -# default: save all to ~/Mail/<author name>
+# default: save all to ~/Mail/<author name>
 save-hook . ~/Mail/%F
 
-# save from me@turing.cs.hmc.edu and me@cs.hmc.edu to $folder/elkins
+# save from me@turing.cs.hmc.edu and me@cs.hmc.edu to $folder/elkins
 save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins
 
-# save from aol.com to $folder/spam
+# save from aol.com to $folder/spam
 save-hook aol\\.com$ +spam

    Also see the fcc-save-hook command. -

    17. Specify Default Fcc: Mailbox When Composing

    Usage:

    fcc-hook +

    17. Specify Default Fcc: Mailbox When Composing

    Usage:

    fcc-hook [!]pattern mailbox

    -This command is used to save outgoing mail in a mailbox other than $record. Mutt searches the initial list of -message recipients for the first matching regexp -and uses mailbox as the default Fcc: mailbox. If -no match is found the message will be saved to $record mailbox. +This command is used to save outgoing mail in a mailbox other than +$record. Mutt searches the initial list of +message recipients for the first matching regexp and uses mailbox +as the default Fcc: mailbox. If no match is found the message will be saved +to $record mailbox.

    To provide more flexibility and good defaults, Mutt applies the expandos of $index_format to mailbox after it was expanded.

    -See Message Matching in Hooks for information on the exact format -of pattern. +See Message Matching in Hooks for information on the exact format of pattern. 

    fcc-hook [@.]aol\\.com$ +spammers

    -...will save a copy of all messages going to the aol.com domain to the -`+spammers' mailbox by default. Also see the fcc-save-hook command. -

    18. Specify Default Save Filename and Default Fcc: Mailbox at Once

    Usage:

    fcc-save-hook +...will save a copy of all messages going to the aol.com domain to +the `+spammers' mailbox by default. Also see the fcc-save-hook command. +

    18. Specify Default Save Filename and Default Fcc: Mailbox at Once

    Usage:

    fcc-save-hook [!]pattern mailbox

    -This command is a shortcut, equivalent to doing both a fcc-hook and a save-hook with its -arguments, including %-expansion on mailbox -according to $index_format. -

    19. Change Settings Based Upon Message Recipients

    Usage:

    reply-hook +This command is a shortcut, equivalent to doing both a fcc-hook +and a save-hook with its arguments, +including %-expansion on mailbox according +to $index_format. +

    19. Change Settings Based Upon Message Recipients

    Usage:

    reply-hook [!]pattern command @@ -924,124 +863,99 @@ command

    -These commands can be used to execute arbitrary configuration commands -based upon recipients of the message. pattern is -used to match the message, see Message Matching in Hooks for -details. command is executed when -pattern matches. -

    -reply-hook is matched against the message you are -replying to, instead of the message you are -sending. send-hook is matched -against all messages, both new and -replies. -

    Note

    -reply-hooks are matched before -the send-hook, regardless of the -order specified in the user's configuration file. +These commands can be used to execute arbitrary configuration commands based +upon recipients of the message. pattern is used to match +the message, see Message Matching in Hooks for details. command +is executed when pattern matches. +

    +reply-hook is matched against the message you are replying to, +instead of the message you are sending. send-hook is +matched against all messages, both new +and replies. +

    Note

    +reply-hooks are matched before the send-hook, regardless +of the order specified in the user's configuration file.

    -send2-hook is matched every time a message is -changed, either by editing it, or by using the compose menu to change -its recipients or subject. send2-hook is executed -after send-hook, and can, e.g., be used to set -parameters such as the $sendmail -variable depending on the message's sender address. -

    -For each type of send-hook or -reply-hook, when multiple matches occur, commands are -executed in the order they are specified in the -.muttrc (for that type of hook). +send2-hook is matched every time a message is changed, either +by editing it, or by using the compose menu to change its recipients +or subject. send2-hook is executed after send-hook, and +can, e.g., be used to set parameters such as the $sendmail variable depending on the message's sender +address.

    -Example: send-hook mutt -"set mime_forward signature=''" +For each type of send-hook or reply-hook, when multiple matches +occur, commands are executed in the order they are specified in the .muttrc +(for that type of hook). +

    +Example: send-hook mutt "set mime_forward signature=''"

    Another typical use for this command is to change the values of the -$attribution, $signature and $locale variables in order to change the -language of the attributions and signatures based upon the recipients. -

    Note

    +$attribution, $signature and $locale +variables in order to change the language of the attributions and +signatures based upon the recipients. +

    Note

    send-hook's are only executed once after getting the initial list of recipients. Adding a recipient after replying or -editing the message will not cause any send-hook to -be executed, similarly if $autoedit is -set (as then the initial list of recipients is empty). Also note that -my_hdr commands which +editing the message will not cause any send-hook to be executed, +similarily if $autoedit is set +(as then the initial list of recipients is empty). Also note that my_hdr commands which modify recipient headers, or the message's subject, don't have any effect on the current message when executed from a send-hook. -

    20. Change Settings Before Formatting a Message

    Usage:

    message-hook +

    20. Change Settings Before Formatting a Message

    Usage:

    message-hook [!]pattern command

    This command can be used to execute arbitrary configuration commands -before viewing or formatting a message based upon information about the -message. command is executed if the -pattern matches the message to be displayed. When -multiple matches occur, commands are executed in the order they are -specified in the .muttrc. +before viewing or formatting a message based upon information about the message. +command is executed if the pattern matches the message to be +displayed. When multiple matches occur, commands are executed in the order +they are specified in the .muttrc.

    -See Message Matching in Hooks for information on the exact format -of pattern. +See Message Matching in Hooks for +information on the exact format of pattern.

    Example: 

     message-hook ~A 'set pager=builtin'
 message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject: .*\""'
-

    21. Choosing the Cryptographic Key of the Recipient

    Usage:

    crypt-hook +

    21. Choosing the Cryptographic Key of the Recipient

    Usage:

    crypt-hook pattern keyid

    -When encrypting messages with PGP/GnuPG or OpenSSL, you may want to -associate a certain key with a given e-mail address automatically, -either because the recipient's public key can't be deduced from the -destination address, or because, for some reasons, you need to override -the key Mutt would normally use. The crypt-hook -command provides a method by which you can specify the ID of the public -key to be used when encrypting messages to a certain recipient. -

    -The meaning of keyid is to be taken broadly in this -context: You can either put a numerical key ID here, an e-mail address, -or even just a real name. -

    22. Adding Key Sequences to the Keyboard Buffer

    Usage:

    push +When encrypting messages with PGP/GnuPG or OpenSSL, you may want to associate a certain +key with a given e-mail address automatically, either because the +recipient's public key can't be deduced from the destination address, +or because, for some reasons, you need to override the key Mutt would +normally use. The crypt-hook command provides a +method by which you can specify the ID of the public key to be used +when encrypting messages to a certain recipient. +

    +The meaning of keyid is to be taken broadly in this context: You +can either put a numerical key ID here, an e-mail address, or even +just a real name. +

    22. Adding Key Sequences to the Keyboard Buffer

    Usage:

    push string

    -This command adds the named string to the keyboard buffer. The string -may contain control characters, key names and function names like the -sequence string in the macro command. You -may use it to automatically run a sequence of commands at startup, or -when entering certain folders. For example, Example 3.13, “Embedding push in folder-hook” shows how to automatically collapse all -threads when entering a folder. +This command adds the named string to the keyboard buffer. The string may +contain control characters, key names and function names like the sequence +string in the macro command. You may use it to +automatically run a sequence of commands at startup, or when entering +certain folders. For example, Example 3.13, “Embedding push in folder-hook” +shows how to automatically collapse all threads when entering a folder.

    Example 3.13. Embedding push in folder-hook

     folder-hook . 'push <collapse-all>'
-

    -For using functions like shown in the example, it's important to use -angle brackets (“<” and “>”) to make -Mutt recognize the input as a function name. Otherwise it will simulate -individual just keystrokes, i.e. “push -collapse-all” would be interpreted as if you had typed -“c”, followed by “o”, followed by -“l”, ..., which is not desired and may lead to very -unexpected behavior. -

    -Keystrokes can be used, too, but are less portable because of -potentially changed key bindings. With default bindings, this is -equivalent to the above example: -

    -folder-hook . 'push \eV'
-

    -because it simulates that Esc+V was pressed (which is the default -binding of <collapse-all>). -

    23. Executing Functions

    Usage:

    exec +


    23. Executing Functions

    Usage:

    exec function [ function ...]

    -This command can be used to execute any function. Functions are listed -in the function reference. -“exec function” is -equivalent to “push <function>”. -

    24. Message Scoring

    Usage:

    score +This command can be used to execute any function. Functions are +listed in the function reference. +“execfunction” is equivalent to +“push <function>”. +

    24. Message Scoring

    Usage:

    score pattern value @@ -1050,25 +964,20 @@ | pattern ... }

    -The score commands adds value to -a message's score if pattern matches it. -pattern is a string in the format described in the -patterns section (note: For efficiency -reasons, patterns which scan information not available in the index, -such as ~b, ~B or -~h, may not be used). value is -a positive or negative integer. A message's final score is the sum -total of all matching score entries. However, you -may optionally prefix value with an equal sign -(“=”) to cause evaluation to stop at a particular entry if -there is a match. Negative final scores are rounded up to 0. -

    -The unscore command removes score entries from the -list. You must specify the same pattern specified -in the score command for it to be removed. The -pattern “*” is a special token which means to clear the -list of all score entries. -

    25. Spam Detection

    Usage:

    spam +The score commands adds value to a message's score if pattern +matches it. pattern is a string in the format described in the patterns section (note: For efficiency reasons, patterns +which scan information not available in the index, such as ˜b, +˜B or ˜h, may not be used). value is a +positive or negative integer. A message's final score is the sum total of all +matching score entries. However, you may optionally prefix value with +an equal sign (“=”) to cause evaluation to stop at a particular entry if there is +a match. Negative final scores are rounded up to 0. +

    +The unscore command removes score entries from the list. You must +specify the same pattern specified in the score command for it to be +removed. The pattern “*” is a special token which means to clear the list +of all score entries. +

    25. Spam Detection

    Usage:

    spam pattern format @@ -1077,43 +986,39 @@ | pattern }

    -Mutt has generalized support for external spam-scoring filters. By -defining your spam patterns with the spam and -nospam commands, you can limit, -search, and sort your mail -based on its spam attributes, as determined by the external filter. You -also can display the spam attributes in your index display using the -%H selector in the $index_format variable. (Tip: try -%?H?[%H] ? to display spam tags only when they are -defined for a given message.) +Mutt has generalized support for external spam-scoring filters. +By defining your spam patterns with the spam and nospam +commands, you can limit, search, and sort your +mail based on its spam attributes, as determined by the external +filter. You also can display the spam attributes in your index +display using the %H selector in the $index_format variable. (Tip: try %?H?[%H] ? +to display spam tags only when they are defined for a given message.)

    Your first step is to define your external filter's spam patterns using -the spam command. pattern should -be a regular expression that matches a header in a mail message. If any -message in the mailbox matches this regular expression, it will receive -a “spam tag” or “spam attribute” (unless it -also matches a nospam pattern — see below.) The -appearance of this attribute is entirely up to you, and is governed by -the format parameter. format -can be any static text, but it also can include back-references from the -pattern expression. (A regular expression -“back-reference” refers to a sub-expression contained -within parentheses.) %1 is replaced with the first -back-reference in the regex, %2 with the second, etc. +the spam command. pattern should be a regular expression +that matches a header in a mail message. If any message in the mailbox +matches this regular expression, it will receive a “spam tag” or +“spam attribute” (unless it also matches a nospam pattern — see +below.) The appearance of this attribute is entirely up to you, and is +governed by the format parameter. format can be any static +text, but it also can include back-references from the pattern +expression. (A regular expression “back-reference” refers to a +sub-expression contained within parentheses.) %1 is replaced with +the first back-reference in the regex, %2 with the second, etc.

    To match spam tags, mutt needs the corresponding header information which is always the case for local and POP folders but not for IMAP in the default configuration. Depending on the spam header to be analyzed, -$imap_headers may need to be -adjusted. +$imap_headers may need +to be adjusted.

    -If you're using multiple spam filters, a message can have more than one -spam-related header. You can define spam patterns for -each filter you use. If a message matches two or more of these patterns, -and the $spam_separator variable -is set to a string, then the message's spam tag will consist of all the -format strings joined together, with the value of -$spam_separator separating them. +If you're using multiple spam filters, a message can have more than +one spam-related header. You can define spam patterns for each +filter you use. If a message matches two or more of these patterns, and +the $spam_separator variable is set to a string, then the +message's spam tag will consist of all the format strings joined +together, with the value of $spam_separator separating +them.

    For example, suppose one uses DCC, SpamAssassin, and PureMessage, then the configuration might look like in Example 3.14, “Configuring spam detection”. @@ -1123,103 +1028,92 @@ spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM" set spam_separator=", "


    -If then a message is received that DCC registered with -“many” hits under the “Fuz2” checksum, and -that PureMessage registered with a 97% probability of being spam, that -message's spam tag would read 90+/DCC-Fuz2, -97/PM. (The four characters before “=many” in a -DCC report indicate the checksum used — in this case, -“Fuz2”.) -

    -If the $spam_separator variable is -unset, then each spam pattern match supersedes the previous one. Instead -of getting joined format strings, you'll get only -the last one to match. +If then a message is received that DCC registered with “many” hits +under the “Fuz2” checksum, and that PureMessage registered with a +97% probability of being spam, that message's spam tag would read +90+/DCC-Fuz2, 97/PM. (The four characters before “=many” in a +DCC report indicate the checksum used — in this case, “Fuz2”.) +

    +If the $spam_separator variable is unset, then each +spam pattern match supersedes the previous one. Instead of getting +joined format strings, you'll get only the last one to match.

    The spam tag is what will be displayed in the index when you use %H in the $index_format variable. It's also the -string that the ~H pattern-matching expression -matches against for <search> and -<limit> functions. And it's what sorting by -spam attribute will use as a sort key. +string that the ˜H pattern-matching expression matches against for +<search> and <limit> functions. And it's what sorting by spam +attribute will use as a sort key.

    That's a pretty complicated example, and most people's actual environments will have only one spam filter. The simpler your configuration, the more effective Mutt can be, especially when it comes to sorting.

    -Generally, when you sort by spam tag, Mutt will sort -lexically — that is, by ordering strings -alphanumerically. However, if a spam tag begins with a number, Mutt will -sort numerically first, and lexically only when two numbers are equal in -value. (This is like UNIX's sort -n.) A message with -no spam attributes at all — that is, one that didn't match -any of your spam patterns -— is sorted at lowest priority. Numbers are sorted next, beginning -with 0 and ranging upward. Finally, non-numeric strings are sorted, with -“a” taking lower priority than “z”. Clearly, -in general, sorting by spam tags is most effective when you can coerce -your filter to give you a raw number. But in case you can't, Mutt can -still do something useful. -

    -The nospam command can be used to write exceptions to -spam patterns. If a header pattern matches something -in a spam command, but you nonetheless do not want it -to receive a spam tag, you can list a more precise pattern under a -nospam command. -

    -If the pattern given to nospam -is exactly the same as the pattern on an existing -spam list entry, the effect will be to remove the -entry from the spam list, instead of adding an exception. Likewise, if -the pattern for a spam command -matches an entry on the nospam list, that nospam -entry will be removed. If the pattern for -nospam is “*”, all entries on -both lists will be removed. This might be the default action -if you use spam and nospam in -conjunction with a folder-hook. -

    -You can have as many spam or -nospam commands as you like. You can even do your -own primitive spam detection within Mutt — for -example, if you consider all mail from MAILER-DAEMON -to be spam, you can use a spam command like this: +Generally, when you sort by spam tag, Mutt will sort lexically — +that is, by ordering strings alphanumerically. However, if a spam tag +begins with a number, Mutt will sort numerically first, and lexically +only when two numbers are equal in value. (This is like UNIX's +sort -n.) A message with no spam attributes at all — that is, one +that didn't match any of your spam patterns — is sorted at +lowest priority. Numbers are sorted next, beginning with 0 and ranging +upward. Finally, non-numeric strings are sorted, with “a” taking lower +priority than “z”. Clearly, in general, sorting by spam tags is most +effective when you can coerce your filter to give you a raw number. But +in case you can't, Mutt can still do something useful. +

    +The nospam command can be used to write exceptions to spam +patterns. If a header pattern matches something in a spam command, +but you nonetheless do not want it to receive a spam tag, you can list a +more precise pattern under a nospam command. +

    +If the pattern given to nospam is exactly the same as the +pattern on an existing spam list entry, the effect will be to +remove the entry from the spam list, instead of adding an exception. +Likewise, if the pattern for a spam command matches an entry +on the nospam list, that nospam entry will be removed. If the +pattern for nospam is “*”, all entries on both lists +will be removed. This might be the default action if you use spam +and nospam in conjunction with a folder-hook. +

    +You can have as many spam or nospam commands as you like. +You can even do your own primitive spam detection within Mutt — for +example, if you consider all mail from MAILER-DAEMON to be spam, +you can use a spam command like this: 

     spam "^From: .*MAILER-DAEMON"       "999"
-

    26. Setting and Querying Variables

    26.1. Variable Types

    +

    26. Setting and Querying Variables

    26.1. Variable Types

    Mutt supports these types of configuration variables:

    boolean

    -A boolean expression, either “yes” or “no”. +A boolean expression, either “yes” or “no”.

    number

    A signed integer number in the range -32768 to 32767.

    string

    Arbitrary text.

    path

    A specialized string for representing paths including support for -mailbox shortcuts (see Section 8, “Mailbox Shortcuts”) as well as tilde -(“~”) for a user's home directory and more. +mailbox shortcuts (see Section 7, “Mailbox Shortcuts”) as well as tilde +(“˜”) for a user's home directory and more.

    quadoption

    -Like a boolean but triggers a prompt when set to “ask-yes” -or “ask-no” with “yes” and “no” +Like a boolean but triggers a prompt when set to “ask-yes” +or “ask-no” with “yes” and “no” preselected respectively.

    sort order

    A specialized string allowing only particular words as values depending on the variable.

    regular expression

    -A regular expression, see Section 2, “Regular Expressions” for an introduction. +A regular expression, see Section 1, “Regular Expressions” for an introduction.

    folder magic

    Specifies the type of folder to use: mbox, -mmdf, mh or -maildir. Currently only used to determine the type -for newly created folders. +mmdf, mh +or maildir. +Currently only used to determine the type for newly created folders.

    e-mail address

    -An e-mail address either with or without realname. The older -“user@example.org (Joe User)” form is -supported but strongly deprecated. +An e-mail address either with or without +realname. The older “user@example.org (Joe User)” +form is supported but strongly deprecated.

    user-defined

    Arbitrary text, see Section 26.3, “User-Defined Variables” for details. -

    26.2. Commands

    +

    26.2. Commands

    The following commands are available to manipulate and query variables:

    Usage:

    set { [ no | inv ] @@ -1239,85 +1133,81 @@ [ variable ...]

    -This command is used to set (and unset) configuration variables. There are four -basic types of variables: boolean, number, string and quadoption. -boolean variables can be set -(true) or unset (false). -number variables can be assigned a positive integer -value. string variables consist of any number of -printable characters and must be enclosed in quotes if they contain -spaces or tabs. You may also use the escape sequences “\n” -and “\t” for newline and tab, respectively. -quadoption variables are used to control whether or -not to be prompted for certain actions, or to specify a default action. -A value of yes will cause the action to be carried -out automatically as if you had answered yes to the question. -Similarly, a value of no will cause the action to -be carried out as if you had answered “no.” A value of -ask-yes will cause a prompt with a default answer -of “yes” and ask-no will provide a -default answer of “no.” -

    -Prefixing a variable with “no” will unset it. Example: -set noaskbcc. -

    -For boolean variables, you may optionally prefix -the variable name with inv to toggle the value (on or -off). This is useful when writing macros. Example: -set invsmart_wrap. -

    -The toggle command automatically prepends the -inv prefix to all specified variables. -

    -The unset command automatically prepends the -no prefix to all specified variables. -

    -Using the <enter-command> function in the -index menu, you can query the value of a variable -by prefixing the name of the variable with a question mark: +This command is used to set (and unset) configuration variables. There are four basic types of variables: +boolean, number, string and quadoption. boolean variables can be +set (true) or unset (false). number variables can be +assigned a positive integer value. +string variables consist of any number of printable characters and +must be enclosed in quotes if they contain spaces or tabs. You +may also use the escape sequences “\n” and “\t” for newline and tab, respectively. +quadoption variables are used to control whether or not to be prompted +for certain actions, or to specify a default action. A value of yes +will cause the action to be carried out automatically as if you had answered +yes to the question. Similarly, a value of no will cause the +action to be carried out as if you had answered “no.” A value of +ask-yes will cause a prompt with a default answer of “yes” and +ask-no will provide a default answer of “no.” +

    +Prefixing a variable with “no” will unset it. Example: set noaskbcc. +

    +For boolean variables, you may optionally prefix the variable name with +inv to toggle the value (on or off). This is useful when writing +macros. Example: set invsmart_wrap. +

    +The toggle command automatically prepends the inv prefix to all +specified variables. +

    +The unset command automatically prepends the no prefix to all +specified variables. +

    +Using the <enter-command> function in the index menu, you can query the +value of a variable by prefixing the name of the variable with a question +mark: 

     set ?allow_8bit

    The question mark is actually only required for boolean and quadoption variables.

    -The reset command resets all given variables to the -compile time defaults (hopefully mentioned in this manual). If you use -the command set and prefix the variable with -“&” this has the same behavior as the -reset command. -

    -With the reset command there exists the special -variable “all”, which allows you to reset all variables to -their system defaults. -

    26.3. User-Defined Variables

    26.3.1. Introduction

    -Along with the variables listed in the Configuration variables section, Mutt -supports user-defined variables with names starting with -my_ as in, for example, my_cfgdir. -

    -The set command either creates a custom -my_ variable or changes its value if it does exist -already. The unset and reset +The reset command resets all given variables to the compile time +defaults (hopefully mentioned in this manual). If you use the command +set and prefix the variable with “&” this has the same +behavior as the reset command. +

    +With the reset command there exists the special variable “all”, +which allows you to reset all variables to their system defaults. +

    26.3. User-Defined Variables

    26.3.1. Introduction

    +Along with the variables listed in the +Configuration variables section, Mutt +supports user-defined variables with names starting +with my_ as in, for +example, my_cfgdir. +

    +The set command either creates a +custom my_ variable or changes its +value if it does exist already. The unset and reset commands remove the variable entirely.

    Since user-defined variables are expanded in the same way that -environment variables are (except for the shell-escape command and backtick -expansion), this feature can be used to make configuration files more -readable. -

    26.3.2. Examples

    -The following example defines and uses the variable -my_cfgdir to abbreviate the calls of the source command: +environment variables are (except for +the shell-escape command and +backtick expansion), this feature can be used to make configuration +files more readable. +

    26.3.2. Examples

    +The following example defines and uses the variable my_cfgdir +to abbreviate the calls of the source command:

    Example 3.15. Using user-defined variables for config file readability

     set my_cfgdir = $HOME/mutt/config
 
 source $my_cfgdir/hooks
 source $my_cfgdir/macros
-# more source commands...
+# more source commands...

    A custom variable can also be used in macros to backup the current value -of another variable. In the following example, the value of the $delete is changed temporarily while its -original value is saved as my_delete. After the -macro has executed all commands, the original value of $delete is restored. +of another variable. In the following example, the value of the +$delete is changed temporarily +while its original value is saved as my_delete. +After the macro has executed all commands, the original value of $delete is restored.

    Example 3.16. Using user-defined variables for backing up other config option values

     macro pager ,x '\
 <enter-command>set my_delete=$delete<enter>\
@@ -1341,123 +1231,81 @@
 <enter-command> set pager_stop=\$my_old_pager_stop<Enter>\
 <enter-command> unset my_old_pager_stop<Enter>"

    -Note that there is a space between -<enter-command> and the set -configuration command, preventing Mutt from recording the -macro's commands into its history. -

    26.4. Type Conversions

    -Variables are always assigned string values which Mutt parses into its -internal representation according to the type of the variable, for -example an integer number for numeric types. For all queries (including -$-expansion) the value is converted from its internal type back into -string. As a result, any variable can be assigned any value given that -its content is valid for the target. This also counts for custom -variables which are of type string. In case of parsing errors, Mutt will -print error messages. Example 3.18, “Type conversions using variables” demonstrates type -conversions. -

    Example 3.18. Type conversions using variables

    -set my_lines = "5"                # value is string "5"
-set pager_index_lines = $my_lines # value is integer 5
-
-set my_sort = "date-received"     # value is string "date-received"
-set sort = "last-$my_sort"        # value is sort last-date-received
-
-set my_inc = $read_inc            # value is string "10" (default of $read_inc)
-set my_foo = $my_inc              # value is string "10"
-

    -These assignments are all valid. If, however, the value of -$my_lines would have been -“five” (or something else that cannot be parsed into a -number), the assignment to -$pager_index_lines would have -produced an error message. -

    -Type conversion applies to all configuration commands which take -arguments. But please note that every expanded value of a variable is -considered just a single token. A working example is: -

    -set my_pattern = "~A"
-set my_number = "10"
-
-# same as: score ~A +10
-score $my_pattern +$my_number

    -What does not work is: -

    -set my_mx = "+mailbox1 +mailbox2"
-mailboxes $my_mx +mailbox3

    -because the value of $my_mx is interpreted as a -single mailbox named “+mailbox1 +mailbox2” and not two -distinct mailboxes. -

    27. Reading Initialization Commands From Another File

    Usage:

    source +Note that there is a space +between <enter-command> and +the set configuration command, preventing Mutt from +recording the macro's commands into its history. +

    27. Reading Initialization Commands From Another File

    Usage:

    source filename

    -This command allows the inclusion of initialization commands from other -files. For example, I place all of my aliases in -~/.mail_aliases so that I can make my -~/.muttrc readable and keep my aliases private. -

    -If the filename begins with a tilde (“~”), it will be -expanded to the path of your home directory. -

    -If the filename ends with a vertical bar (“|”), then -filename is considered to be an executable program -from which to read input (e.g. source -~/bin/myscript|). -

    28. Removing Hooks

    Usage:

    unhook { +This command allows the inclusion of initialization commands +from other files. For example, I place all of my aliases in +˜/.mail_aliases so that I can make my +˜/.muttrc readable and keep my aliases private. +

    +If the filename begins with a tilde (“˜”), it will be expanded to the +path of your home directory. +

    +If the filename ends with a vertical bar (“|”), then filename is +considered to be an executable program from which to read input (eg. +source ˜/bin/myscript|). +

    28. Removing Hooks

    Usage:

    unhook { * | hook-type }

    This command permits you to flush hooks you have previously defined. -You can either remove all hooks by giving the “*” character -as an argument, or you can remove all hooks of a specific type by saying +You can either remove all hooks by giving the “*” character as an +argument, or you can remove all hooks of a specific type by saying something like unhook send-hook. -

    29. Format Strings

    29.1. Basic usage

    +

    29. Format Strings

    29.1. Basic usage

    Format strings are a general concept you'll find in several locations -through the Mutt configuration, especially in the $index_format, $pager_format, $status_format, and other related -variables. These can be very straightforward, and it's quite possible -you already know how to use them. -

    -The most basic format string element is a percent symbol followed by -another character. For example, %s represents a -message's Subject: header in the $index_format variable. The -“expandos” available are documented with each format -variable, but there are general modifiers available with all formatting -expandos, too. Those are our concern here. -

    -Some of the modifiers are borrowed right out of C (though you might know -them from Perl, Python, shell, or another language). These are the -[-]m.n modifiers, as in -%-12.12s. As with such programming languages, these -modifiers allow you to specify the minimum and maximum size of the -resulting string, as well as its justification. If the “-” -sign follows the percent, the string will be left-justified instead of -right-justified. If there's a number immediately following that, it's -the minimum amount of space the formatted string will occupy — if -it's naturally smaller than that, it will be padded out with spaces. If -a decimal point and another number follow, that's the maximum space -allowable — the string will not be permitted to exceed that width, -no matter its natural size. Each of these three elements is optional, so -that all these are legal format strings: %-12s, -%4c, %.15F and -%-12.15L. +through the Mutt configuration, especially in the +$index_format, +$pager_format, +$status_format, +and other related variables. These can be very straightforward, +and it's quite possible you already know how to use them. +

    +The most basic format string element is a percent symbol followed +by another character. For example, %s +represents a message's Subject: header in the $index_format variable. The +“expandos” available are documented with each format variable, but +there are general modifiers available with all formatting expandos, +too. Those are our concern here. +

    +Some of the modifiers are borrowed right out of C (though you might +know them from Perl, Python, shell, or another language). These are +the [-]m.n modifiers, as in %-12.12s. As with +such programming languages, these modifiers allow you to specify the +minimum and maximum size of the resulting string, as well as its +justification. If the “-” sign follows the percent, the string will +be left-justified instead of right-justified. If there's a number +immediately following that, it's the minimum amount of space the +formatted string will occupy — if it's naturally smaller than that, it +will be padded out with spaces. If a decimal point and another number +follow, that's the maximum space allowable — the string will not be +permitted to exceed that width, no matter its natural size. Each of +these three elements is optional, so that all these are legal format +strings: %-12s, %4c, +%.15F and %-12.15L.

    Mutt adds some other modifiers to format strings. If you use an equals symbol (=) as a numeric prefix (like the minus -above), it will force the string to be centered within its minimum space -range. For example, %=14y will reserve 14 characters -for the %y expansion — that's the X-Label: header, in $index_format. If the expansion results in -a string less than 14 characters, it will be centered in a 14-character -space. If the X-Label for a message were “test”, that -expansion would look like -“     test     ”. +above), it will force the string to be centered within its minimum +space range. For example, %=14y will reserve 14 +characters for the %y expansion — that's the X-Label: header, in +$index_format. If the expansion +results in a string less than 14 characters, it will be centered in a +14-character space. If the X-Label for a message were “test”, that +expansion would look like “     test     ”.

    There are two very little-known modifiers that affect the way that an -expando is replaced. If there is an underline (“_”) -character between any format modifiers (as above) and the expando -letter, it will expands in all lower case. And if you use a colon -(“:”), it will replace all decimal points with underlines. -

    29.2. Conditionals

    +expando is replaced. If there is an underline (“_”) character +between any format modifiers (as above) and the expando letter, it will +expands in all lower case. And if you use a colon (“:”), it will +replace all decimal points with underlines. +

    29.2. Conditionals

    Depending on the format string variable, some of its sequences can be used to optionally print a string if their value is nonzero. For example, you may only want to see the number of flagged messages if such @@ -1467,50 +1315,55 @@ 

     %?<sequence_char>?<optional_string>?

    where sequence_char is an expando, and -optional_string is the string you would like -printed if sequence_char is nonzero. -optional_string may contain other sequences as well -as normal text, but you may not nest optional strings. +optional_string is the string you would like printed if +sequence_char is nonzero. +optional_string may contain other +sequences as well as normal text, but you may not nest optional +strings.

    Here is an example illustrating how to optionally print the number of -new messages in a mailbox in $status_format: +new messages in a mailbox in +$status_format: 

     %?n?%n new messages.?

    You can also switch between two strings using the following construct: 

     %?<sequence_char>?<if_string>&<else_string>?

    -If the value of sequence_char is non-zero, -if_string will be expanded, otherwise -else_string will be expanded. -

    29.3. Filters

    -Any format string ending in a vertical bar (“|”) will be -expanded and piped through the first word in the string, using spaces as -separator. The string returned will be used for display. If the -returned string ends in %, it will be passed through the formatter a -second time. This allows the filter to generate a replacement format -string including % expandos. -

    -All % expandos in a format string are expanded before the script is -called so that: -

    Example 3.19. Using external filters in format strings

    +If the value of sequence_char is
+non-zero, if_string will be expanded,
+otherwise else_string will be expanded.
+

    29.3. Filters

    +Any format string ending in a vertical bar (“|”) will be +expanded and piped through the first word in the string, using spaces +as separator. The string returned will be used for display. +If the returned string ends in %, it will be passed through +the formatter a second time. This allows the filter to generate a +replacement format string including % expandos. +

    +All % expandos in a format string are expanded before the script +is called so that: +

    Example 3.18. Using external filters in format strings

     set status_format="script.sh '%r %f (%L)'|"

    -will make Mutt expand %r, %f and -%L before calling the script. The example also shows -that arguments can be quoted: the script will receive the expanded -string between the single quotes as the only argument. -

    -A practical example is the mutt_xtitle script -installed in the samples subdirectory of the Mutt -documentation: it can be used as filter for $status_format to set the current +will make Mutt expand %r, +%f and %L +before calling the script. The example also shows that arguments can be +quoted: the script will receive the expanded string between the single quotes +as the only argument. +

    +A practical example is the mutt_xtitle +script installed in the samples +subdirectory of the Mutt documentation: it can be used as filter for +$status_format to set the current terminal's title, if supported. -

    29.4. Padding

    +

    29.4. Padding

    In most format strings, Mutt supports different types of padding using special %-expandos:

    %|X

    -When this occurs, Mutt will fill the rest of the line with the character -X. For example, filling the rest of the line with -dashes is done by setting: +When this occurs, Mutt will fill the rest of the +line with the character X. For +example, filling the rest of the line with dashes is +done by setting: 

     set status_format = "%v on %h: %B: %?n?%n&no? new messages %|-"
    %>X @@ -1527,13 +1380,13 @@

    Normal right-justification will print everything to the left of the %>, displaying padding and whatever lies to the -right only if there's room. By contrast, “soft-fill” gives +right only if there's room. By contrast, “soft-fill” gives priority to the right-hand side, guaranteeing space to display it and showing padding only if there's still room. If necessary, soft-fill will eat text leftwards to make room for rightward text. For example, to right-justify the subject making sure as much as possible of it fits on -screen, one might use (note two spaces after %* : the -second ensures there's a space between the truncated right-hand side and -the subject): +screen, one might use (note two spaces after %* +: the second ensures there's a space between the truncated +right-hand side and the subject): 

     set index_format="%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?)%*  %s"
    Prev   Next
    Chapter 2. Getting Started Home Chapter 4. Advanced Usage
    diff -Nru mutt-1.5.21/doc/devel-notes.txt mutt-1.5.20/doc/devel-notes.txt --- mutt-1.5.21/doc/devel-notes.txt 2010-03-01 17:56:19.000000000 +0000 +++ mutt-1.5.20/doc/devel-notes.txt 2008-12-10 17:47:37.000000000 +0000 @@ -157,11 +157,9 @@ In order to ease later bisecting in case of bugs and code history, changes should be grouped logically, feature by feature or bugfix by -bugfix. Especially a single patch fixing several problems at once +bugfix. Escpecially a single patch fixing several problems at once should be avoided. -Before submitting patches, please make sure the check_sec.sh script -in the top-level source directory reports no errors/warnings. A word about warnings --------------------- diff -Nru mutt-1.5.21/doc/gen-map-doc mutt-1.5.20/doc/gen-map-doc --- mutt-1.5.21/doc/gen-map-doc 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/doc/gen-map-doc 2009-04-04 18:46:22.000000000 +0000 @@ -55,15 +55,13 @@ warn "map $map undefined"; next; } - my $title = $map; - $title =~ s/(.)(.+)/\U$1\E$2/; print < $maptitle Menu $DOC{$map} - -Default $title Menu Bindings +
    +Default $map Function Bindings FunctionDefault keyDescription diff -Nru mutt-1.5.21/doc/gettingstarted.html mutt-1.5.20/doc/gettingstarted.html --- mutt-1.5.21/doc/gettingstarted.html 2010-09-15 17:10:12.000000000 +0000 +++ mutt-1.5.20/doc/gettingstarted.html 2009-06-14 18:54:33.000000000 +0000 @@ -1,6 +1,6 @@ -Chapter 2. Getting Started
    Chapter 2. Getting Started
    Prev   Next

    Chapter 2. Getting Started

    Table of Contents

    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail

    -This section is intended as a brief overview of how to use Mutt. There -are many other features which are described elsewhere in the manual. -There is even more information available in the Mutt FAQ and various web -pages. See the Mutt homepage -for more details. -

    -The keybindings described in this section are the defaults as -distributed. Your local system administrator may have altered the -defaults for your site. You can always type “?” in any -menu to display the current bindings. -

    -The first thing you need to do is invoke Mutt, simply by typing -mutt at the command line. There are various -command-line options, see either the Mutt man page or the reference. -

    1. Core Concepts

    +

    Chapter 2. Getting Started
    Prev   Next

    Chapter 2. Getting Started

    Table of Contents

    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail

    +This section is intended as a brief overview of how to use Mutt. There are +many other features which are described elsewhere in the manual. There +is even more information available in the Mutt FAQ and various web +pages. See the Mutt homepage for more details. +

    +The keybindings described in this section are the defaults as distributed. +Your local system administrator may have altered the defaults for your site. +You can always type “?” in any menu to display the current bindings. +

    +The first thing you need to do is invoke Mutt, simply by typing mutt +at the command line. There are various command-line options, see +either the Mutt man page or the reference. +

    1. Core Concepts

    Mutt is a text-based application which interacts with users through different menus which are mostly line-/entry-based or page-based. A -line-based menu is the so-called “index” menu (listing all -messages of the currently opened folder) or the “alias” -menu (allowing you to select recipients from a list). Examples for -page-based menus are the “pager” (showing one message at a -time) or the “help” menu listing all available key -bindings. +line-based menu is the so-called “index” menu (listing all messages of +the currently opened folder) or the “alias” menu (allowing you to +select recipients from a list). Examples for page-based menus are the +“pager” (showing one message at a time) or the “help” menu listing +all available key bindings.

    The user interface consists of a context sensitive help line at the top, the menu's contents followed by a context sensitive status line and @@ -64,26 +59,26 @@ configuration files readable and commentable.

    Because Mutt allows for customizing almost all key bindings, there are -so-called “functions” which can be executed manually (using -the command line) or in macros. Macros allow the user to bind a sequence -of commands to a single key or a short key sequence instead of repeating -a sequence of actions over and over. +so-called “functions” which can be executed manually (using the +command line) or in macros. Macros allow the user to bind a sequence of +commands to a single key or a short key sequence instead of repeating a +sequence of actions over and over.

    Many commands (such as saving or copying a message to another folder) can be applied to a single message or a set of messages (so-called -“tagged” messages). To help selecting messages, Mutt -provides a rich set of message patterns (such as recipients, sender, -body contents, date sent/received, etc.) which can be combined into -complex expressions using the boolean and and -or operations as well as negating. These patterns -can also be used to (for example) search for messages or to limit the -index to show only matching messages. -

    -Mutt supports a “hook” concept which allows the user to -execute arbitrary configuration commands and functions in certain -situations such as entering a folder, starting a new message or replying -to an existing one. These hooks can be used to highly customize Mutt's -behavior including managing multiple identities, customizing the +“tagged” messages). To help selecting messages, Mutt provides a rich +set of message patterns (such as recipients, sender, body contents, date +sent/received, etc.) which can be combined into complex expressions +using the boolean and and or +operations as well as negating. These patterns can also be used to (for +example) search for messages or to limit the index to show only matching +messages. +

    +Mutt supports a “hook” concept which allows the user to execute +arbitrary configuration commands and functions in certain situations +such as entering a folder, starting a new message or replying to an +existing one. These hooks can be used to highly customize Mutt's +behaviour including managing multiple identities, customizing the display for a folder or even implementing auto-archiving based on a per-folder basis and much more.

    @@ -91,7 +86,7 @@ tool only send messages. It also supports a mailx(1)-compatible interface, see Table 9.1, “Command line options” for a complete list of command-line options. -

    2. Screens and Menus

    2.1. Index

    +

    2. Screens and Menus

    2.1. Index

    The index is the screen that you usually see first when you start Mutt. It gives an overview over your emails in the currently opened mailbox. By default, this is your system mailbox. The information you @@ -100,10 +95,10 @@ replied to, tagged email, ...), the date when email was sent, its sender, the email size, and the subject. Additionally, the index also shows thread hierarchies: when you reply to an email, and the other -person replies back, you can see the other person's email in a +person replies back, you can see the other's person email in a "sub-tree" below. This is especially useful for personal email between a group of people or when you've subscribed to mailing lists. -

    2.2. Pager

    +

    2.2. Pager

    The pager is responsible for showing the email content. On the top of the pager you have an overview over the most important email headers like the sender, the recipient, the subject, and much more @@ -119,20 +114,20 @@ show different things in the pager with different colors. Virtually everything that can be described with a regular expression can be colored, e.g. URLs, email addresses or smileys. -

    2.3. File Browser

    +

    2.3. File Browser

    The file browser is the interface to the local or remote file system. When selecting a mailbox to open, the browser allows custom sorting of items, limiting the items shown by a regular expression and a freely adjustable format of what to display in which way. It also allows for easy navigation through the file system when selecting file(s) to attach to a message, select multiple files to attach and many more. -

    2.4. Help

    +

    2.4. Help

    The help screen is meant to offer a quick help to the user. It lists the current configuration of key bindings and their associated commands including a short description, and currently unbound functions that still need to be associated with a key binding (or alternatively, they can be called via the Mutt command prompt). -

    2.5. Compose Menu

    +

    2.5. Compose Menu

    The compose menu features a split screen containing the information which really matter before actually sending a message by mail: who gets the message as what (recipients and who gets what kind of @@ -140,14 +135,14 @@ whether to sign, encrypt or sign and encrypt a message with/for what keys. Also, it's used to attach messages, to re-edit any attachment including the message itself. -

    2.6. Alias Menu

    +

    2.6. Alias Menu

    The alias menu is used to help users finding the recipients of messages. For users who need to contact many people, there's no need to remember addresses or names completely because it allows for searching, too. The alias mechanism and thus the alias menu also features grouping several addresses by a shorter nickname, the actual alias, so that users don't have to select each single recipient manually. -

    2.7. Attachment Menu

    +

    2.7. Attachment Menu

    As will be later discussed in detail, Mutt features a good and stable MIME implementation, that is, it supports sending and receiving messages of arbitrary MIME types. The attachment menu displays a message's @@ -155,81 +150,86 @@ part (which gives a true tree structure), which type is of what type and what size. Single parts may saved, deleted or modified to offer great and easy access to message's internals. -

    3. Moving Around in Menus

    +

    3. Moving Around in Menus

    The most important navigation keys common to line- or entry-based menus -are shown in Table 2.1, “Most common navigation keys in entry-based menus” and in Table 2.2, “Most common navigation keys in page-based menus” for page-based menus. -

    Table 2.1. Most common navigation keys in entry-based menus

    KeyFunctionDescription
    j or <Down><next-entry>move to the next entry
    k or <Up><previous-entry>move to the previous entry
    z or <PageDn><page-down>go to the next page
    Z or <PageUp><page-up>go to the previous page
    = or <Home><first-entry>jump to the first entry
    * or <End><last-entry>jump to the last entry
    q<quit>exit the current menu
    ?<help>list all keybindings for the current menu

    Table 2.2. Most common navigation keys in page-based menus

    KeyFunctionDescription
    J or <Return><next-line>scroll down one line
    <Backspace><previous-line>scroll up one line
    K, <Space> or <PageDn><next-page>move to the next page
    - or <PageUp><previous-page>move the previous page
    <Home><top>move to the top
    <End><bottom>move to the bottom

    4. Editing Input Fields

    4.1. Introduction

    -Mutt has a built-in line editor for inputting text, e.g. email addresses -or filenames. The keys used to manipulate text input are very similar to -those of Emacs. See Table 2.3, “Most common line editor keys” for a full -reference of available functions, their default key bindings, and short -descriptions. +are shown in Table 2.1, “Most common navigation keys in entry-based menus” and in +Table 2.2, “Most common navigation keys in page-based menus” for page-based menus. +

    Table 2.1. Most common navigation keys in entry-based menus

    KeyFunctionDescription
    j or <Down><next-entry>move to the next entry
    k or <Up><previous-entry>move to the previous entry
    z or <PageDn><page-down>go to the next page
    Z or <PageUp><page-up>go to the previous page
    = or <Home><first-entry>jump to the first entry
    * or <End><last-entry>jump to the last entry
    q<quit>exit the current menu
    ?<help>list all keybindings for the current menu

    Table 2.2. Most common navigation keys in page-based menus

    KeyFunctionDescription
    J or <Return><next-line>scroll down one line
    <Backspace><previous-line>sroll up one line
    K, <Space> or <PageDn><next-page>move to the next page
    - or <PageUp><previous-page>move the previous page
    <Home><top>move to the top
    <End><bottom>move to the bottom

    4. Editing Input Fields

    4.1. Introduction

    +Mutt has a built-in line editor for inputting text, e.g. email +addresses or filenames. The keys used to manipulate text input are +very similar to those of Emacs. See Table 2.3, “Most common line editor keys” for a full +reference of available functions, their default key bindings, and +short descriptions.

    Table 2.3. Most common line editor keys

    KeyFunctionDescription
    ^A or <Home><bol>move to the start of the line
    ^B or <Left><backward-char>move back one char
    Esc B<backward-word>move back one word
    ^D or <Delete><delete-char>delete the char under the cursor
    ^E or <End><eol>move to the end of the line
    ^F or <Right><forward-char>move forward one char
    Esc F<forward-word>move forward one word
    <Tab><complete>complete filename or alias
    ^T<complete-query>complete address with query
    ^K<kill-eol>delete to the end of the line
    Esc d<kill-eow>delete to the end of the word
    ^W<kill-word>kill the word in front of the cursor
    ^U<kill-line>delete entire line
    ^V<quote-char>quote the next typed key
    <Up><history-up>recall previous string from history
    <Down><history-down>recall next string from history
    <BackSpace><backspace>kill the char in front of the cursor
    Esc u<upcase-word>convert word to upper case
    Esc l<downcase-word>convert word to lower case
    Esc c<capitalize-word>capitalize the word
    ^Gn/aabort
    <Return>n/afinish editing

    -You can remap the editor functions using the bind command. For example, to -make the <Delete> key delete the character in front of the cursor -rather than under, you could use: +You can remap the editor functions using the +bind command. For example, to make +the <Delete> key delete the character in front of +the cursor rather than under, you could use: 

     bind editor <delete> backspace
-

    4.2. History

    +

    4.2. History

    Mutt maintains a history for the built-in editor. The number of items -is controlled by the $history variable -and can be made persistent using an external file specified using $history_file. You may cycle through them -at an editor prompt by using the <history-up> -and/or <history-down> commands. But notice that -Mutt does not remember the currently entered text, it only cycles -through history and wraps around at the end or beginning. +is controlled by the $history +variable and can be made persistent using an external file specified +using $history_file. +You may cycle through them at an editor prompt by using the +<history-up> and/or +<history-down> commands. But notice that Mutt +does not remember the currently entered text, it only cycles through +history and wraps around at the end or beginning.

    Mutt maintains several distinct history lists, one for each of the following categories: -

    • .muttrc commands

    • addresses and aliases

    • shell commands

    • filenames

    • patterns

    • everything else

    -Mutt automatically filters out consecutively repeated items from the -history. It also mimics the behavior of some shells by ignoring items -starting with a space. The latter feature can be useful in macros to not -clobber the history's valuable entries with unwanted entries. -

    5. Reading Mail

    +

    • .muttrc commands

    • addresses and aliases

    • shell commands

    • filenames

    • patterns

    • everything else

    +Mutt automatically filters out consecutively repeated items from the history. It +also mimics the behavior of some shells by ignoring items starting +with a space. The latter feature can be useful in macros to not clobber +the history's valuable entries with unwanted entries. +

    5. Reading Mail

    Similar to many other mail clients, there are two modes in which mail is read in Mutt. The first is a list of messages in the mailbox, which is -called the “index” menu in Mutt. The second mode is the -display of the message contents. This is called the -“pager.” +called the “index” menu in Mutt. The second mode is the display of the +message contents. This is called the “pager.”

    The next few sections describe the functions provided in each of these modes. -

    5.1. The Message Index

    +

    5.1. The Message Index

    Common keys used to navigate through and manage messages in the index are shown in Table 2.4, “Most common message index keys”. How messages are presented -in the index menu can be customized using the $index_format variable. +in the index menu can be customized using the +$index_format variable.

    Table 2.4. Most common message index keys

    KeyDescription
    cchange to a different mailbox
    Esc cchange to a folder in read-only mode
    Ccopy the current message to another mailbox
    Esc Cdecode a message and copy it to a folder
    Esc sdecode a message and save it to a folder
    Ddelete messages matching a pattern
    ddelete the current message
    Fmark as important
    lshow messages matching a pattern
    Nmark message as new
    ochange the current sort method
    Oreverse sort the mailbox
    qsave changes and exit
    ssave-message
    Ttag messages matching a pattern
    ttoggle the tag on a message
    Esc ttoggle tag on entire message thread
    Uundelete messages matching a pattern
    uundelete-message
    vview-attachments
    xabort changes and exit
    <Return>display-message
    <Tab>jump to the next new or unread message
    @show the author's full e-mail address
    $save changes to mailbox
    /search
    Esc /search-reverse
    ^Lclear and redraw the screen
    ^Tuntag messages matching a pattern

    In addition to who sent the message and the subject, a short summary of the disposition of each message is printed beside the message number. -Zero or more of the “flags” in Table 2.5, “Message status flags” may appear, some of which can be turned -on or off using these functions: <set-flag> and -<clear-flag> bound by default to -“w” and “W” respectively. +Zero or more of the “flags” in Table 2.5, “Message status flags” +may appear, some of which can be turned on or off using these functions: +<set-flag> and +<clear-flag> +bound by default to “w” and “W” respectively.

    Furthermore, the flags in Table 2.6, “Message recipient flags” reflect -who the message is addressed to. They can be customized with the $to_chars variable. -

    Table 2.5. Message status flags

    FlagDescription
    Dmessage is deleted (is marked for deletion)
    dmessage has attachments marked for deletion
    Kcontains a PGP public key
    Nmessage is new
    Omessage is old
    Pmessage is PGP encrypted
    rmessage has been replied to
    Smessage is signed, and the signature is successfully verified
    smessage is signed
    !message is flagged
    *message is tagged
    nthread contains new messages (only if collapsed)
    othread contains old messages (only if collapsed)

    Table 2.6. Message recipient flags

    FlagDescription
    +message is to you and you only
    Tmessage is to you, but also to or CC'ed to others
    Cmessage is CC'ed to you
    Fmessage is from you
    Lmessage is sent to a subscribed mailing list

    5.2. The Pager

    -By default, Mutt uses its built-in pager to display the contents of +who the message is addressed to. They can be customized with the +$to_chars variable. +

    Table 2.5. Message status flags

    FlagDescription
    Dmessage is deleted (is marked for deletion)
    dmessage has attachments marked for deletion
    Kcontains a PGP public key
    Nmessage is new
    Omessage is old
    Pmessage is PGP encrypted
    rmessage has been replied to
    Smessage is signed, and the signature is successfully verified
    smessage is signed
    !message is flagged
    *message is tagged

    Table 2.6. Message recipient flags

    FlagDescription
    +message is to you and you only
    Tmessage is to you, but also to or cc'ed to others
    Cmessage is cc'ed to you
    Fmessage is from you
    Lmessage is sent to a subscribed mailing list

    5.2. The Pager

    +By default, Mutt uses its builtin pager to display the contents of messages (an external pager such as less(1) can be -configured, see $pager variable). The -pager is very similar to the Unix program less(1) +configured, see $pager variable). +The pager is very similar to the Unix program less(1) though not nearly as featureful.

    Table 2.7. Most common pager keys

    KeyDescription
    <Return>go down one line
    <Space>display the next page (or next message if at the end of a message)
    -go back to the previous page
    nsearch for next match
    Sskip beyond quoted text
    Ttoggle display of quoted text
    ?show keybindings
    /regular expression search
    Esc /backward regular expression search
    \toggle highlighting of search matches
    ^jump to the top of the message

    -In addition to key bindings in Table 2.7, “Most common pager keys”, many of -the functions from the index menu are also available in the pager, such -as <delete-message> or -<copy-message> (this is one advantage over -using an external pager to view messages). +In addition to key bindings in Table 2.7, “Most common pager keys”, +many of the functions from the index menu are also available in +the pager, such as <delete-message> or <copy-message> +(this is one advantage over using an external pager to view messages).

    Also, the internal pager supports a couple other advanced features. For -one, it will accept and translate the “standard” nroff -sequences for bold and underline. These sequences are a series of either -the letter, backspace (“^H”), the letter again for bold or -the letter, backspace, “_” for denoting underline. Mutt -will attempt to display these in bold and underline respectively if your -terminal supports them. If not, you can use the bold and underline color objects to specify a -color or mono attribute for them. +one, it will accept and translate the “standard” nroff sequences for +bold and underline. These sequences are a series of either the letter, +backspace (“^H”), the letter again for bold or the letter, backspace, +“_” for denoting underline. Mutt will attempt to display these +in bold and underline respectively if your terminal supports them. If +not, you can use the bold and underline color +objects to specify a color or mono attribute for them.

    Additionally, the internal pager supports the ANSI escape sequences for character attributes. Mutt translates them into the correct color and @@ -237,181 +237,187 @@ 

     \e[Ps;Ps;..Ps;m

    -where Ps can be one of the codes shown in Table 2.8, “ANSI escape sequences”. +where Ps can be one of the codes shown in +Table 2.8, “ANSI escape sequences”.

    Table 2.8. ANSI escape sequences

    Escape codeDescription
    0All attributes off
    1Bold on
    4Underline on
    5Blink on
    7Reverse video on
    3<color>Foreground color is <color> (see Table 2.9, “Color sequences”)
    4<color>Background color is <color> (see Table 2.9, “Color sequences”)

    Table 2.9. Color sequences

    Color codeColor
    0Black
    1Red
    2Green
    3Yellow
    4Blue
    5Magenta
    6Cyan
    7White

    Mutt uses these attributes for handling text/enriched -messages, and they can also be used by an external autoview script for highlighting purposes. -

    Note

    -If you change the colors for your display, for example by changing the -color associated with color2 for your xterm, then that color will be -used instead of green. -

    Note

    +messages, and they can also be used by an external +autoview script for highlighting +purposes. +

    Note

    +If you change the colors for your +display, for example by changing the color associated with color2 for +your xterm, then that color will be used instead of green. +

    Note

    Note that the search commands in the pager take regular expressions, -which are not quite the same as the more complex patterns used by the search command in the -index. This is because patterns are used to select messages by criteria -whereas the pager already displays a selected message. -

    5.3. Threaded Mode

    -So-called “threads” provide a hierarchy of messages where +which are not quite the same as the more +complex patterns used by the search +command in the index. This is because patterns are used to select messages by +criteria whereas the pager already displays a selected message. +

    5.3. Threaded Mode

    +So-called “threads” provide a hierarchy of messages where replies are linked to their parent message(s). This organizational form is extremely useful in mailing lists where different parts of the discussion diverge. Mutt displays threads as a tree structure.

    -In Mutt, when a mailbox is sorted +In Mutt, when a mailbox is sorted by threads, there are a few additional functions available in the index and pager modes as shown in Table 2.10, “Most common thread mode keys”.

    Table 2.10. Most common thread mode keys

    KeyFunctionDescription
    ^D<delete-thread>delete all messages in the current thread
    ^U<undelete-thread>undelete all messages in the current thread
    ^N<next-thread>jump to the start of the next thread
    ^P<previous-thread>jump to the start of the previous thread
    ^R<read-thread>mark the current thread as read
    Esc d<delete-subthread>delete all messages in the current subthread
    Esc u<undelete-subthread>undelete all messages in the current subthread
    Esc n<next-subthread>jump to the start of the next subthread
    Esc p<previous-subthread>jump to the start of the previous subthread
    Esc r<read-subthread>mark the current subthread as read
    Esc t<tag-thread>toggle the tag on the current thread
    Esc v<collapse-thread>toggle collapse for the current thread
    Esc V<collapse-all>toggle collapse for all threads
    P<parent-message>jump to parent message in thread

    -Collapsing a thread displays only the first message in the thread and -hides the others. This is useful when threads contain so many messages -that you can only see a handful of threads on the screen. See %M in -$index_format. For example, you -could use “%?M?(#%03M)&(%4l)?” in $index_format to optionally display the -number of hidden messages if the thread is collapsed. The -%?<char>?<if-part>&<else-part>? -syntax is explained in detail in format string conditionals. +Collapsing a thread displays only the first message +in the thread and hides the others. This is useful when threads +contain so many messages that you can only see a handful of threads on +the screen. See %M in $index_format. +For example, you could use “%?M?(#%03M)&(%4l)?” in $index_format to optionally +display the number of hidden messages if the thread is +collapsed. The %?<char>?<if-part>&<else-part>? +syntax is explained in detail in +format string conditionals.

    Technically, every reply should contain a list of its parent messages in the thread tree, but not all do. In these cases, Mutt groups them by -subject which can be controlled using the $strict_threads variable. -

    5.4. Miscellaneous Functions

    -In addition, the index and -pager menus have these interesting functions: +subject which can be controlled using the +$strict_threads variable. +

    5.4. Miscellaneous Functions

    +In addition, the index and pager +menus have these interesting functions:

    -<create-alias> -(default: a) +<create-alias> (default: a)

    -Creates a new alias based upon the current message (or prompts for a new -one). Once editing is complete, an alias command is added to the -file specified by the $alias_file -variable for future use -

    Note

    +Creates a new alias based upon the current message (or prompts for a +new one). Once editing is complete, an alias +command is added to the file specified by +the $alias_file variable +for future use +

    Note

    Mutt does not read the $alias_file upon startup so you must explicitly source the file.

    <check-traditional-pgp> (default: Esc P)

    This function will search the current message for content signed or -encrypted with PGP the “traditional” way, that is, without -proper MIME tagging. Technically, this function will temporarily change -the MIME content types of the body parts containing PGP data; this is -similar to the <edit-type> -function's effect. +encrypted with PGP the “traditional” way, that is, without proper +MIME tagging. Technically, this function will temporarily change +the MIME content types of the body parts containing PGP data; this +is similar to the <edit-type> function's +effect.

    <edit> (default: e)

    -This command (available in the index and pager) allows you to edit the -raw current message as it's present in the mail folder. After you have -finished editing, the changed message will be appended to the current -folder, and the original message will be marked for deletion; if the -message is unchanged it won't be replaced. +This command (available in the index and pager) allows you to +edit the raw current message as it's present in the mail folder. +After you have finished editing, the changed message will be +appended to the current folder, and the original message will be +marked for deletion; if the message is unchanged it won't be replaced.

    <edit-type> (default: -^E on the attachment menu, and in the pager and index menus; ^T on the -compose menu) +^E on the attachment menu, and in the pager and index menus; +^T on the compose menu)

    -This command is used to temporarily edit an attachment's content type to -fix, for instance, bogus character set parameters. When invoked from -the index or from the pager, you'll have the opportunity to edit the -top-level attachment's content type. On the attachment menu, you can change any +This command is used to temporarily edit an attachment's content +type to fix, for instance, bogus character set parameters. When +invoked from the index or from the pager, you'll have the +opportunity to edit the top-level attachment's content type. On the +attachment menu, you can change any attachment's content type. These changes are not persistent, and get lost upon changing folders.

    -Note that this command is also available on the compose menu. There, it's used to -fine-tune the properties of attachments you are going to send. +Note that this command is also available on the compose +menu. There, it's used to fine-tune the properties of attachments you are going +to send.

    -<enter-command> -(default: “:”) +<enter-command> (default: “:”)

    This command is used to execute any command you would normally put in a -configuration file. A common use is to check the settings of variables, -or in conjunction with macros to change -settings on the fly. +configuration file. A common use is to check the settings of variables, or +in conjunction with macros to change settings on the +fly.

    -<extract-keys> -(default: ^K) +<extract-keys> (default: ^K)

    This command extracts PGP public keys from the current or tagged message(s) and adds them to your PGP public key ring.

    -<forget-passphrase> (default: ^F) +<forget-passphrase> (default: +^F)

    -This command wipes the passphrase(s) from memory. It is useful, if you -misspelled the passphrase. +This command wipes the passphrase(s) from memory. It is useful, if +you misspelled the passphrase.

    -<list-reply> (default: -L) +<list-reply> (default: L)

    -Reply to the current or tagged message(s) by extracting any addresses -which match the regular expressions given by the lists or -subscribe commands, but also honor any -Mail-Followup-To header(s) if the $honor_followup_to configuration -variable is set. Using this when replying to messages posted to mailing -lists helps avoid duplicate copies being sent to the author of the -message you are replying to. -

    -<pipe-message> -(default: |) -

    -Asks for an external Unix command and pipes the current or tagged -message(s) to it. The variables $pipe_decode, $pipe_split, $pipe_sep and $wait_key control the exact behavior of this -function. -

    -<resend-message> -(default: Esc e) -

    -Mutt takes the current message as a template for a new message. This -function is best described as "recall from arbitrary folders". It can -conveniently be used to forward MIME messages while preserving the -original mail structure. Note that the amount of headers included here -depends on the value of the $weed variable. +Reply to the current or tagged message(s) by extracting any addresses which +match the regular expressions given by the lists or subscribe +commands, but also honor any Mail-Followup-To header(s) if the +$honor_followup_to +configuration variable is set. Using this when replying to messages posted +to mailing lists helps avoid duplicate copies being sent to the author of +the message you are replying to. +

    +<pipe-message> (default: |) +

    +Asks for an external Unix command and pipes the current or +tagged message(s) to it. The variables $pipe_decode, $pipe_split, +$pipe_sep and $wait_key control the exact behavior of this function. +

    +<resend-message> (default: Esc e) +

    +Mutt takes the current message as a template for a +new message. This function is best described as "recall from arbitrary +folders". It can conveniently be used to forward MIME messages while +preserving the original mail structure. Note that the amount of headers +included here depends on the value of the $weed +variable.

    -This function is also available from the attachment menu. You can use -this to easily resend a message which was included with a bounce message +This function is also available from the attachment menu. You can use this +to easily resend a message which was included with a bounce message as a message/rfc822 body part.

    -<shell-escape> -(default: !) +<shell-escape> (default: !)

    -Asks for an external Unix command and executes it. The $wait_key can be used to control whether Mutt -will wait for a key to be pressed when the command returns (presumably -to let the user read the output of the command), based on the return -status of the named command. If no command is given, an interactive -shell is executed. -

    -<toggle-quoted> -(default: T) -

    -The pager uses the $quote_regexp -variable to detect quoted text when displaying the body of the message. -This function toggles the display of the quoted material in the message. -It is particularly useful when being interested in just the response and -there is a large amount of quoted text in the way. +Asks for an external Unix command and executes it. The $wait_key can be used to control +whether Mutt will wait for a key to be pressed when the command returns +(presumably to let the user read the output of the command), based on +the return status of the named command. If no command is given, an +interactive shell is executed. +

    +<toggle-quoted> (default: T) +

    +The pager uses the $quote_regexp variable to detect quoted text when +displaying the body of the message. This function toggles the display +of the quoted material in the message. It is particularly useful when +being interested in just the response and there is a large amount of +quoted text in the way.

    -<skip-quoted> -(default: S) +<skip-quoted> (default: S)

    This function will go to the next line of non-quoted text which comes after a line of quoted text in the internal pager. -

    6. Sending Mail

    6.1. Introduction

    -The bindings shown in Table 2.11, “Most common mail sending keys” are available in -the index and pager to start a -new message. +

    6. Sending Mail

    6.1. Introduction

    +The bindings shown in Table 2.11, “Most common mail sending keys” are available in the +index and pager to start a new message.

    Table 2.11. Most common mail sending keys

    KeyFunctionDescription
    m<compose>compose a new message
    r<reply>reply to sender
    g<group-reply>reply to all recipients
    L<list-reply>reply to mailing list address
    f<forward>forward message
    b<bounce>bounce (remail) message
    Esc k<mail-key>mail a PGP public key to someone

    -Bouncing a message sends the message as-is to the -recipient you specify. Forwarding a message allows -you to add comments or modify the message you are forwarding. These -items are discussed in greater detail in the next section “Forwarding and Bouncing Mail.” -

    -Mutt will then enter the compose menu and prompt -you for the recipients to place on the “To:” header field -when you hit m to start a new message. Next, it will -ask you for the “Subject:” field for the message, providing -a default if you are replying to or forwarding a message. You again have -the chance to adjust recipients, subject, and security settings right -before actually sending the message. See also $askcc, $askbcc, -$autoedit, $bounce, $fast_reply, and $include for changing how and if Mutt asks -these questions. +Bouncing a message sends the message as-is to the recipient you +specify. Forwarding a message allows you to add comments or +modify the message you are forwarding. These items are discussed +in greater detail in the next section “Forwarding +and Bouncing Mail.” +

    +Mutt will then enter the compose menu and prompt you for the +recipients to place on the “To:” header field when you hit m to start a new message. Next, it will ask +you for the “Subject:” field for the message, providing a default if +you are replying to or forwarding a message. You again +have the chance to adjust recipients, subject, and security settings +right before actually sending the message. See also +$askcc, +$askbcc, +$autoedit, +$bounce, +$fast_reply, +and $include +for changing how and if Mutt asks these questions.

    When replying, Mutt fills these fields with proper values depending on the reply type. The types of replying supported are: @@ -426,160 +432,149 @@ details.

    After getting recipients for new messages, forwards or replies, Mutt -will then automatically start your $editor -on the message body. If the $edit_headers variable is set, the headers -will be at the top of the message in your editor. Any messages you are -replying to will be added in sort order to the message, with appropriate -$attribution, $indent_string and $post_indent_string. When -forwarding a message, if the $mime_forward variable is unset, a copy of -the forwarded message will be included. If you have specified a $signature, it will be appended to the -message. +will then automatically start your $editor on the message body. If the $edit_headers variable is +set, the headers will be at the top of the message in your editor. Any +messages you are replying to will be added in sort order to the message, +with appropriate $attribution, +$indent_string and +$post_indent_string. +When forwarding a message, if the $mime_forward variable is +unset, a copy of the forwarded message will be included. If you have +specified a $signature, it will +be appended to the message.

    Once you have finished editing the body of your mail message, you are -returned to the compose menu providing the -functions shown in Table 2.12, “Most common compose menu keys” to modify, send or -postpone the message. -

    Table 2.12. Most common compose menu keys

    KeyFunctionDescription
    a<attach-file>attach a file
    A<attach-message>attach message(s) to the message
    Esc k<attach-key>attach a PGP public key
    d<edit-description>edit description on attachment
    D<detach-file>detach a file
    t<edit-to>edit the To field
    Esc f<edit-from>edit the From field
    r<edit-reply-to>edit the Reply-To field
    c<edit-cc>edit the Cc field
    b<edit-bcc>edit the Bcc field
    y<send-message>send the message
    s<edit-subject>edit the Subject
    S<smime-menu>select S/MIME options
    f<edit-fcc>specify an “Fcc” mailbox
    p<pgp-menu>select PGP options
    P<postpone-message>postpone this message until later
    q<quit>quit (abort) sending the message
    w<write-fcc>write the message to a folder
    i<ispell>check spelling (if available on your system)
    ^F<forget-passphrase>wipe passphrase(s) from memory

    -The compose menu is also used to edit the attachments for a message -which can be either files or other messages. The -<attach-message> function to will prompt you -for a folder to attach messages from. You can now tag messages in that -folder and they will be attached to the message you are sending. -

    Note

    -Note that certain operations like composing a new mail, replying, -forwarding, etc. are not permitted when you are in that folder. The %r -in $status_format will change to a -“A” to indicate that you are in attach-message mode. -

    6.2. Editing the Message Header

    -When editing the header because of $edit_headers being set, there are a -several pseudo headers available which will not be included in sent -messages but trigger special Mutt behavior. -

    6.2.1. Fcc: Pseudo Header

    +returned to the compose menu providing the functions +shown in Table 2.12, “Most common compose menu keys” to modify, send or postpone the +message. +

    Table 2.12. Most common compose menu keys

    KeyFunctionDescription
    a<attach-file>attach a file
    A<attach-message>attach message(s) to the message
    Esc k<attach-key>attach a PGP public key
    d<edit-description>edit description on attachment
    D<detach-file>detach a file
    t<edit-to>edit the To field
    Esc f<edit-from>edit the From field
    r<edit-reply-to>edit the Reply-To field
    c<edit-cc>edit the Cc field
    b<edit-bcc>edit the Bcc field
    y<send-message>send the message
    s<edit-subject>edit the Subject
    S<smime-menu>select S/MIME options
    f<edit-fcc>specify an “Fcc” mailbox
    p<pgp-menu>select PGP options
    P<postpone-message>postpone this message until later
    q<quit>quit (abort) sending the message
    w<write-fcc>write the message to a folder
    i<ispell>check spelling (if available on your system)
    ^F<forget-passphrase>wipe passphrase(s) from memory

    +The compose menu is also used to edit the attachments for a message which can be either files +or other messages. The <attach-message> function to will prompt you for a folder to +attach messages from. You can now tag messages in that folder and they +will be attached to the message you are sending. +

    Note

    +Note that certain +operations like composing a new mail, replying, forwarding, etc. are +not permitted when you are in that folder. The %r in +$status_format will change to +a “A” to indicate that you are in attach-message mode. +

    6.2. Editing the Message Header

    +When editing the header because of $edit_headers +being set, there are a several pseudo headers available which +will not be included in sent messages but trigger special Mutt behavior. +

    6.2.1. Fcc: Pseudo Header

    If you specify

    Fcc: filename

    -as a header, Mutt will pick up filename just as if -you had used the <edit-fcc> function in the -compose menu. It can later be changed from the -compose menu. -

    6.2.2. Attach: Pseudo Header

    +as a header, Mutt will pick up filename +just as if you had used the <edit-fcc> function in the compose menu. +It can later be changed from the compose menu. +

    6.2.2. Attach: Pseudo Header

    You can also attach files to your message by specifying

    Attach: filename [ description ]

    -where filename is the file to attach and -description is an optional string to use as the -description of the attached file. Spaces in filenames have to be escaped -using backslash (“\”). The file can be removed as well as -more added from the compose menu. -

    6.2.3. Pgp: Pseudo Header

    +where filename is the file to attach and description is an +optional string to use as the description of the attached file. Spaces +in filenames have to be escaped using backslash (“\”). +The file can be removed as well as more added from the compose menu. +

    6.2.3. Pgp: Pseudo Header

    If you want to use PGP, you can specify

    Pgp: [ E | S | S<id> ]

    -“E” selects encryption, “S” selects signing -and “S<id>” selects signing with the given key, -setting $pgp_sign_as permanently. The -selection can later be changed in the compose menu. -

    6.2.4. In-Reply-To: Header

    -When replying to messages, the In-Reply-To: header -contains the Message-Id of the message(s) you reply to. If you remove or -modify its value, Mutt will not generate a -References: field, which allows you to create a new -message thread, for example to create a new message to a mailing list -without having to enter the mailing list's address. -

    -If you intend to start a new thread by replying, please make really sure -you remove the In-Reply-To: header in your -editor. Otherwise, though you'll produce a technically valid reply, some -netiquette guardians will be annoyed by this so-called “thread -hijacking”. -

    6.3. Sending Cryptographically Signed/Encrypted Messages

    -If you have told Mutt to PGP or S/MIME encrypt a message, it will guide -you through a key selection process when you try to send the message. -Mutt will not ask you any questions about keys which have a certified -user ID matching one of the message recipients' mail addresses. -However, there may be situations in which there are several keys, weakly -certified user ID fields, or where no matching keys can be found. +“E” selects encryption, “S” selects signing and +“S<id>” selects signing with the given key, setting +$pgp_sign_as +permanently. The selection can later be changed in the compose menu. +

    6.2.4. In-Reply-To: Header

    +When replying to messages, the In-Reply-To: header contains the +Message-Id of the message(s) you reply to. If you remove or modify its value, Mutt will not generate a +References: field, which allows you to create a new message thread, for example +to create a new message to a mailing list without having to enter the mailing list's address. +

    6.3. Sending Cryptographically Signed/Encrypted Messages

    +If you have told Mutt to PGP or S/MIME encrypt a message, it will guide you +through a key selection process when you try to send the message. +Mutt will not ask you any questions about keys which have a +certified user ID matching one of the message recipients' mail +addresses. However, there may be situations in which there are +several keys, weakly certified user ID fields, or where no matching +keys can be found.

    In these cases, you are dropped into a menu with a list of keys from -which you can select one. When you quit this menu, or Mutt can't find -any matching keys, you are prompted for a user ID. You can, as usually, -abort this prompt using ^G. When you do so, Mutt -will return to the compose screen. -

    -Once you have successfully finished the key selection, the message will -be encrypted using the selected public keys when sent out. -

    -Most fields of the entries in the key selection menu (see also $pgp_entry_format) have obvious -meanings. But some explanations on the capabilities, flags, and -validity fields are in order. +which you can select one. When you quit this menu, or Mutt can't +find any matching keys, you are prompted for a user ID. You can, as +usually, abort this prompt using ^G. When you do so, Mutt will +return to the compose screen. +

    +Once you have successfully finished the key selection, the message +will be encrypted using the selected public keys when sent out. +

    +Most fields of the entries in the key selection menu (see also $pgp_entry_format) +have obvious meanings. But some explanations on the capabilities, flags, +and validity fields are in order.

    -The flags sequence (“%f”) will expand to one of the flags -in Table 2.13, “PGP key menu flags”. +The flags sequence (“%f”) will expand to one of the flags in +Table 2.13, “PGP key menu flags”.

    Table 2.13. PGP key menu flags

    FlagDescription
    RThe key has been revoked and can't be used.
    XThe key is expired and can't be used.
    dYou have marked the key as disabled.
    cThere are unknown critical self-signature packets.

    -The capabilities field (“%c”) expands to a two-character -sequence representing a key's capabilities. The first character gives -the key's encryption capabilities: A minus sign (“-”) means -that the key cannot be used for encryption. A dot (“.”) -means that it's marked as a signature key in one of the user IDs, but -may also be used for encryption. The letter “e” indicates -that this key can be used for encryption. +The capabilities field (“%c”) expands to a two-character sequence +representing a key's capabilities. The first character gives +the key's encryption capabilities: A minus sign (“-”) means +that the key cannot be used for encryption. A dot (“.”) means that +it's marked as a signature key in one of the user IDs, but may +also be used for encryption. The letter “e” indicates that +this key can be used for encryption.

    The second character indicates the key's signing capabilities. Once -again, a “-” implies “not for signing”, -“.” implies that the key is marked as an encryption key in -one of the user-ids, and “s” denotes a key which can be -used for signing. -

    -Finally, the validity field (“%t”) indicates how -well-certified a user-id is. A question mark (“?”) -indicates undefined validity, a minus character (“-”) marks -an untrusted association, a space character means a partially trusted -association, and a plus character (“+”) indicates complete -validity. -

    6.4. Sending Format=Flowed Messages

    6.4.1. Concept

    -format=flowed-style messages (or -f=f for short) are text/plain -messages that consist of paragraphs which a receiver's mail client may -reformat to its own needs which mostly means to customize line lengths -regardless of what the sender sent. Technically this is achieved by -letting lines of a “flowable” paragraph end in spaces +again, a “-” implies “not for signing”, “.” implies +that the key is marked as an encryption key in one of the user-ids, and +“s” denotes a key which can be used for signing. +

    +Finally, the validity field (“%t”) indicates how well-certified a user-id +is. A question mark (“?”) indicates undefined validity, a minus +character (“-”) marks an untrusted association, a space character +means a partially trusted association, and a plus character (“+”) +indicates complete validity. +

    6.4. Sending Format=Flowed Messages

    6.4.1. Concept

    +format=flowed-style messages (or f=f +for short) are text/plain messages that consist of paragraphs which a receiver's +mail client may reformat to its own needs which mostly means to +customize line lengths regardless of what the sender sent. Technically this is +achieved by letting lines of a “flowable” paragraph end in spaces except for the last line.

    While for text-mode clients like Mutt it's the best way to assume only a standard 80x25 character cell terminal, it may be desired to let the receiver decide completely how to view a message. -

    6.4.2. Mutt Support

    +

    6.4.2. Mutt Support

    Mutt only supports setting the required format=flowed -MIME parameter on outgoing messages if the $text_flowed variable is set, specifically -it does not add the trailing spaces. +MIME parameter on outgoing messages if the $text_flowed +variable is set, specifically it does not add the +trailing spaces.

    -After editing the initial message text and before entering the compose -menu, Mutt properly space-stuffs the message. +After editing the initial message text and before entering +the compose menu, Mutt properly space-stuffes the message. Space-stuffing is required by RfC3676 defining format=flowed and means to prepend a space to: -

    • all lines starting with a space

    • lines starting with the word -“From” followed by -space

    • all lines starting with -“>” which is not intended to be a -quote character

    Note

    -Mutt only supports space-stuffing for the first two types of lines but -not for the third: It is impossible to safely detect whether a leading -> character starts a quote or not. Furthermore, -Mutt only applies space-stuffing once after the -initial edit is finished. +

    • all lines starting with a space

    • lines starting with the word “From” +followed by space

    • all lines starting with “>” which +is not intended to be a quote character

    Note

    +Mutt only supports space-stuffing +for the first two types of lines but not for the third: It is impossible to +safely detect whether a leading > character starts a +quote or not. Furthermore, Mutt only applies space-stuffing +once after the initial edit is finished.

    -All leading spaces are to be removed by receiving clients to restore the -original message prior to further processing. -

    6.4.3. Editor Considerations

    -As Mutt provides no additional features to compose -f=f messages, it's completely up to the user and his -editor to produce proper messages. Please consider your editor's -documentation if you intend to send f=f messages. +All leading spaces are to be removed by receiving clients to restore +the original message prior to further processing. +

    6.4.3. Editor Considerations

    +As Mutt provides no additional features to compose f=f +messages, it's completely up to the user and his editor to produce +proper messages. Please consider your editor's documentation if you +intend to send f=f messages.

    Please note that when editing messages from the compose menu several times before really sending a mail, it's up to the user to ensure that @@ -589,51 +584,48 @@ flag for its formatoptions setting to assist in creating f=f messages, see :help fo-table for details. -

    7. Forwarding and Bouncing Mail

    +

    7. Forwarding and Bouncing Mail

    Bouncing and forwarding let you send an existing message to recipients that you specify. Bouncing a message sends a verbatim copy of a message to alternative addresses as if they were the message's original -recipients specified in the Bcc header. Forwarding a message, on the -other hand, allows you to modify the message before it is resent (for -example, by adding your own comments). Bouncing is done using the -<bounce> function and forwarding using the -<forward> function bound to “b” -and “f” respectively. +recipients specified in the Bcc header. +Forwarding a message, on the other hand, allows you to modify the message +before it is resent (for example, by adding your own comments). Bouncing +is done using the <bounce> function and forwarding +using the <forward> function bound to “b” and “f” +respectively.

    Forwarding can be done by including the original message in the new -message's body (surrounded by indicating lines) or including it as a -MIME attachment, depending on the value of the $mime_forward variable. Decoding of -attachments, like in the pager, can be controlled by the $forward_decode and $mime_forward_decode variables, +message's body (surrounded by indicating lines) or including it as a MIME +attachment, depending on the value of the $mime_forward variable. Decoding of attachments, +like in the pager, can be controlled by the $forward_decode and $mime_forward_decode variables, respectively. The desired forwarding format may depend on the content, -therefore $mime_forward is a -quadoption which, for example, can be set to “ask-no”. +therefore $mime_forward is a quadoption which, for +example, can be set to “ask-no”.

    The inclusion of headers is controlled by the current setting of the -$weed variable, unless $mime_forward is set. +$weed variable, unless $mime_forward is set.

    Editing the message to forward follows the same procedure as sending or replying to a message does. -

    8. Postponing Mail

    +

    8. Postponing Mail

    At times it is desirable to delay sending a message that you have -already begun to compose. When the -<postpone-message> function is used in the -compose menu, the body of your message and -attachments are stored in the mailbox specified by the $postponed variable. This means that you can -recall the message even if you exit Mutt and then restart it at a later -time. -

    -Once a message is postponed, there are several ways to resume it. From -the command line you can use the “-p” option, or if you -compose a new message from the index or -pager you will be prompted if postponed messages -exist. If multiple messages are currently postponed, the -postponed menu will pop up and you can select which -message you would like to resume. -

    Note

    -If you postpone a reply to a message, the reply setting of the message -is only updated when you actually finish the message and send it. Also, -you must be in the same folder with the message you replied to for the -status of the message to be updated. +already begun to compose. When the <postpone-message> function is +used in the compose menu, the body of your message and attachments +are stored in the mailbox specified by the $postponed variable. This means that you can recall the +message even if you exit Mutt and then restart it at a later time. +

    +Once a message is postponed, there are several ways to resume it. From the +command line you can use the “-p” option, or if you compose a new +message from the index or pager you will be prompted if postponed +messages exist. If multiple messages are currently postponed, the +postponed menu will pop up and you can select which message you would +like to resume. +

    Note

    +If you postpone a reply to a message, the reply setting of +the message is only updated when you actually finish the message and +send it. Also, you must be in the same folder with the message you +replied to for the status of the message to be updated.

    -See also the $postpone quad-option. +See also the $postpone quad-option.

    Prev   Next
    Chapter 1. Introduction Home Chapter 3. Configuration
    diff -Nru mutt-1.5.21/doc/index.html mutt-1.5.20/doc/index.html --- mutt-1.5.21/doc/index.html 2010-09-15 17:10:23.000000000 +0000 +++ mutt-1.5.20/doc/index.html 2009-06-14 18:54:44.000000000 +0000 @@ -1,6 +1,6 @@ -The Mutt E-Mail Client
    The Mutt E-Mail Client
       Next

    The Mutt E-Mail Client

    Michael Elkins

    version 1.5.21 (2010-09-15)

    Abstract

    -“All mail clients suck. This one just sucks less.” — -me, circa 1995 -

    Table of Contents

    1. Introduction
    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typographical Conventions
    7. Copyright
    2. Getting Started
    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail
    3. Configuration
    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Header Display
    10.2. Selecting Headers
    10.3. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    26.4. Type Conversions
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding
    4. Advanced Usage
    1. Character Set Handling
    2. Regular Expressions
    3. Patterns: Searching, Limiting and Tagging
    3.1. Pattern Modifier
    3.2. Simple Searches
    3.3. Nesting and Boolean Operators
    3.4. Searching by Date
    4. Using Tags
    5. Using Hooks
    5.1. Message Matching in Hooks
    6. External Address Queries
    7. Mailbox Formats
    8. Mailbox Shortcuts
    9. Handling Mailing Lists
    10. New Mail Detection
    10.1. How New Mail Detection Works
    10.2. Polling For New Mail
    11. Editing Threads
    11.1. Linking Threads
    11.2. Breaking Threads
    12. Delivery Status Notification (DSN) Support
    13. Start a WWW Browser on URLs
    14. Miscellany
    5. Mutt's MIME Support
    1. Using MIME in Mutt
    1.1. MIME Overview
    1.2. Viewing MIME Messages in the Pager
    1.3. The Attachment Menu
    1.4. The Compose Menu
    2. MIME Type Configuration with mime.types
    3. MIME Viewer Configuration with Mailcap
    3.1. The Basics of the Mailcap File
    3.2. Secure Use of Mailcap
    3.3. Advanced Mailcap Usage
    3.4. Example Mailcap Files
    4. MIME Autoview
    5. MIME Multipart/Alternative
    6. Attachment Searching and Counting
    7. MIME Lookup
    6. Optional Features
    1. General Notes
    1.1. Enabling/Disabling Features
    1.2. URL Syntax
    2. SSL/TLS Support
    3. POP3 Support
    4. IMAP Support
    4.1. The IMAP Folder Browser
    4.2. Authentication
    5. SMTP Support
    6. Managing Multiple Accounts
    7. Local Caching
    7.1. Header Caching
    7.2. Body Caching
    7.3. Cache Directories
    7.4. Maintenance
    8. Exact Address Generation
    9. Sending Anonymous Messages via Mixmaster
    7. Security Considerations
    1. Passwords
    2. Temporary Files
    3. Information Leaks
    3.1. Message-Id: headers
    3.2. mailto:-style Links
    4. External Applications
    8. Performance Tuning
    1. Reading and Writing Mailboxes
    2. Reading Messages from Remote Folders
    3. Searching and Limiting
    9. Reference
    1. Command-Line Options
    2. Configuration Commands
    3. Configuration Variables
    3.1. abort_nosubject
    3.2. abort_unmodified
    3.3. alias_file
    3.4. alias_format
    3.5. allow_8bit
    3.6. allow_ansi
    3.7. arrow_cursor
    3.8. ascii_chars
    3.9. askbcc
    3.10. askcc
    3.11. assumed_charset
    3.12. attach_charset
    3.13. attach_format
    3.14. attach_sep
    3.15. attach_split
    3.16. attribution
    3.17. auto_tag
    3.18. autoedit
    3.19. beep
    3.20. beep_new
    3.21. bounce
    3.22. bounce_delivered
    3.23. braille_friendly
    3.24. certificate_file
    3.25. charset
    3.26. check_mbox_size
    3.27. check_new
    3.28. collapse_unread
    3.29. compose_format
    3.30. config_charset
    3.31. confirmappend
    3.32. confirmcreate
    3.33. connect_timeout
    3.34. content_type
    3.35. copy
    3.36. crypt_autoencrypt
    3.37. crypt_autopgp
    3.38. crypt_autosign
    3.39. crypt_autosmime
    3.40. crypt_replyencrypt
    3.41. crypt_replysign
    3.42. crypt_replysignencrypted
    3.43. crypt_timestamp
    3.44. crypt_use_gpgme
    3.45. crypt_use_pka
    3.46. crypt_verify_sig
    3.47. date_format
    3.48. default_hook
    3.49. delete
    3.50. delete_untag
    3.51. digest_collapse
    3.52. display_filter
    3.53. dotlock_program
    3.54. dsn_notify
    3.55. dsn_return
    3.56. duplicate_threads
    3.57. edit_headers
    3.58. editor
    3.59. encode_from
    3.60. entropy_file
    3.61. envelope_from_address
    3.62. escape
    3.63. fast_reply
    3.64. fcc_attach
    3.65. fcc_clear
    3.66. folder
    3.67. folder_format
    3.68. followup_to
    3.69. force_name
    3.70. forward_decode
    3.71. forward_decrypt
    3.72. forward_edit
    3.73. forward_format
    3.74. forward_quote
    3.75. from
    3.76. gecos_mask
    3.77. hdrs
    3.78. header
    3.79. header_cache
    3.80. header_cache_compress
    3.81. header_cache_pagesize
    3.82. help
    3.83. hidden_host
    3.84. hide_limited
    3.85. hide_missing
    3.86. hide_thread_subject
    3.87. hide_top_limited
    3.88. hide_top_missing
    3.89. history
    3.90. history_file
    3.91. honor_disposition
    3.92. honor_followup_to
    3.93. hostname
    3.94. ignore_linear_white_space
    3.95. ignore_list_reply_to
    3.96. imap_authenticators
    3.97. imap_check_subscribed
    3.98. imap_delim_chars
    3.99. imap_headers
    3.100. imap_idle
    3.101. imap_keepalive
    3.102. imap_list_subscribed
    3.103. imap_login
    3.104. imap_pass
    3.105. imap_passive
    3.106. imap_peek
    3.107. imap_pipeline_depth
    3.108. imap_servernoise
    3.109. imap_user
    3.110. implicit_autoview
    3.111. include
    3.112. include_onlyfirst
    3.113. indent_string
    3.114. index_format
    3.115. ispell
    3.116. keep_flagged
    3.117. locale
    3.118. mail_check
    3.119. mail_check_recent
    3.120. mailcap_path
    3.121. mailcap_sanitize
    3.122. maildir_header_cache_verify
    3.123. maildir_trash
    3.124. mark_old
    3.125. markers
    3.126. mask
    3.127. mbox
    3.128. mbox_type
    3.129. menu_context
    3.130. menu_move_off
    3.131. menu_scroll
    3.132. message_cache_clean
    3.133. message_cachedir
    3.134. message_format
    3.135. meta_key
    3.136. metoo
    3.137. mh_purge
    3.138. mh_seq_flagged
    3.139. mh_seq_replied
    3.140. mh_seq_unseen
    3.141. mime_forward
    3.142. mime_forward_decode
    3.143. mime_forward_rest
    3.144. mix_entry_format
    3.145. mixmaster
    3.146. move
    3.147. narrow_tree
    3.148. net_inc
    3.149. pager
    3.150. pager_context
    3.151. pager_format
    3.152. pager_index_lines
    3.153. pager_stop
    3.154. pgp_auto_decode
    3.155. pgp_autoinline
    3.156. pgp_check_exit
    3.157. pgp_clearsign_command
    3.158. pgp_decode_command
    3.159. pgp_decrypt_command
    3.160. pgp_encrypt_only_command
    3.161. pgp_encrypt_sign_command
    3.162. pgp_entry_format
    3.163. pgp_export_command
    3.164. pgp_getkeys_command
    3.165. pgp_good_sign
    3.166. pgp_ignore_subkeys
    3.167. pgp_import_command
    3.168. pgp_list_pubring_command
    3.169. pgp_list_secring_command
    3.170. pgp_long_ids
    3.171. pgp_mime_auto
    3.172. pgp_replyinline
    3.173. pgp_retainable_sigs
    3.174. pgp_show_unusable
    3.175. pgp_sign_as
    3.176. pgp_sign_command
    3.177. pgp_sort_keys
    3.178. pgp_strict_enc
    3.179. pgp_timeout
    3.180. pgp_use_gpg_agent
    3.181. pgp_verify_command
    3.182. pgp_verify_key_command
    3.183. pipe_decode
    3.184. pipe_sep
    3.185. pipe_split
    3.186. pop_auth_try_all
    3.187. pop_authenticators
    3.188. pop_checkinterval
    3.189. pop_delete
    3.190. pop_host
    3.191. pop_last
    3.192. pop_pass
    3.193. pop_reconnect
    3.194. pop_user
    3.195. post_indent_string
    3.196. postpone
    3.197. postponed
    3.198. preconnect
    3.199. print
    3.200. print_command
    3.201. print_decode
    3.202. print_split
    3.203. prompt_after
    3.204. query_command
    3.205. query_format
    3.206. quit
    3.207. quote_regexp
    3.208. read_inc
    3.209. read_only
    3.210. realname
    3.211. recall
    3.212. record
    3.213. reply_regexp
    3.214. reply_self
    3.215. reply_to
    3.216. resolve
    3.217. reverse_alias
    3.218. reverse_name
    3.219. reverse_realname
    3.220. rfc2047_parameters
    3.221. save_address
    3.222. save_empty
    3.223. save_history
    3.224. save_name
    3.225. score
    3.226. score_threshold_delete
    3.227. score_threshold_flag
    3.228. score_threshold_read
    3.229. search_context
    3.230. send_charset
    3.231. sendmail
    3.232. sendmail_wait
    3.233. shell
    3.234. sig_dashes
    3.235. sig_on_top
    3.236. signature
    3.237. simple_search
    3.238. sleep_time
    3.239. smart_wrap
    3.240. smileys
    3.241. smime_ask_cert_label
    3.242. smime_ca_location
    3.243. smime_certificates
    3.244. smime_decrypt_command
    3.245. smime_decrypt_use_default_key
    3.246. smime_default_key
    3.247. smime_encrypt_command
    3.248. smime_encrypt_with
    3.249. smime_get_cert_command
    3.250. smime_get_cert_email_command
    3.251. smime_get_signer_cert_command
    3.252. smime_import_cert_command
    3.253. smime_is_default
    3.254. smime_keys
    3.255. smime_pk7out_command
    3.256. smime_sign_command
    3.257. smime_sign_opaque_command
    3.258. smime_timeout
    3.259. smime_verify_command
    3.260. smime_verify_opaque_command
    3.261. smtp_authenticators
    3.262. smtp_pass
    3.263. smtp_url
    3.264. sort
    3.265. sort_alias
    3.266. sort_aux
    3.267. sort_browser
    3.268. sort_re
    3.269. spam_separator
    3.270. spoolfile
    3.271. ssl_ca_certificates_file
    3.272. ssl_client_cert
    3.273. ssl_force_tls
    3.274. ssl_min_dh_prime_bits
    3.275. ssl_starttls
    3.276. ssl_use_sslv2
    3.277. ssl_use_sslv3
    3.278. ssl_use_tlsv1
    3.279. ssl_usesystemcerts
    3.280. ssl_verify_dates
    3.281. ssl_verify_host
    3.282. status_chars
    3.283. status_format
    3.284. status_on_top
    3.285. strict_threads
    3.286. suspend
    3.287. text_flowed
    3.288. thorough_search
    3.289. thread_received
    3.290. tilde
    3.291. time_inc
    3.292. timeout
    3.293. tmpdir
    3.294. to_chars
    3.295. tunnel
    3.296. uncollapse_jump
    3.297. use_8bitmime
    3.298. use_domain
    3.299. use_envelope_from
    3.300. use_from
    3.301. use_idn
    3.302. use_ipv6
    3.303. user_agent
    3.304. visual
    3.305. wait_key
    3.306. weed
    3.307. wrap
    3.308. wrap_headers
    3.309. wrap_search
    3.310. wrapmargin
    3.311. write_bcc
    3.312. write_inc
    4. Functions
    4.1. Generic Menu
    4.2. Index Menu
    4.3. Pager Menu
    4.4. Alias Menu
    4.5. Query Menu
    4.6. Attachment Menu
    4.7. Compose Menu
    4.8. Postpone Menu
    4.9. Browser Menu
    4.10. Pgp Menu
    4.11. Smime Menu
    4.12. Mixmaster Menu
    4.13. Editor Menu
    10. Miscellany
    1. Acknowledgements
    2. About This Document

    List of Tables

    1.1. Typographical conventions for special terms
    2.1. Most common navigation keys in entry-based menus
    2.2. Most common navigation keys in page-based menus
    2.3. Most common line editor keys
    2.4. Most common message index keys
    2.5. Message status flags
    2.6. Message recipient flags
    2.7. Most common pager keys
    2.8. ANSI escape sequences
    2.9. Color sequences
    2.10. Most common thread mode keys
    2.11. Most common mail sending keys
    2.12. Most common compose menu keys
    2.13. PGP key menu flags
    3.1. Symbolic key names
    4.1. POSIX regular expression character classes
    4.2. Regular expression repetition operators
    4.3. GNU regular expression extensions
    4.4. Pattern modifiers
    4.5. Simple search keywords
    4.6. Date units
    4.7. Mailbox shortcuts
    5.1. Supported MIME types
    9.1. Command line options
    9.2. Default Generic Menu Bindings
    9.3. Default Index Menu Bindings
    9.4. Default Pager Menu Bindings
    9.5. Default Alias Menu Bindings
    9.6. Default Query Menu Bindings
    9.7. Default Attachment Menu Bindings
    9.8. Default Compose Menu Bindings
    9.9. Default Postpone Menu Bindings
    9.10. Default Browser Menu Bindings
    9.11. Default Pgp Menu Bindings
    9.12. Default Smime Menu Bindings
    9.13. Default Mixmaster Menu Bindings
    9.14. Default Editor Menu Bindings

    List of Examples

    3.1. Multiple configuration commands per line
    3.2. Commenting configuration files
    3.3. Escaping quotes in configuration files
    3.4. Splitting long configuration commands over several lines
    3.5. Using external command's output in configuration files
    3.6. Using environment variables in configuration files
    3.7. Configuring external alias files
    3.8. Setting sort method based on mailbox name
    3.9. Header weeding
    3.10. Configuring header display order
    3.11. Defining custom headers
    3.12. Using %-expandos in save-hook
    3.13. Embedding push in folder-hook
    3.14. Configuring spam detection
    3.15. Using user-defined variables for config file readability
    3.16. Using user-defined variables for backing up other config option values
    3.17. Deferring user-defined variable expansion to runtime
    3.18. Type conversions using variables
    3.19. Using external filters in format strings
    4.1. Matching all addresses in address lists
    4.2. Using boolean operators in patterns
    4.3. Specifying a “default” hook
    5.1. mime.types
    5.2. Attachment counting
    6.1. URLs
    6.2. Managing multiple accounts
       Next
       Chapter 1. Introduction
    +
    The Mutt E-Mail Client
       Next

    The Mutt E-Mail Client

    Michael Elkins

    version 1.5.20 (2009-06-14)

    Abstract

    +“All mail clients suck. This one just sucks less.” — me, circa 1995 +

    Table of Contents

    1. Introduction
    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typograhical Conventions
    7. Copyright
    2. Getting Started
    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail
    3. Configuration
    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Selecting Headers
    10.2. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding
    4. Advanced Usage
    1. Regular Expressions
    2. Patterns: Searching, Limiting and Tagging
    2.1. Pattern Modifier
    2.2. Simple Searches
    2.3. Nesting and Boolean Operators
    2.4. Searching by Date
    3. Using Tags
    4. Using Hooks
    4.1. Message Matching in Hooks
    5. External Address Queries
    6. Mailbox Formats
    7. Mailbox Shortcuts
    8. Handling Mailing Lists
    9. Handling multiple folders
    10. Editing Threads
    10.1. Linking Threads
    10.2. Breaking Threads
    11. Delivery Status Notification (DSN) Support
    12. Start a WWW Browser on URLs
    13. Miscellany
    5. Mutt's MIME Support
    1. Using MIME in Mutt
    1.1. Viewing MIME Messages in the Pager
    1.2. The Attachment Menu
    1.3. The Compose Menu
    2. MIME Type Configuration with mime.types
    3. MIME Viewer Configuration with Mailcap
    3.1. The Basics of the Mailcap File
    3.2. Secure Use of Mailcap
    3.3. Advanced Mailcap Usage
    3.4. Example Mailcap Files
    4. MIME Autoview
    5. MIME Multipart/Alternative
    6. Attachment Searching and Counting
    7. MIME Lookup
    6. Optional Features
    1. General Notes
    1.1. Enabling/Disabling Features
    1.2. URL Syntax
    2. SSL/TLS Support
    3. POP3 Support
    4. IMAP Support
    4.1. The IMAP Folder Browser
    4.2. Authentication
    5. SMTP Support
    6. Managing Multiple Accounts
    7. Local Caching
    7.1. Header Caching
    7.2. Body Caching
    7.3. Maintenance
    8. Exact Address Generation
    9. Sending Anonymous Messages via Mixmaster
    7. Security Considerations
    1. Passwords
    2. Temporary Files
    3. Information Leaks
    3.1. Message-Id: headers
    3.2. mailto:-style Links
    4. External Applications
    8. Performance Tuning
    1. Reading and Writing Mailboxes
    2. Reading Messages from Remote Folders
    3. Searching and Limiting
    9. Reference
    1. Command-Line Options
    2. Configuration Commands
    3. Configuration Variables
    3.1. abort_nosubject
    3.2. abort_unmodified
    3.3. alias_file
    3.4. alias_format
    3.5. allow_8bit
    3.6. allow_ansi
    3.7. arrow_cursor
    3.8. ascii_chars
    3.9. askbcc
    3.10. askcc
    3.11. assumed_charset
    3.12. attach_charset
    3.13. attach_format
    3.14. attach_sep
    3.15. attach_split
    3.16. attribution
    3.17. auto_tag
    3.18. autoedit
    3.19. beep
    3.20. beep_new
    3.21. bounce
    3.22. bounce_delivered
    3.23. braille_friendly
    3.24. certificate_file
    3.25. charset
    3.26. check_mbox_size
    3.27. check_new
    3.28. collapse_unread
    3.29. compose_format
    3.30. config_charset
    3.31. confirmappend
    3.32. confirmcreate
    3.33. connect_timeout
    3.34. content_type
    3.35. copy
    3.36. crypt_autoencrypt
    3.37. crypt_autopgp
    3.38. crypt_autosign
    3.39. crypt_autosmime
    3.40. crypt_replyencrypt
    3.41. crypt_replysign
    3.42. crypt_replysignencrypted
    3.43. crypt_timestamp
    3.44. crypt_use_gpgme
    3.45. crypt_use_pka
    3.46. crypt_verify_sig
    3.47. date_format
    3.48. default_hook
    3.49. delete
    3.50. delete_untag
    3.51. digest_collapse
    3.52. display_filter
    3.53. dotlock_program
    3.54. dsn_notify
    3.55. dsn_return
    3.56. duplicate_threads
    3.57. edit_headers
    3.58. editor
    3.59. encode_from
    3.60. entropy_file
    3.61. envelope_from_address
    3.62. escape
    3.63. fast_reply
    3.64. fcc_attach
    3.65. fcc_clear
    3.66. folder
    3.67. folder_format
    3.68. followup_to
    3.69. force_name
    3.70. forward_decode
    3.71. forward_decrypt
    3.72. forward_edit
    3.73. forward_format
    3.74. forward_quote
    3.75. from
    3.76. gecos_mask
    3.77. hdrs
    3.78. header
    3.79. header_cache
    3.80. header_cache_compress
    3.81. header_cache_pagesize
    3.82. help
    3.83. hidden_host
    3.84. hide_limited
    3.85. hide_missing
    3.86. hide_thread_subject
    3.87. hide_top_limited
    3.88. hide_top_missing
    3.89. history
    3.90. history_file
    3.91. honor_disposition
    3.92. honor_followup_to
    3.93. hostname
    3.94. ignore_linear_white_space
    3.95. ignore_list_reply_to
    3.96. imap_authenticators
    3.97. imap_check_subscribed
    3.98. imap_delim_chars
    3.99. imap_headers
    3.100. imap_idle
    3.101. imap_keepalive
    3.102. imap_list_subscribed
    3.103. imap_login
    3.104. imap_pass
    3.105. imap_passive
    3.106. imap_peek
    3.107. imap_pipeline_depth
    3.108. imap_servernoise
    3.109. imap_user
    3.110. implicit_autoview
    3.111. include
    3.112. include_onlyfirst
    3.113. indent_string
    3.114. index_format
    3.115. ispell
    3.116. keep_flagged
    3.117. locale
    3.118. mail_check
    3.119. mailcap_path
    3.120. mailcap_sanitize
    3.121. maildir_header_cache_verify
    3.122. maildir_trash
    3.123. mark_old
    3.124. markers
    3.125. mask
    3.126. mbox
    3.127. mbox_type
    3.128. menu_context
    3.129. menu_move_off
    3.130. menu_scroll
    3.131. message_cache_clean
    3.132. message_cachedir
    3.133. message_format
    3.134. meta_key
    3.135. metoo
    3.136. mh_purge
    3.137. mh_seq_flagged
    3.138. mh_seq_replied
    3.139. mh_seq_unseen
    3.140. mime_forward
    3.141. mime_forward_decode
    3.142. mime_forward_rest
    3.143. mix_entry_format
    3.144. mixmaster
    3.145. move
    3.146. narrow_tree
    3.147. net_inc
    3.148. pager
    3.149. pager_context
    3.150. pager_format
    3.151. pager_index_lines
    3.152. pager_stop
    3.153. pgp_auto_decode
    3.154. pgp_autoinline
    3.155. pgp_check_exit
    3.156. pgp_clearsign_command
    3.157. pgp_decode_command
    3.158. pgp_decrypt_command
    3.159. pgp_encrypt_only_command
    3.160. pgp_encrypt_sign_command
    3.161. pgp_entry_format
    3.162. pgp_export_command
    3.163. pgp_getkeys_command
    3.164. pgp_good_sign
    3.165. pgp_ignore_subkeys
    3.166. pgp_import_command
    3.167. pgp_list_pubring_command
    3.168. pgp_list_secring_command
    3.169. pgp_long_ids
    3.170. pgp_mime_auto
    3.171. pgp_replyinline
    3.172. pgp_retainable_sigs
    3.173. pgp_show_unusable
    3.174. pgp_sign_as
    3.175. pgp_sign_command
    3.176. pgp_sort_keys
    3.177. pgp_strict_enc
    3.178. pgp_timeout
    3.179. pgp_use_gpg_agent
    3.180. pgp_verify_command
    3.181. pgp_verify_key_command
    3.182. pipe_decode
    3.183. pipe_sep
    3.184. pipe_split
    3.185. pop_auth_try_all
    3.186. pop_authenticators
    3.187. pop_checkinterval
    3.188. pop_delete
    3.189. pop_host
    3.190. pop_last
    3.191. pop_pass
    3.192. pop_reconnect
    3.193. pop_user
    3.194. post_indent_string
    3.195. postpone
    3.196. postponed
    3.197. preconnect
    3.198. print
    3.199. print_command
    3.200. print_decode
    3.201. print_split
    3.202. prompt_after
    3.203. query_command
    3.204. query_format
    3.205. quit
    3.206. quote_regexp
    3.207. read_inc
    3.208. read_only
    3.209. realname
    3.210. recall
    3.211. record
    3.212. reply_regexp
    3.213. reply_self
    3.214. reply_to
    3.215. resolve
    3.216. reverse_alias
    3.217. reverse_name
    3.218. reverse_realname
    3.219. rfc2047_parameters
    3.220. save_address
    3.221. save_empty
    3.222. save_history
    3.223. save_name
    3.224. score
    3.225. score_threshold_delete
    3.226. score_threshold_flag
    3.227. score_threshold_read
    3.228. search_context
    3.229. send_charset
    3.230. sendmail
    3.231. sendmail_wait
    3.232. shell
    3.233. sig_dashes
    3.234. sig_on_top
    3.235. signature
    3.236. simple_search
    3.237. sleep_time
    3.238. smart_wrap
    3.239. smileys
    3.240. smime_ask_cert_label
    3.241. smime_ca_location
    3.242. smime_certificates
    3.243. smime_decrypt_command
    3.244. smime_decrypt_use_default_key
    3.245. smime_default_key
    3.246. smime_encrypt_command
    3.247. smime_encrypt_with
    3.248. smime_get_cert_command
    3.249. smime_get_cert_email_command
    3.250. smime_get_signer_cert_command
    3.251. smime_import_cert_command
    3.252. smime_is_default
    3.253. smime_keys
    3.254. smime_pk7out_command
    3.255. smime_sign_command
    3.256. smime_sign_opaque_command
    3.257. smime_timeout
    3.258. smime_verify_command
    3.259. smime_verify_opaque_command
    3.260. smtp_authenticators
    3.261. smtp_pass
    3.262. smtp_url
    3.263. sort
    3.264. sort_alias
    3.265. sort_aux
    3.266. sort_browser
    3.267. sort_re
    3.268. spam_separator
    3.269. spoolfile
    3.270. ssl_ca_certificates_file
    3.271. ssl_client_cert
    3.272. ssl_force_tls
    3.273. ssl_min_dh_prime_bits
    3.274. ssl_starttls
    3.275. ssl_use_sslv2
    3.276. ssl_use_sslv3
    3.277. ssl_use_tlsv1
    3.278. ssl_usesystemcerts
    3.279. ssl_verify_dates
    3.280. ssl_verify_host
    3.281. status_chars
    3.282. status_format
    3.283. status_on_top
    3.284. strict_threads
    3.285. suspend
    3.286. text_flowed
    3.287. thorough_search
    3.288. thread_received
    3.289. tilde
    3.290. time_inc
    3.291. timeout
    3.292. tmpdir
    3.293. to_chars
    3.294. tunnel
    3.295. uncollapse_jump
    3.296. use_8bitmime
    3.297. use_domain
    3.298. use_envelope_from
    3.299. use_from
    3.300. use_idn
    3.301. use_ipv6
    3.302. user_agent
    3.303. visual
    3.304. wait_key
    3.305. weed
    3.306. wrap
    3.307. wrap_search
    3.308. wrapmargin
    3.309. write_bcc
    3.310. write_inc
    4. Functions
    4.1. Generic Menu
    4.2. Index Menu
    4.3. Pager Menu
    4.4. Alias Menu
    4.5. Query Menu
    4.6. Attach Menu
    4.7. Compose Menu
    4.8. Postpone Menu
    4.9. Browser Menu
    4.10. Pgp Menu
    4.11. Smime Menu
    4.12. Mix Menu
    4.13. Editor Menu
    10. Miscellany
    1. Acknowledgements
    2. About This Document

    List of Tables

    1.1. Typographical conventions for special terms
    2.1. Most common navigation keys in entry-based menus
    2.2. Most common navigation keys in page-based menus
    2.3. Most common line editor keys
    2.4. Most common message index keys
    2.5. Message status flags
    2.6. Message recipient flags
    2.7. Most common pager keys
    2.8. ANSI escape sequences
    2.9. Color sequences
    2.10. Most common thread mode keys
    2.11. Most common mail sending keys
    2.12. Most common compose menu keys
    2.13. PGP key menu flags
    3.1. Symbolic key names
    4.1. POSIX regular expression character classes
    4.2. Regular expression repetition operators
    4.3. GNU regular expression extensions
    4.4. Pattern modifiers
    4.5. Simple search keywords
    4.6. Date units
    9.1. Command line options
    9.2. Default generic Function Bindings
    9.3. Default index Function Bindings
    9.4. Default pager Function Bindings
    9.5. Default alias Function Bindings
    9.6. Default query Function Bindings
    9.7. Default attach Function Bindings
    9.8. Default compose Function Bindings
    9.9. Default postpone Function Bindings
    9.10. Default browser Function Bindings
    9.11. Default pgp Function Bindings
    9.12. Default smime Function Bindings
    9.13. Default mix Function Bindings
    9.14. Default editor Function Bindings

    List of Examples

    3.1. Multiple configuration commands per line
    3.2. Commenting configuration files
    3.3. Escaping quotes in congfiguration files
    3.4. Splitting long configuration commands over several lines
    3.5. Using external command's output in configuration files
    3.6. Using environment variables in configuration files
    3.7. Configuring external alias files
    3.8. Setting sort method based on mailbox name
    3.9. Header weeding
    3.10. Configuring header display order
    3.11. Defining custom headers
    3.12. Using %-expandos in save-hook
    3.13. Embedding push in folder-hook
    3.14. Configuring spam detection
    3.15. Using user-defined variables for config file readability
    3.16. Using user-defined variables for backing up other config option values
    3.17. Deferring user-defined variable expansion to runtime
    3.18. Using external filters in format strings
    4.1. Matching all addresses in address lists
    4.2. Using boolean operators in patterns
    4.3. Specifying a default hook
    5.1. Attachment counting
    6.1. URLs
    6.2. Managing multiple accounts
       Next
       Chapter 1. Introduction
    diff -Nru mutt-1.5.21/doc/intro.html mutt-1.5.20/doc/intro.html --- mutt-1.5.21/doc/intro.html 2010-09-15 17:10:10.000000000 +0000 +++ mutt-1.5.20/doc/intro.html 2009-06-14 18:54:31.000000000 +0000 @@ -1,6 +1,6 @@ -Chapter 1. Introduction
    Chapter 1. Introduction
    Prev   Next

    Chapter 1. Introduction

    Table of Contents

    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typographical Conventions
    7. Copyright

    -Mutt is a small but very powerful -text-based MIME mail client. Mutt is highly configurable, and is well -suited to the mail power user with advanced features like key bindings, -keyboard macros, mail threading, regular expression searches and a -powerful pattern matching language for selecting groups of messages. -

    1. Mutt Home Page

    +

    Chapter 1. Introduction
    Prev   Next

    Chapter 1. Introduction

    Table of Contents

    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typograhical Conventions
    7. Copyright

    +Mutt is a small but very powerful text-based MIME mail client. Mutt is +highly configurable, and is well suited to the mail power user with advanced +features like key bindings, keyboard macros, mail threading, regular +expression searches and a powerful pattern matching language for selecting +groups of messages. +

    1. Mutt Home Page

    The official homepage can be found at http://www.mutt.org/. -

    2. Mailing Lists

    -To subscribe to one of the following mailing lists, send a message with -the word subscribe in the body to -list-name-request@mutt.org. -

    -All messages posted to mutt-announce are -automatically forwarded to mutt-users, so you do -not need to be subscribed to both lists. -

    3. Getting Mutt

    -Mutt releases can be downloaded from ftp://ftp.mutt.org/mutt/. For a -list of mirror sites, please refer to http://www.mutt.org/download.html. +

    2. Mailing Lists

    +To subscribe to one of the following mailing lists, send a message with the +word subscribe in the body to +list-name-request@mutt.org. +

    Note

    +All messages posted to +mutt-announce are automatically forwarded to +mutt-users, so you do not need to be subscribed to +both lists. +

    3. Getting Mutt

    +Mutt releases can be downloaded from +ftp://ftp.mutt.org/mutt/. +For a list of mirror sites, please refer to +http://www.mutt.org/download.html.

    For nightly tarballs and version control access, please refer to the Mutt development site. -

    4. Mutt Online Resources

    Bug Tracking System

    +

    4. Mutt Online Resources

    Bug Tracking System

    The official Mutt bug tracking system can be found at http://bugs.mutt.org/

    Wiki

    @@ -69,7 +68,7 @@ irc.freenode.net.

    USENET

    For USENET, see the newsgroup comp.mail.mutt. -

    5. Contributing to Mutt

    +

    5. Contributing to Mutt

    There are various ways to contribute to the Mutt project.

    Especially for new users it may be helpful to meet other new and @@ -83,7 +82,7 @@ For contributing code patches for new features and bug fixes, please refer to the developer pages at http://dev.mutt.org/ for more details. -

    6. Typographical Conventions

    +

    6. Typograhical Conventions

    This section lists typographical conventions followed throughout this manual. See table Table 1.1, “Typographical conventions for special terms” for typographical conventions for special terms. @@ -92,25 +91,25 @@ 

     mutt -v

    -Within command synopsis, curly brackets (“{}”) denote a set +Within command synopsis, curly brackets (“{}”) denote a set of options of which one is mandatory, square brackets -(“[]”) denote optional arguments, three dots +(“[]”) denote optional arguments, three dots denote that the argument may be repeated arbitrary times. -

    7. Copyright

    +

    7. Copyright

    Mutt is Copyright © 1996-2009 Michael R. Elkins and others.

    -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. -

    -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. -

    -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +

    +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +

    +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    Prev   Next
    The Mutt E-Mail Client Home Chapter 2. Getting Started
    diff -Nru mutt-1.5.21/doc/makedoc.c mutt-1.5.20/doc/makedoc.c --- mutt-1.5.21/doc/makedoc.c 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/doc/makedoc.c 2009-06-07 00:32:44.000000000 +0000 @@ -117,8 +117,8 @@ static void handle_confline (char *, FILE *); static void makedoc (FILE *, FILE *); static void pretty_default (char *, size_t, const char *, int); -static int sgml_fputc (int, FILE *); -static int sgml_fputs (const char *, FILE *); +static int sgml_fputc (int, FILE *, int); +static int sgml_fputs (const char *, FILE *, int); static int sgml_id_fputs (const char *, FILE *); int main (int argc, char *argv[]) @@ -591,14 +591,14 @@ if (*v < ' ' || *v & 0x80) { char_to_escape (buff, (unsigned int) *v); - sgml_fputs (buff, out); + sgml_fputs (buff, out, 1); continue; } - sgml_fputc ((unsigned int) *v, out); + sgml_fputc ((unsigned int) *v, out, 1); } } -static int sgml_fputc (int c, FILE *out) +static int sgml_fputc (int c, FILE *out, int full) { switch (c) { @@ -606,14 +606,25 @@ case '<': return fputs ("<", out); case '>': return fputs (">", out); case '&': return fputs ("&", out); + /* map to entities, fall-through to raw if !full */ + case '$': if (full) return fputs ("$", out); + case '_': if (full) return fputs ("_", out); + case '%': if (full) return fputs ("%", out); + case '\\': if (full) return fputs ("\", out); + case '"': if (full) return fputs (""", out); + case '[': if (full) return fputs ("[", out); + case ']': if (full) return fputs ("]", out); + case '~': if (full) return fputs ("˜", out); + case '|': if (full) return fputs ("|", out); + case '^': if (full) return fputs ("ˆ", out); default: return fputc (c, out); } } -static int sgml_fputs (const char *s, FILE *out) +static int sgml_fputs (const char *s, FILE *out, int full) { for (; *s; s++) - if (sgml_fputc ((unsigned int) *s, out) == EOF) + if (sgml_fputc ((unsigned int) *s, out, full) == EOF) return EOF; return 0; @@ -705,7 +716,7 @@ fputs ("\n\n", out); - sgml_fputs (varname, out); + sgml_fputs (varname, out, 1); fprintf (out, "\nType: %s", type2human (type)); @@ -1209,7 +1220,7 @@ case SP_STR: { if (docstat & D_TAB) - sgml_fputs (str, out); + sgml_fputs (str, out, 0); else { while (*str) @@ -1227,7 +1238,7 @@ str++; } else - sgml_fputc (*str, out); + sgml_fputc (*str, out, 1); } } } @@ -1260,8 +1271,8 @@ sgml_id_fputs (ref, out); fputs ("\">", out); if (output_dollar) - fputc ('$', out); - sgml_fputs (ref, out); + fputs ("$", out); + sgml_fputs (ref, out, 1); fputs ("", out); break; diff -Nru mutt-1.5.21/doc/Makefile.am mutt-1.5.20/doc/Makefile.am --- mutt-1.5.21/doc/Makefile.am 2009-08-25 19:08:52.000000000 +0000 +++ mutt-1.5.20/doc/Makefile.am 2009-06-01 02:23:14.000000000 +0000 @@ -10,7 +10,6 @@ noinst_PROGRAMS = makedoc EXTRA_DIST = dotlock.man \ - smime_keys.man \ muttbug.man \ mutt.man \ PGP-Notes.txt \ @@ -46,14 +45,13 @@ all: makedoc-all -makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt +makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt install-data-local: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 - ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1 ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1 ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1 test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \ @@ -82,7 +80,7 @@ fi uninstall-local: - for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1; do \ + for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \ rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ done for f in muttrc.5 mbox.5 mmdf.5 ; do \ @@ -102,7 +100,7 @@ check: manual.txt: manual.html - -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ + -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ LC_ALL=C w3m -dump manual.html > $@ || \ LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ @@ -136,9 +134,8 @@ xmllint --noout --noblanks --postvalid manual.xml spellcheck: - -aspell -d american --mode=sgml --encoding=utf-8 -p $(srcdir)/mutt.pwl check manual.xml.head - -aspell -d american --mode=nroff --encoding=utf-8 -p $(srcdir)/mutt.pwl check muttrc.man.head - -aspell -d american --mode=ccpp --encoding=utf-8 -p $(srcdir)/mutt.pwl check $(top_srcdir)/init.h + -aspell -l en --mode sgml -c manual.xml.head && \ + -aspell -l en --mode nroff -c muttrc.man.head sortcheck: manual.xml sed -n -e '1,/^/d' -e '1,/^/s//\1/p' < manual.xml > vars.tmp.1 @@ -147,7 +144,7 @@ rm -rf vars.tmp.1 vars.tmp.2 clean-local: - rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man + rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 muttrc.man rm -f *.aux *.log *.tex *.out DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \ @@ -171,9 +168,6 @@ mutt.1: $(srcdir)/mutt.man $(EDIT) $(srcdir)/mutt.man > $@ -smime_keys.1: $(srcdir)/smime_keys.man - $(EDIT) $(srcdir)/smime_keys.man > $@ - stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \ manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \ $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog diff -Nru mutt-1.5.21/doc/Makefile.in mutt-1.5.20/doc/Makefile.in --- mutt-1.5.21/doc/Makefile.in 2010-08-25 16:31:48.000000000 +0000 +++ mutt-1.5.20/doc/Makefile.in 2009-06-09 06:50:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -143,7 +143,6 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PGPAUX_TARGET = @PGPAUX_TARGET@ @@ -215,7 +214,6 @@ AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir) MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C EXTRA_DIST = dotlock.man \ - smime_keys.man \ muttbug.man \ mutt.man \ PGP-Notes.txt \ @@ -267,9 +265,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile + $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -519,14 +517,13 @@ all: makedoc-all -makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt +makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt install-data-local: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 - ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1 ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1 ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1 test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \ @@ -555,7 +552,7 @@ fi uninstall-local: - for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1; do \ + for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \ rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ done for f in muttrc.5 mbox.5 mmdf.5 ; do \ @@ -575,7 +572,7 @@ check: manual.txt: manual.html - -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ + -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ LC_ALL=C w3m -dump manual.html > $@ || \ LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ @@ -609,9 +606,8 @@ xmllint --noout --noblanks --postvalid manual.xml spellcheck: - -aspell -d american --mode=sgml --encoding=utf-8 -p $(srcdir)/mutt.pwl check manual.xml.head - -aspell -d american --mode=nroff --encoding=utf-8 -p $(srcdir)/mutt.pwl check muttrc.man.head - -aspell -d american --mode=ccpp --encoding=utf-8 -p $(srcdir)/mutt.pwl check $(top_srcdir)/init.h + -aspell -l en --mode sgml -c manual.xml.head && \ + -aspell -l en --mode nroff -c muttrc.man.head sortcheck: manual.xml sed -n -e '1,/^/d' -e '1,/^/s//\1/p' < manual.xml > vars.tmp.1 @@ -620,7 +616,7 @@ rm -rf vars.tmp.1 vars.tmp.2 clean-local: - rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man + rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 muttrc.man rm -f *.aux *.log *.tex *.out instdoc: instdoc.sh @@ -637,9 +633,6 @@ mutt.1: $(srcdir)/mutt.man $(EDIT) $(srcdir)/mutt.man > $@ -smime_keys.1: $(srcdir)/smime_keys.man - $(EDIT) $(srcdir)/smime_keys.man > $@ - stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \ manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \ $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog diff -Nru mutt-1.5.21/doc/manual.html mutt-1.5.20/doc/manual.html --- mutt-1.5.21/doc/manual.html 2010-09-15 17:10:35.000000000 +0000 +++ mutt-1.5.20/doc/manual.html 2009-06-14 18:54:55.000000000 +0000 @@ -1,6 +1,6 @@ -The Mutt E-Mail Client

    The Mutt E-Mail Client

    Michael Elkins

    version 1.5.21 (2010-09-15)

    Abstract

    -“All mail clients suck. This one just sucks less.” — -me, circa 1995 -

    Table of Contents

    1. Introduction
    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typographical Conventions
    7. Copyright
    2. Getting Started
    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail
    3. Configuration
    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Header Display
    10.2. Selecting Headers
    10.3. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    26.4. Type Conversions
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding
    4. Advanced Usage
    1. Character Set Handling
    2. Regular Expressions
    3. Patterns: Searching, Limiting and Tagging
    3.1. Pattern Modifier
    3.2. Simple Searches
    3.3. Nesting and Boolean Operators
    3.4. Searching by Date
    4. Using Tags
    5. Using Hooks
    5.1. Message Matching in Hooks
    6. External Address Queries
    7. Mailbox Formats
    8. Mailbox Shortcuts
    9. Handling Mailing Lists
    10. New Mail Detection
    10.1. How New Mail Detection Works
    10.2. Polling For New Mail
    11. Editing Threads
    11.1. Linking Threads
    11.2. Breaking Threads
    12. Delivery Status Notification (DSN) Support
    13. Start a WWW Browser on URLs
    14. Miscellany
    5. Mutt's MIME Support
    1. Using MIME in Mutt
    1.1. MIME Overview
    1.2. Viewing MIME Messages in the Pager
    1.3. The Attachment Menu
    1.4. The Compose Menu
    2. MIME Type Configuration with mime.types
    3. MIME Viewer Configuration with Mailcap
    3.1. The Basics of the Mailcap File
    3.2. Secure Use of Mailcap
    3.3. Advanced Mailcap Usage
    3.4. Example Mailcap Files
    4. MIME Autoview
    5. MIME Multipart/Alternative
    6. Attachment Searching and Counting
    7. MIME Lookup
    6. Optional Features
    1. General Notes
    1.1. Enabling/Disabling Features
    1.2. URL Syntax
    2. SSL/TLS Support
    3. POP3 Support
    4. IMAP Support
    4.1. The IMAP Folder Browser
    4.2. Authentication
    5. SMTP Support
    6. Managing Multiple Accounts
    7. Local Caching
    7.1. Header Caching
    7.2. Body Caching
    7.3. Cache Directories
    7.4. Maintenance
    8. Exact Address Generation
    9. Sending Anonymous Messages via Mixmaster
    7. Security Considerations
    1. Passwords
    2. Temporary Files
    3. Information Leaks
    3.1. Message-Id: headers
    3.2. mailto:-style Links
    4. External Applications
    8. Performance Tuning
    1. Reading and Writing Mailboxes
    2. Reading Messages from Remote Folders
    3. Searching and Limiting
    9. Reference
    1. Command-Line Options
    2. Configuration Commands
    3. Configuration Variables
    3.1. abort_nosubject
    3.2. abort_unmodified
    3.3. alias_file
    3.4. alias_format
    3.5. allow_8bit
    3.6. allow_ansi
    3.7. arrow_cursor
    3.8. ascii_chars
    3.9. askbcc
    3.10. askcc
    3.11. assumed_charset
    3.12. attach_charset
    3.13. attach_format
    3.14. attach_sep
    3.15. attach_split
    3.16. attribution
    3.17. auto_tag
    3.18. autoedit
    3.19. beep
    3.20. beep_new
    3.21. bounce
    3.22. bounce_delivered
    3.23. braille_friendly
    3.24. certificate_file
    3.25. charset
    3.26. check_mbox_size
    3.27. check_new
    3.28. collapse_unread
    3.29. compose_format
    3.30. config_charset
    3.31. confirmappend
    3.32. confirmcreate
    3.33. connect_timeout
    3.34. content_type
    3.35. copy
    3.36. crypt_autoencrypt
    3.37. crypt_autopgp
    3.38. crypt_autosign
    3.39. crypt_autosmime
    3.40. crypt_replyencrypt
    3.41. crypt_replysign
    3.42. crypt_replysignencrypted
    3.43. crypt_timestamp
    3.44. crypt_use_gpgme
    3.45. crypt_use_pka
    3.46. crypt_verify_sig
    3.47. date_format
    3.48. default_hook
    3.49. delete
    3.50. delete_untag
    3.51. digest_collapse
    3.52. display_filter
    3.53. dotlock_program
    3.54. dsn_notify
    3.55. dsn_return
    3.56. duplicate_threads
    3.57. edit_headers
    3.58. editor
    3.59. encode_from
    3.60. entropy_file
    3.61. envelope_from_address
    3.62. escape
    3.63. fast_reply
    3.64. fcc_attach
    3.65. fcc_clear
    3.66. folder
    3.67. folder_format
    3.68. followup_to
    3.69. force_name
    3.70. forward_decode
    3.71. forward_decrypt
    3.72. forward_edit
    3.73. forward_format
    3.74. forward_quote
    3.75. from
    3.76. gecos_mask
    3.77. hdrs
    3.78. header
    3.79. header_cache
    3.80. header_cache_compress
    3.81. header_cache_pagesize
    3.82. help
    3.83. hidden_host
    3.84. hide_limited
    3.85. hide_missing
    3.86. hide_thread_subject
    3.87. hide_top_limited
    3.88. hide_top_missing
    3.89. history
    3.90. history_file
    3.91. honor_disposition
    3.92. honor_followup_to
    3.93. hostname
    3.94. ignore_linear_white_space
    3.95. ignore_list_reply_to
    3.96. imap_authenticators
    3.97. imap_check_subscribed
    3.98. imap_delim_chars
    3.99. imap_headers
    3.100. imap_idle
    3.101. imap_keepalive
    3.102. imap_list_subscribed
    3.103. imap_login
    3.104. imap_pass
    3.105. imap_passive
    3.106. imap_peek
    3.107. imap_pipeline_depth
    3.108. imap_servernoise
    3.109. imap_user
    3.110. implicit_autoview
    3.111. include
    3.112. include_onlyfirst
    3.113. indent_string
    3.114. index_format
    3.115. ispell
    3.116. keep_flagged
    3.117. locale
    3.118. mail_check
    3.119. mail_check_recent
    3.120. mailcap_path
    3.121. mailcap_sanitize
    3.122. maildir_header_cache_verify
    3.123. maildir_trash
    3.124. mark_old
    3.125. markers
    3.126. mask
    3.127. mbox
    3.128. mbox_type
    3.129. menu_context
    3.130. menu_move_off
    3.131. menu_scroll
    3.132. message_cache_clean
    3.133. message_cachedir
    3.134. message_format
    3.135. meta_key
    3.136. metoo
    3.137. mh_purge
    3.138. mh_seq_flagged
    3.139. mh_seq_replied
    3.140. mh_seq_unseen
    3.141. mime_forward
    3.142. mime_forward_decode
    3.143. mime_forward_rest
    3.144. mix_entry_format
    3.145. mixmaster
    3.146. move
    3.147. narrow_tree
    3.148. net_inc
    3.149. pager
    3.150. pager_context
    3.151. pager_format
    3.152. pager_index_lines
    3.153. pager_stop
    3.154. pgp_auto_decode
    3.155. pgp_autoinline
    3.156. pgp_check_exit
    3.157. pgp_clearsign_command
    3.158. pgp_decode_command
    3.159. pgp_decrypt_command
    3.160. pgp_encrypt_only_command
    3.161. pgp_encrypt_sign_command
    3.162. pgp_entry_format
    3.163. pgp_export_command
    3.164. pgp_getkeys_command
    3.165. pgp_good_sign
    3.166. pgp_ignore_subkeys
    3.167. pgp_import_command
    3.168. pgp_list_pubring_command
    3.169. pgp_list_secring_command
    3.170. pgp_long_ids
    3.171. pgp_mime_auto
    3.172. pgp_replyinline
    3.173. pgp_retainable_sigs
    3.174. pgp_show_unusable
    3.175. pgp_sign_as
    3.176. pgp_sign_command
    3.177. pgp_sort_keys
    3.178. pgp_strict_enc
    3.179. pgp_timeout
    3.180. pgp_use_gpg_agent
    3.181. pgp_verify_command
    3.182. pgp_verify_key_command
    3.183. pipe_decode
    3.184. pipe_sep
    3.185. pipe_split
    3.186. pop_auth_try_all
    3.187. pop_authenticators
    3.188. pop_checkinterval
    3.189. pop_delete
    3.190. pop_host
    3.191. pop_last
    3.192. pop_pass
    3.193. pop_reconnect
    3.194. pop_user
    3.195. post_indent_string
    3.196. postpone
    3.197. postponed
    3.198. preconnect
    3.199. print
    3.200. print_command
    3.201. print_decode
    3.202. print_split
    3.203. prompt_after
    3.204. query_command
    3.205. query_format
    3.206. quit
    3.207. quote_regexp
    3.208. read_inc
    3.209. read_only
    3.210. realname
    3.211. recall
    3.212. record
    3.213. reply_regexp
    3.214. reply_self
    3.215. reply_to
    3.216. resolve
    3.217. reverse_alias
    3.218. reverse_name
    3.219. reverse_realname
    3.220. rfc2047_parameters
    3.221. save_address
    3.222. save_empty
    3.223. save_history
    3.224. save_name
    3.225. score
    3.226. score_threshold_delete
    3.227. score_threshold_flag
    3.228. score_threshold_read
    3.229. search_context
    3.230. send_charset
    3.231. sendmail
    3.232. sendmail_wait
    3.233. shell
    3.234. sig_dashes
    3.235. sig_on_top
    3.236. signature
    3.237. simple_search
    3.238. sleep_time
    3.239. smart_wrap
    3.240. smileys
    3.241. smime_ask_cert_label
    3.242. smime_ca_location
    3.243. smime_certificates
    3.244. smime_decrypt_command
    3.245. smime_decrypt_use_default_key
    3.246. smime_default_key
    3.247. smime_encrypt_command
    3.248. smime_encrypt_with
    3.249. smime_get_cert_command
    3.250. smime_get_cert_email_command
    3.251. smime_get_signer_cert_command
    3.252. smime_import_cert_command
    3.253. smime_is_default
    3.254. smime_keys
    3.255. smime_pk7out_command
    3.256. smime_sign_command
    3.257. smime_sign_opaque_command
    3.258. smime_timeout
    3.259. smime_verify_command
    3.260. smime_verify_opaque_command
    3.261. smtp_authenticators
    3.262. smtp_pass
    3.263. smtp_url
    3.264. sort
    3.265. sort_alias
    3.266. sort_aux
    3.267. sort_browser
    3.268. sort_re
    3.269. spam_separator
    3.270. spoolfile
    3.271. ssl_ca_certificates_file
    3.272. ssl_client_cert
    3.273. ssl_force_tls
    3.274. ssl_min_dh_prime_bits
    3.275. ssl_starttls
    3.276. ssl_use_sslv2
    3.277. ssl_use_sslv3
    3.278. ssl_use_tlsv1
    3.279. ssl_usesystemcerts
    3.280. ssl_verify_dates
    3.281. ssl_verify_host
    3.282. status_chars
    3.283. status_format
    3.284. status_on_top
    3.285. strict_threads
    3.286. suspend
    3.287. text_flowed
    3.288. thorough_search
    3.289. thread_received
    3.290. tilde
    3.291. time_inc
    3.292. timeout
    3.293. tmpdir
    3.294. to_chars
    3.295. tunnel
    3.296. uncollapse_jump
    3.297. use_8bitmime
    3.298. use_domain
    3.299. use_envelope_from
    3.300. use_from
    3.301. use_idn
    3.302. use_ipv6
    3.303. user_agent
    3.304. visual
    3.305. wait_key
    3.306. weed
    3.307. wrap
    3.308. wrap_headers
    3.309. wrap_search
    3.310. wrapmargin
    3.311. write_bcc
    3.312. write_inc
    4. Functions
    4.1. Generic Menu
    4.2. Index Menu
    4.3. Pager Menu
    4.4. Alias Menu
    4.5. Query Menu
    4.6. Attachment Menu
    4.7. Compose Menu
    4.8. Postpone Menu
    4.9. Browser Menu
    4.10. Pgp Menu
    4.11. Smime Menu
    4.12. Mixmaster Menu
    4.13. Editor Menu
    10. Miscellany
    1. Acknowledgements
    2. About This Document

    List of Tables

    1.1. Typographical conventions for special terms
    2.1. Most common navigation keys in entry-based menus
    2.2. Most common navigation keys in page-based menus
    2.3. Most common line editor keys
    2.4. Most common message index keys
    2.5. Message status flags
    2.6. Message recipient flags
    2.7. Most common pager keys
    2.8. ANSI escape sequences
    2.9. Color sequences
    2.10. Most common thread mode keys
    2.11. Most common mail sending keys
    2.12. Most common compose menu keys
    2.13. PGP key menu flags
    3.1. Symbolic key names
    4.1. POSIX regular expression character classes
    4.2. Regular expression repetition operators
    4.3. GNU regular expression extensions
    4.4. Pattern modifiers
    4.5. Simple search keywords
    4.6. Date units
    4.7. Mailbox shortcuts
    5.1. Supported MIME types
    9.1. Command line options
    9.2. Default Generic Menu Bindings
    9.3. Default Index Menu Bindings
    9.4. Default Pager Menu Bindings
    9.5. Default Alias Menu Bindings
    9.6. Default Query Menu Bindings
    9.7. Default Attachment Menu Bindings
    9.8. Default Compose Menu Bindings
    9.9. Default Postpone Menu Bindings
    9.10. Default Browser Menu Bindings
    9.11. Default Pgp Menu Bindings
    9.12. Default Smime Menu Bindings
    9.13. Default Mixmaster Menu Bindings
    9.14. Default Editor Menu Bindings

    List of Examples

    3.1. Multiple configuration commands per line
    3.2. Commenting configuration files
    3.3. Escaping quotes in configuration files
    3.4. Splitting long configuration commands over several lines
    3.5. Using external command's output in configuration files
    3.6. Using environment variables in configuration files
    3.7. Configuring external alias files
    3.8. Setting sort method based on mailbox name
    3.9. Header weeding
    3.10. Configuring header display order
    3.11. Defining custom headers
    3.12. Using %-expandos in save-hook
    3.13. Embedding push in folder-hook
    3.14. Configuring spam detection
    3.15. Using user-defined variables for config file readability
    3.16. Using user-defined variables for backing up other config option values
    3.17. Deferring user-defined variable expansion to runtime
    3.18. Type conversions using variables
    3.19. Using external filters in format strings
    4.1. Matching all addresses in address lists
    4.2. Using boolean operators in patterns
    4.3. Specifying a “default” hook
    5.1. mime.types
    5.2. Attachment counting
    6.1. URLs
    6.2. Managing multiple accounts

    Chapter 1. Introduction

    Table of Contents

    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typographical Conventions
    7. Copyright

    -Mutt is a small but very powerful -text-based MIME mail client. Mutt is highly configurable, and is well -suited to the mail power user with advanced features like key bindings, -keyboard macros, mail threading, regular expression searches and a -powerful pattern matching language for selecting groups of messages. -

    1. Mutt Home Page

    +

    The Mutt E-Mail Client

    Michael Elkins

    version 1.5.20 (2009-06-14)

    Abstract

    +“All mail clients suck. This one just sucks less.” — me, circa 1995 +

    Table of Contents

    1. Introduction
    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typograhical Conventions
    7. Copyright
    2. Getting Started
    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail
    3. Configuration
    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Selecting Headers
    10.2. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding
    4. Advanced Usage
    1. Regular Expressions
    2. Patterns: Searching, Limiting and Tagging
    2.1. Pattern Modifier
    2.2. Simple Searches
    2.3. Nesting and Boolean Operators
    2.4. Searching by Date
    3. Using Tags
    4. Using Hooks
    4.1. Message Matching in Hooks
    5. External Address Queries
    6. Mailbox Formats
    7. Mailbox Shortcuts
    8. Handling Mailing Lists
    9. Handling multiple folders
    10. Editing Threads
    10.1. Linking Threads
    10.2. Breaking Threads
    11. Delivery Status Notification (DSN) Support
    12. Start a WWW Browser on URLs
    13. Miscellany
    5. Mutt's MIME Support
    1. Using MIME in Mutt
    1.1. Viewing MIME Messages in the Pager
    1.2. The Attachment Menu
    1.3. The Compose Menu
    2. MIME Type Configuration with mime.types
    3. MIME Viewer Configuration with Mailcap
    3.1. The Basics of the Mailcap File
    3.2. Secure Use of Mailcap
    3.3. Advanced Mailcap Usage
    3.4. Example Mailcap Files
    4. MIME Autoview
    5. MIME Multipart/Alternative
    6. Attachment Searching and Counting
    7. MIME Lookup
    6. Optional Features
    1. General Notes
    1.1. Enabling/Disabling Features
    1.2. URL Syntax
    2. SSL/TLS Support
    3. POP3 Support
    4. IMAP Support
    4.1. The IMAP Folder Browser
    4.2. Authentication
    5. SMTP Support
    6. Managing Multiple Accounts
    7. Local Caching
    7.1. Header Caching
    7.2. Body Caching
    7.3. Maintenance
    8. Exact Address Generation
    9. Sending Anonymous Messages via Mixmaster
    7. Security Considerations
    1. Passwords
    2. Temporary Files
    3. Information Leaks
    3.1. Message-Id: headers
    3.2. mailto:-style Links
    4. External Applications
    8. Performance Tuning
    1. Reading and Writing Mailboxes
    2. Reading Messages from Remote Folders
    3. Searching and Limiting
    9. Reference
    1. Command-Line Options
    2. Configuration Commands
    3. Configuration Variables
    3.1. abort_nosubject
    3.2. abort_unmodified
    3.3. alias_file
    3.4. alias_format
    3.5. allow_8bit
    3.6. allow_ansi
    3.7. arrow_cursor
    3.8. ascii_chars
    3.9. askbcc
    3.10. askcc
    3.11. assumed_charset
    3.12. attach_charset
    3.13. attach_format
    3.14. attach_sep
    3.15. attach_split
    3.16. attribution
    3.17. auto_tag
    3.18. autoedit
    3.19. beep
    3.20. beep_new
    3.21. bounce
    3.22. bounce_delivered
    3.23. braille_friendly
    3.24. certificate_file
    3.25. charset
    3.26. check_mbox_size
    3.27. check_new
    3.28. collapse_unread
    3.29. compose_format
    3.30. config_charset
    3.31. confirmappend
    3.32. confirmcreate
    3.33. connect_timeout
    3.34. content_type
    3.35. copy
    3.36. crypt_autoencrypt
    3.37. crypt_autopgp
    3.38. crypt_autosign
    3.39. crypt_autosmime
    3.40. crypt_replyencrypt
    3.41. crypt_replysign
    3.42. crypt_replysignencrypted
    3.43. crypt_timestamp
    3.44. crypt_use_gpgme
    3.45. crypt_use_pka
    3.46. crypt_verify_sig
    3.47. date_format
    3.48. default_hook
    3.49. delete
    3.50. delete_untag
    3.51. digest_collapse
    3.52. display_filter
    3.53. dotlock_program
    3.54. dsn_notify
    3.55. dsn_return
    3.56. duplicate_threads
    3.57. edit_headers
    3.58. editor
    3.59. encode_from
    3.60. entropy_file
    3.61. envelope_from_address
    3.62. escape
    3.63. fast_reply
    3.64. fcc_attach
    3.65. fcc_clear
    3.66. folder
    3.67. folder_format
    3.68. followup_to
    3.69. force_name
    3.70. forward_decode
    3.71. forward_decrypt
    3.72. forward_edit
    3.73. forward_format
    3.74. forward_quote
    3.75. from
    3.76. gecos_mask
    3.77. hdrs
    3.78. header
    3.79. header_cache
    3.80. header_cache_compress
    3.81. header_cache_pagesize
    3.82. help
    3.83. hidden_host
    3.84. hide_limited
    3.85. hide_missing
    3.86. hide_thread_subject
    3.87. hide_top_limited
    3.88. hide_top_missing
    3.89. history
    3.90. history_file
    3.91. honor_disposition
    3.92. honor_followup_to
    3.93. hostname
    3.94. ignore_linear_white_space
    3.95. ignore_list_reply_to
    3.96. imap_authenticators
    3.97. imap_check_subscribed
    3.98. imap_delim_chars
    3.99. imap_headers
    3.100. imap_idle
    3.101. imap_keepalive
    3.102. imap_list_subscribed
    3.103. imap_login
    3.104. imap_pass
    3.105. imap_passive
    3.106. imap_peek
    3.107. imap_pipeline_depth
    3.108. imap_servernoise
    3.109. imap_user
    3.110. implicit_autoview
    3.111. include
    3.112. include_onlyfirst
    3.113. indent_string
    3.114. index_format
    3.115. ispell
    3.116. keep_flagged
    3.117. locale
    3.118. mail_check
    3.119. mailcap_path
    3.120. mailcap_sanitize
    3.121. maildir_header_cache_verify
    3.122. maildir_trash
    3.123. mark_old
    3.124. markers
    3.125. mask
    3.126. mbox
    3.127. mbox_type
    3.128. menu_context
    3.129. menu_move_off
    3.130. menu_scroll
    3.131. message_cache_clean
    3.132. message_cachedir
    3.133. message_format
    3.134. meta_key
    3.135. metoo
    3.136. mh_purge
    3.137. mh_seq_flagged
    3.138. mh_seq_replied
    3.139. mh_seq_unseen
    3.140. mime_forward
    3.141. mime_forward_decode
    3.142. mime_forward_rest
    3.143. mix_entry_format
    3.144. mixmaster
    3.145. move
    3.146. narrow_tree
    3.147. net_inc
    3.148. pager
    3.149. pager_context
    3.150. pager_format
    3.151. pager_index_lines
    3.152. pager_stop
    3.153. pgp_auto_decode
    3.154. pgp_autoinline
    3.155. pgp_check_exit
    3.156. pgp_clearsign_command
    3.157. pgp_decode_command
    3.158. pgp_decrypt_command
    3.159. pgp_encrypt_only_command
    3.160. pgp_encrypt_sign_command
    3.161. pgp_entry_format
    3.162. pgp_export_command
    3.163. pgp_getkeys_command
    3.164. pgp_good_sign
    3.165. pgp_ignore_subkeys
    3.166. pgp_import_command
    3.167. pgp_list_pubring_command
    3.168. pgp_list_secring_command
    3.169. pgp_long_ids
    3.170. pgp_mime_auto
    3.171. pgp_replyinline
    3.172. pgp_retainable_sigs
    3.173. pgp_show_unusable
    3.174. pgp_sign_as
    3.175. pgp_sign_command
    3.176. pgp_sort_keys
    3.177. pgp_strict_enc
    3.178. pgp_timeout
    3.179. pgp_use_gpg_agent
    3.180. pgp_verify_command
    3.181. pgp_verify_key_command
    3.182. pipe_decode
    3.183. pipe_sep
    3.184. pipe_split
    3.185. pop_auth_try_all
    3.186. pop_authenticators
    3.187. pop_checkinterval
    3.188. pop_delete
    3.189. pop_host
    3.190. pop_last
    3.191. pop_pass
    3.192. pop_reconnect
    3.193. pop_user
    3.194. post_indent_string
    3.195. postpone
    3.196. postponed
    3.197. preconnect
    3.198. print
    3.199. print_command
    3.200. print_decode
    3.201. print_split
    3.202. prompt_after
    3.203. query_command
    3.204. query_format
    3.205. quit
    3.206. quote_regexp
    3.207. read_inc
    3.208. read_only
    3.209. realname
    3.210. recall
    3.211. record
    3.212. reply_regexp
    3.213. reply_self
    3.214. reply_to
    3.215. resolve
    3.216. reverse_alias
    3.217. reverse_name
    3.218. reverse_realname
    3.219. rfc2047_parameters
    3.220. save_address
    3.221. save_empty
    3.222. save_history
    3.223. save_name
    3.224. score
    3.225. score_threshold_delete
    3.226. score_threshold_flag
    3.227. score_threshold_read
    3.228. search_context
    3.229. send_charset
    3.230. sendmail
    3.231. sendmail_wait
    3.232. shell
    3.233. sig_dashes
    3.234. sig_on_top
    3.235. signature
    3.236. simple_search
    3.237. sleep_time
    3.238. smart_wrap
    3.239. smileys
    3.240. smime_ask_cert_label
    3.241. smime_ca_location
    3.242. smime_certificates
    3.243. smime_decrypt_command
    3.244. smime_decrypt_use_default_key
    3.245. smime_default_key
    3.246. smime_encrypt_command
    3.247. smime_encrypt_with
    3.248. smime_get_cert_command
    3.249. smime_get_cert_email_command
    3.250. smime_get_signer_cert_command
    3.251. smime_import_cert_command
    3.252. smime_is_default
    3.253. smime_keys
    3.254. smime_pk7out_command
    3.255. smime_sign_command
    3.256. smime_sign_opaque_command
    3.257. smime_timeout
    3.258. smime_verify_command
    3.259. smime_verify_opaque_command
    3.260. smtp_authenticators
    3.261. smtp_pass
    3.262. smtp_url
    3.263. sort
    3.264. sort_alias
    3.265. sort_aux
    3.266. sort_browser
    3.267. sort_re
    3.268. spam_separator
    3.269. spoolfile
    3.270. ssl_ca_certificates_file
    3.271. ssl_client_cert
    3.272. ssl_force_tls
    3.273. ssl_min_dh_prime_bits
    3.274. ssl_starttls
    3.275. ssl_use_sslv2
    3.276. ssl_use_sslv3
    3.277. ssl_use_tlsv1
    3.278. ssl_usesystemcerts
    3.279. ssl_verify_dates
    3.280. ssl_verify_host
    3.281. status_chars
    3.282. status_format
    3.283. status_on_top
    3.284. strict_threads
    3.285. suspend
    3.286. text_flowed
    3.287. thorough_search
    3.288. thread_received
    3.289. tilde
    3.290. time_inc
    3.291. timeout
    3.292. tmpdir
    3.293. to_chars
    3.294. tunnel
    3.295. uncollapse_jump
    3.296. use_8bitmime
    3.297. use_domain
    3.298. use_envelope_from
    3.299. use_from
    3.300. use_idn
    3.301. use_ipv6
    3.302. user_agent
    3.303. visual
    3.304. wait_key
    3.305. weed
    3.306. wrap
    3.307. wrap_search
    3.308. wrapmargin
    3.309. write_bcc
    3.310. write_inc
    4. Functions
    4.1. Generic Menu
    4.2. Index Menu
    4.3. Pager Menu
    4.4. Alias Menu
    4.5. Query Menu
    4.6. Attach Menu
    4.7. Compose Menu
    4.8. Postpone Menu
    4.9. Browser Menu
    4.10. Pgp Menu
    4.11. Smime Menu
    4.12. Mix Menu
    4.13. Editor Menu
    10. Miscellany
    1. Acknowledgements
    2. About This Document

    List of Tables

    1.1. Typographical conventions for special terms
    2.1. Most common navigation keys in entry-based menus
    2.2. Most common navigation keys in page-based menus
    2.3. Most common line editor keys
    2.4. Most common message index keys
    2.5. Message status flags
    2.6. Message recipient flags
    2.7. Most common pager keys
    2.8. ANSI escape sequences
    2.9. Color sequences
    2.10. Most common thread mode keys
    2.11. Most common mail sending keys
    2.12. Most common compose menu keys
    2.13. PGP key menu flags
    3.1. Symbolic key names
    4.1. POSIX regular expression character classes
    4.2. Regular expression repetition operators
    4.3. GNU regular expression extensions
    4.4. Pattern modifiers
    4.5. Simple search keywords
    4.6. Date units
    9.1. Command line options
    9.2. Default generic Function Bindings
    9.3. Default index Function Bindings
    9.4. Default pager Function Bindings
    9.5. Default alias Function Bindings
    9.6. Default query Function Bindings
    9.7. Default attach Function Bindings
    9.8. Default compose Function Bindings
    9.9. Default postpone Function Bindings
    9.10. Default browser Function Bindings
    9.11. Default pgp Function Bindings
    9.12. Default smime Function Bindings
    9.13. Default mix Function Bindings
    9.14. Default editor Function Bindings

    List of Examples

    3.1. Multiple configuration commands per line
    3.2. Commenting configuration files
    3.3. Escaping quotes in congfiguration files
    3.4. Splitting long configuration commands over several lines
    3.5. Using external command's output in configuration files
    3.6. Using environment variables in configuration files
    3.7. Configuring external alias files
    3.8. Setting sort method based on mailbox name
    3.9. Header weeding
    3.10. Configuring header display order
    3.11. Defining custom headers
    3.12. Using %-expandos in save-hook
    3.13. Embedding push in folder-hook
    3.14. Configuring spam detection
    3.15. Using user-defined variables for config file readability
    3.16. Using user-defined variables for backing up other config option values
    3.17. Deferring user-defined variable expansion to runtime
    3.18. Using external filters in format strings
    4.1. Matching all addresses in address lists
    4.2. Using boolean operators in patterns
    4.3. Specifying a default hook
    5.1. Attachment counting
    6.1. URLs
    6.2. Managing multiple accounts

    Chapter 1. Introduction

    Table of Contents

    1. Mutt Home Page
    2. Mailing Lists
    3. Getting Mutt
    4. Mutt Online Resources
    5. Contributing to Mutt
    6. Typograhical Conventions
    7. Copyright

    +Mutt is a small but very powerful text-based MIME mail client. Mutt is +highly configurable, and is well suited to the mail power user with advanced +features like key bindings, keyboard macros, mail threading, regular +expression searches and a powerful pattern matching language for selecting +groups of messages. +

    1. Mutt Home Page

    The official homepage can be found at http://www.mutt.org/. -

    2. Mailing Lists

    -To subscribe to one of the following mailing lists, send a message with -the word subscribe in the body to -list-name-request@mutt.org. -

    -All messages posted to mutt-announce are -automatically forwarded to mutt-users, so you do -not need to be subscribed to both lists. -

    3. Getting Mutt

    -Mutt releases can be downloaded from ftp://ftp.mutt.org/mutt/. For a -list of mirror sites, please refer to http://www.mutt.org/download.html. +

    2. Mailing Lists

    +To subscribe to one of the following mailing lists, send a message with the +word subscribe in the body to +list-name-request@mutt.org. +

    Note

    +All messages posted to +mutt-announce are automatically forwarded to +mutt-users, so you do not need to be subscribed to +both lists. +

    3. Getting Mutt

    +Mutt releases can be downloaded from +ftp://ftp.mutt.org/mutt/. +For a list of mirror sites, please refer to +http://www.mutt.org/download.html.

    For nightly tarballs and version control access, please refer to the Mutt development site. -

    4. Mutt Online Resources

    Bug Tracking System

    +

    4. Mutt Online Resources

    Bug Tracking System

    The official Mutt bug tracking system can be found at http://bugs.mutt.org/

    Wiki

    @@ -72,7 +70,7 @@ irc.freenode.net.

    USENET

    For USENET, see the newsgroup comp.mail.mutt. -

    5. Contributing to Mutt

    +

    5. Contributing to Mutt

    There are various ways to contribute to the Mutt project.

    Especially for new users it may be helpful to meet other new and @@ -86,60 +84,57 @@ For contributing code patches for new features and bug fixes, please refer to the developer pages at http://dev.mutt.org/ for more details. -

    6. Typographical Conventions

    +

    6. Typograhical Conventions

    This section lists typographical conventions followed throughout this -manual. See table Table 1.1, “Typographical conventions for special terms” for typographical +manual. See table Table 1.1, “Typographical conventions for special terms” for typographical conventions for special terms.

    Table 1.1. Typographical conventions for special terms

    ItemRefers to...
    printf(3)UNIX manual pages, execute man 3 printf
    <PageUp>named keys
    <create-alias>named Mutt function
    ^GControl+G key combination
    $mail_checkMutt configuration option
    $HOMEenvironment variable

    Examples are presented as: 

     mutt -v

    -Within command synopsis, curly brackets (“{}”) denote a set +Within command synopsis, curly brackets (“{}”) denote a set of options of which one is mandatory, square brackets -(“[]”) denote optional arguments, three dots +(“[]”) denote optional arguments, three dots denote that the argument may be repeated arbitrary times. -

    7. Copyright

    +

    7. Copyright

    Mutt is Copyright © 1996-2009 Michael R. Elkins and others.

    -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. -

    -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. -

    -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -

    Chapter 2. Getting Started

    Table of Contents

    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail

    -This section is intended as a brief overview of how to use Mutt. There -are many other features which are described elsewhere in the manual. -There is even more information available in the Mutt FAQ and various web -pages. See the Mutt homepage -for more details. -

    -The keybindings described in this section are the defaults as -distributed. Your local system administrator may have altered the -defaults for your site. You can always type “?” in any -menu to display the current bindings. -

    -The first thing you need to do is invoke Mutt, simply by typing -mutt at the command line. There are various -command-line options, see either the Mutt man page or the reference. -

    1. Core Concepts

    +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +

    +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +

    +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +

    Chapter 2. Getting Started

    Table of Contents

    1. Core Concepts
    2. Screens and Menus
    2.1. Index
    2.2. Pager
    2.3. File Browser
    2.4. Help
    2.5. Compose Menu
    2.6. Alias Menu
    2.7. Attachment Menu
    3. Moving Around in Menus
    4. Editing Input Fields
    4.1. Introduction
    4.2. History
    5. Reading Mail
    5.1. The Message Index
    5.2. The Pager
    5.3. Threaded Mode
    5.4. Miscellaneous Functions
    6. Sending Mail
    6.1. Introduction
    6.2. Editing the Message Header
    6.3. Sending Cryptographically Signed/Encrypted Messages
    6.4. Sending Format=Flowed Messages
    7. Forwarding and Bouncing Mail
    8. Postponing Mail

    +This section is intended as a brief overview of how to use Mutt. There are +many other features which are described elsewhere in the manual. There +is even more information available in the Mutt FAQ and various web +pages. See the Mutt homepage for more details. +

    +The keybindings described in this section are the defaults as distributed. +Your local system administrator may have altered the defaults for your site. +You can always type “?” in any menu to display the current bindings. +

    +The first thing you need to do is invoke Mutt, simply by typing mutt +at the command line. There are various command-line options, see +either the Mutt man page or the reference. +

    1. Core Concepts

    Mutt is a text-based application which interacts with users through different menus which are mostly line-/entry-based or page-based. A -line-based menu is the so-called “index” menu (listing all -messages of the currently opened folder) or the “alias” -menu (allowing you to select recipients from a list). Examples for -page-based menus are the “pager” (showing one message at a -time) or the “help” menu listing all available key -bindings. +line-based menu is the so-called “index” menu (listing all messages of +the currently opened folder) or the “alias” menu (allowing you to +select recipients from a list). Examples for page-based menus are the +“pager” (showing one message at a time) or the “help” menu listing +all available key bindings.

    The user interface consists of a context sensitive help line at the top, the menu's contents followed by a context sensitive status line and @@ -153,34 +148,34 @@ configuration files readable and commentable.

    Because Mutt allows for customizing almost all key bindings, there are -so-called “functions” which can be executed manually (using -the command line) or in macros. Macros allow the user to bind a sequence -of commands to a single key or a short key sequence instead of repeating -a sequence of actions over and over. +so-called “functions” which can be executed manually (using the +command line) or in macros. Macros allow the user to bind a sequence of +commands to a single key or a short key sequence instead of repeating a +sequence of actions over and over.

    Many commands (such as saving or copying a message to another folder) can be applied to a single message or a set of messages (so-called -“tagged” messages). To help selecting messages, Mutt -provides a rich set of message patterns (such as recipients, sender, -body contents, date sent/received, etc.) which can be combined into -complex expressions using the boolean and and -or operations as well as negating. These patterns -can also be used to (for example) search for messages or to limit the -index to show only matching messages. -

    -Mutt supports a “hook” concept which allows the user to -execute arbitrary configuration commands and functions in certain -situations such as entering a folder, starting a new message or replying -to an existing one. These hooks can be used to highly customize Mutt's -behavior including managing multiple identities, customizing the +“tagged” messages). To help selecting messages, Mutt provides a rich +set of message patterns (such as recipients, sender, body contents, date +sent/received, etc.) which can be combined into complex expressions +using the boolean and and or +operations as well as negating. These patterns can also be used to (for +example) search for messages or to limit the index to show only matching +messages. +

    +Mutt supports a “hook” concept which allows the user to execute +arbitrary configuration commands and functions in certain situations +such as entering a folder, starting a new message or replying to an +existing one. These hooks can be used to highly customize Mutt's +behaviour including managing multiple identities, customizing the display for a folder or even implementing auto-archiving based on a per-folder basis and much more.

    Besides an interactive mode, Mutt can also be used as a command-line tool only send messages. It also supports a -mailx(1)-compatible interface, see Table 9.1, “Command line options” for a complete list of command-line +mailx(1)-compatible interface, see Table 9.1, “Command line options” for a complete list of command-line options. -

    2. Screens and Menus

    2.1. Index

    +

    2. Screens and Menus

    2.1. Index

    The index is the screen that you usually see first when you start Mutt. It gives an overview over your emails in the currently opened mailbox. By default, this is your system mailbox. The information you @@ -189,10 +184,10 @@ replied to, tagged email, ...), the date when email was sent, its sender, the email size, and the subject. Additionally, the index also shows thread hierarchies: when you reply to an email, and the other -person replies back, you can see the other person's email in a +person replies back, you can see the other's person email in a "sub-tree" below. This is especially useful for personal email between a group of people or when you've subscribed to mailing lists. -

    2.2. Pager

    +

    2.2. Pager

    The pager is responsible for showing the email content. On the top of the pager you have an overview over the most important email headers like the sender, the recipient, the subject, and much more @@ -208,20 +203,20 @@ show different things in the pager with different colors. Virtually everything that can be described with a regular expression can be colored, e.g. URLs, email addresses or smileys. -

    2.3. File Browser

    +

    2.3. File Browser

    The file browser is the interface to the local or remote file system. When selecting a mailbox to open, the browser allows custom sorting of items, limiting the items shown by a regular expression and a freely adjustable format of what to display in which way. It also allows for easy navigation through the file system when selecting file(s) to attach to a message, select multiple files to attach and many more. -

    2.4. Help

    +

    2.4. Help

    The help screen is meant to offer a quick help to the user. It lists the current configuration of key bindings and their associated commands including a short description, and currently unbound functions that still need to be associated with a key binding (or alternatively, they can be called via the Mutt command prompt). -

    2.5. Compose Menu

    +

    2.5. Compose Menu

    The compose menu features a split screen containing the information which really matter before actually sending a message by mail: who gets the message as what (recipients and who gets what kind of @@ -229,14 +224,14 @@ whether to sign, encrypt or sign and encrypt a message with/for what keys. Also, it's used to attach messages, to re-edit any attachment including the message itself. -

    2.6. Alias Menu

    +

    2.6. Alias Menu

    The alias menu is used to help users finding the recipients of messages. For users who need to contact many people, there's no need to remember addresses or names completely because it allows for searching, too. The alias mechanism and thus the alias menu also features grouping several addresses by a shorter nickname, the actual alias, so that users don't have to select each single recipient manually. -

    2.7. Attachment Menu

    +

    2.7. Attachment Menu

    As will be later discussed in detail, Mutt features a good and stable MIME implementation, that is, it supports sending and receiving messages of arbitrary MIME types. The attachment menu displays a message's @@ -244,81 +239,86 @@ part (which gives a true tree structure), which type is of what type and what size. Single parts may saved, deleted or modified to offer great and easy access to message's internals. -

    3. Moving Around in Menus

    +

    3. Moving Around in Menus

    The most important navigation keys common to line- or entry-based menus -are shown in Table 2.1, “Most common navigation keys in entry-based menus” and in Table 2.2, “Most common navigation keys in page-based menus” for page-based menus. -

    Table 2.1. Most common navigation keys in entry-based menus

    KeyFunctionDescription
    j or <Down><next-entry>move to the next entry
    k or <Up><previous-entry>move to the previous entry
    z or <PageDn><page-down>go to the next page
    Z or <PageUp><page-up>go to the previous page
    = or <Home><first-entry>jump to the first entry
    * or <End><last-entry>jump to the last entry
    q<quit>exit the current menu
    ?<help>list all keybindings for the current menu

    Table 2.2. Most common navigation keys in page-based menus

    KeyFunctionDescription
    J or <Return><next-line>scroll down one line
    <Backspace><previous-line>scroll up one line
    K, <Space> or <PageDn><next-page>move to the next page
    - or <PageUp><previous-page>move the previous page
    <Home><top>move to the top
    <End><bottom>move to the bottom

    4. Editing Input Fields

    4.1. Introduction

    -Mutt has a built-in line editor for inputting text, e.g. email addresses -or filenames. The keys used to manipulate text input are very similar to -those of Emacs. See Table 2.3, “Most common line editor keys” for a full -reference of available functions, their default key bindings, and short -descriptions. +are shown in Table 2.1, “Most common navigation keys in entry-based menus” and in +Table 2.2, “Most common navigation keys in page-based menus” for page-based menus. +

    Table 2.1. Most common navigation keys in entry-based menus

    KeyFunctionDescription
    j or <Down><next-entry>move to the next entry
    k or <Up><previous-entry>move to the previous entry
    z or <PageDn><page-down>go to the next page
    Z or <PageUp><page-up>go to the previous page
    = or <Home><first-entry>jump to the first entry
    * or <End><last-entry>jump to the last entry
    q<quit>exit the current menu
    ?<help>list all keybindings for the current menu

    Table 2.2. Most common navigation keys in page-based menus

    KeyFunctionDescription
    J or <Return><next-line>scroll down one line
    <Backspace><previous-line>sroll up one line
    K, <Space> or <PageDn><next-page>move to the next page
    - or <PageUp><previous-page>move the previous page
    <Home><top>move to the top
    <End><bottom>move to the bottom

    4. Editing Input Fields

    4.1. Introduction

    +Mutt has a built-in line editor for inputting text, e.g. email +addresses or filenames. The keys used to manipulate text input are +very similar to those of Emacs. See Table 2.3, “Most common line editor keys” for a full +reference of available functions, their default key bindings, and +short descriptions.

    Table 2.3. Most common line editor keys

    KeyFunctionDescription
    ^A or <Home><bol>move to the start of the line
    ^B or <Left><backward-char>move back one char
    Esc B<backward-word>move back one word
    ^D or <Delete><delete-char>delete the char under the cursor
    ^E or <End><eol>move to the end of the line
    ^F or <Right><forward-char>move forward one char
    Esc F<forward-word>move forward one word
    <Tab><complete>complete filename or alias
    ^T<complete-query>complete address with query
    ^K<kill-eol>delete to the end of the line
    Esc d<kill-eow>delete to the end of the word
    ^W<kill-word>kill the word in front of the cursor
    ^U<kill-line>delete entire line
    ^V<quote-char>quote the next typed key
    <Up><history-up>recall previous string from history
    <Down><history-down>recall next string from history
    <BackSpace><backspace>kill the char in front of the cursor
    Esc u<upcase-word>convert word to upper case
    Esc l<downcase-word>convert word to lower case
    Esc c<capitalize-word>capitalize the word
    ^Gn/aabort
    <Return>n/afinish editing

    -You can remap the editor functions using the bind command. For example, to -make the <Delete> key delete the character in front of the cursor -rather than under, you could use: +You can remap the editor functions using the +bind command. For example, to make +the <Delete> key delete the character in front of +the cursor rather than under, you could use: 

     bind editor <delete> backspace
-

    4.2. History

    +

    4.2. History

    Mutt maintains a history for the built-in editor. The number of items -is controlled by the $history variable -and can be made persistent using an external file specified using $history_file. You may cycle through them -at an editor prompt by using the <history-up> -and/or <history-down> commands. But notice that -Mutt does not remember the currently entered text, it only cycles -through history and wraps around at the end or beginning. +is controlled by the $history +variable and can be made persistent using an external file specified +using $history_file. +You may cycle through them at an editor prompt by using the +<history-up> and/or +<history-down> commands. But notice that Mutt +does not remember the currently entered text, it only cycles through +history and wraps around at the end or beginning.

    Mutt maintains several distinct history lists, one for each of the following categories: -

    • .muttrc commands

    • addresses and aliases

    • shell commands

    • filenames

    • patterns

    • everything else

    -Mutt automatically filters out consecutively repeated items from the -history. It also mimics the behavior of some shells by ignoring items -starting with a space. The latter feature can be useful in macros to not -clobber the history's valuable entries with unwanted entries. -

    5. Reading Mail

    +

    • .muttrc commands

    • addresses and aliases

    • shell commands

    • filenames

    • patterns

    • everything else

    +Mutt automatically filters out consecutively repeated items from the history. It +also mimics the behavior of some shells by ignoring items starting +with a space. The latter feature can be useful in macros to not clobber +the history's valuable entries with unwanted entries. +

    5. Reading Mail

    Similar to many other mail clients, there are two modes in which mail is read in Mutt. The first is a list of messages in the mailbox, which is -called the “index” menu in Mutt. The second mode is the -display of the message contents. This is called the -“pager.” +called the “index” menu in Mutt. The second mode is the display of the +message contents. This is called the “pager.”

    The next few sections describe the functions provided in each of these modes. -

    5.1. The Message Index

    +

    5.1. The Message Index

    Common keys used to navigate through and manage messages in the index -are shown in Table 2.4, “Most common message index keys”. How messages are presented -in the index menu can be customized using the $index_format variable. +are shown in Table 2.4, “Most common message index keys”. How messages are presented +in the index menu can be customized using the +$index_format variable.

    Table 2.4. Most common message index keys

    KeyDescription
    cchange to a different mailbox
    Esc cchange to a folder in read-only mode
    Ccopy the current message to another mailbox
    Esc Cdecode a message and copy it to a folder
    Esc sdecode a message and save it to a folder
    Ddelete messages matching a pattern
    ddelete the current message
    Fmark as important
    lshow messages matching a pattern
    Nmark message as new
    ochange the current sort method
    Oreverse sort the mailbox
    qsave changes and exit
    ssave-message
    Ttag messages matching a pattern
    ttoggle the tag on a message
    Esc ttoggle tag on entire message thread
    Uundelete messages matching a pattern
    uundelete-message
    vview-attachments
    xabort changes and exit
    <Return>display-message
    <Tab>jump to the next new or unread message
    @show the author's full e-mail address
    $save changes to mailbox
    /search
    Esc /search-reverse
    ^Lclear and redraw the screen
    ^Tuntag messages matching a pattern

    In addition to who sent the message and the subject, a short summary of the disposition of each message is printed beside the message number. -Zero or more of the “flags” in Table 2.5, “Message status flags” may appear, some of which can be turned -on or off using these functions: <set-flag> and -<clear-flag> bound by default to -“w” and “W” respectively. -

    -Furthermore, the flags in Table 2.6, “Message recipient flags” reflect -who the message is addressed to. They can be customized with the $to_chars variable. -

    Table 2.5. Message status flags

    FlagDescription
    Dmessage is deleted (is marked for deletion)
    dmessage has attachments marked for deletion
    Kcontains a PGP public key
    Nmessage is new
    Omessage is old
    Pmessage is PGP encrypted
    rmessage has been replied to
    Smessage is signed, and the signature is successfully verified
    smessage is signed
    !message is flagged
    *message is tagged
    nthread contains new messages (only if collapsed)
    othread contains old messages (only if collapsed)

    Table 2.6. Message recipient flags

    FlagDescription
    +message is to you and you only
    Tmessage is to you, but also to or CC'ed to others
    Cmessage is CC'ed to you
    Fmessage is from you
    Lmessage is sent to a subscribed mailing list

    5.2. The Pager

    -By default, Mutt uses its built-in pager to display the contents of +Zero or more of the “flags” in Table 2.5, “Message status flags” +may appear, some of which can be turned on or off using these functions: +<set-flag> and +<clear-flag> +bound by default to “w” and “W” respectively. +

    +Furthermore, the flags in Table 2.6, “Message recipient flags” reflect +who the message is addressed to. They can be customized with the +$to_chars variable. +

    Table 2.5. Message status flags

    FlagDescription
    Dmessage is deleted (is marked for deletion)
    dmessage has attachments marked for deletion
    Kcontains a PGP public key
    Nmessage is new
    Omessage is old
    Pmessage is PGP encrypted
    rmessage has been replied to
    Smessage is signed, and the signature is successfully verified
    smessage is signed
    !message is flagged
    *message is tagged

    Table 2.6. Message recipient flags

    FlagDescription
    +message is to you and you only
    Tmessage is to you, but also to or cc'ed to others
    Cmessage is cc'ed to you
    Fmessage is from you
    Lmessage is sent to a subscribed mailing list

    5.2. The Pager

    +By default, Mutt uses its builtin pager to display the contents of messages (an external pager such as less(1) can be -configured, see $pager variable). The -pager is very similar to the Unix program less(1) +configured, see $pager variable). +The pager is very similar to the Unix program less(1) though not nearly as featureful.

    Table 2.7. Most common pager keys

    KeyDescription
    <Return>go down one line
    <Space>display the next page (or next message if at the end of a message)
    -go back to the previous page
    nsearch for next match
    Sskip beyond quoted text
    Ttoggle display of quoted text
    ?show keybindings
    /regular expression search
    Esc /backward regular expression search
    \toggle highlighting of search matches
    ^jump to the top of the message

    -In addition to key bindings in Table 2.7, “Most common pager keys”, many of -the functions from the index menu are also available in the pager, such -as <delete-message> or -<copy-message> (this is one advantage over -using an external pager to view messages). +In addition to key bindings in Table 2.7, “Most common pager keys”, +many of the functions from the index menu are also available in +the pager, such as <delete-message> or <copy-message> +(this is one advantage over using an external pager to view messages).

    Also, the internal pager supports a couple other advanced features. For -one, it will accept and translate the “standard” nroff -sequences for bold and underline. These sequences are a series of either -the letter, backspace (“^H”), the letter again for bold or -the letter, backspace, “_” for denoting underline. Mutt -will attempt to display these in bold and underline respectively if your -terminal supports them. If not, you can use the bold and underline color objects to specify a -color or mono attribute for them. +one, it will accept and translate the “standard” nroff sequences for +bold and underline. These sequences are a series of either the letter, +backspace (“^H”), the letter again for bold or the letter, backspace, +“_” for denoting underline. Mutt will attempt to display these +in bold and underline respectively if your terminal supports them. If +not, you can use the bold and underline color +objects to specify a color or mono attribute for them.

    Additionally, the internal pager supports the ANSI escape sequences for character attributes. Mutt translates them into the correct color and @@ -326,181 +326,187 @@ 

     \e[Ps;Ps;..Ps;m

    -where Ps can be one of the codes shown in Table 2.8, “ANSI escape sequences”. -

    Table 2.8. ANSI escape sequences

    Escape codeDescription
    0All attributes off
    1Bold on
    4Underline on
    5Blink on
    7Reverse video on
    3<color>Foreground color is <color> (see Table 2.9, “Color sequences”)
    4<color>Background color is <color> (see Table 2.9, “Color sequences”)

    Table 2.9. Color sequences

    Color codeColor
    0Black
    1Red
    2Green
    3Yellow
    4Blue
    5Magenta
    6Cyan
    7White

    +where Ps can be one of the codes shown in +Table 2.8, “ANSI escape sequences”. +

    Table 2.8. ANSI escape sequences

    Escape codeDescription
    0All attributes off
    1Bold on
    4Underline on
    5Blink on
    7Reverse video on
    3<color>Foreground color is <color> (see Table 2.9, “Color sequences”)
    4<color>Background color is <color> (see Table 2.9, “Color sequences”)

    Table 2.9. Color sequences

    Color codeColor
    0Black
    1Red
    2Green
    3Yellow
    4Blue
    5Magenta
    6Cyan
    7White

    Mutt uses these attributes for handling text/enriched -messages, and they can also be used by an external autoview script for highlighting purposes. -

    Note

    -If you change the colors for your display, for example by changing the -color associated with color2 for your xterm, then that color will be -used instead of green. -

    Note

    +messages, and they can also be used by an external +autoview script for highlighting +purposes. +

    Note

    +If you change the colors for your +display, for example by changing the color associated with color2 for +your xterm, then that color will be used instead of green. +

    Note

    Note that the search commands in the pager take regular expressions, -which are not quite the same as the more complex patterns used by the search command in the -index. This is because patterns are used to select messages by criteria -whereas the pager already displays a selected message. -

    5.3. Threaded Mode

    -So-called “threads” provide a hierarchy of messages where +which are not quite the same as the more +complex patterns used by the search +command in the index. This is because patterns are used to select messages by +criteria whereas the pager already displays a selected message. +

    5.3. Threaded Mode

    +So-called “threads” provide a hierarchy of messages where replies are linked to their parent message(s). This organizational form is extremely useful in mailing lists where different parts of the discussion diverge. Mutt displays threads as a tree structure.

    -In Mutt, when a mailbox is sorted +In Mutt, when a mailbox is sorted by threads, there are a few additional functions available in the index and pager modes as shown in -Table 2.10, “Most common thread mode keys”. +Table 2.10, “Most common thread mode keys”.

    Table 2.10. Most common thread mode keys

    KeyFunctionDescription
    ^D<delete-thread>delete all messages in the current thread
    ^U<undelete-thread>undelete all messages in the current thread
    ^N<next-thread>jump to the start of the next thread
    ^P<previous-thread>jump to the start of the previous thread
    ^R<read-thread>mark the current thread as read
    Esc d<delete-subthread>delete all messages in the current subthread
    Esc u<undelete-subthread>undelete all messages in the current subthread
    Esc n<next-subthread>jump to the start of the next subthread
    Esc p<previous-subthread>jump to the start of the previous subthread
    Esc r<read-subthread>mark the current subthread as read
    Esc t<tag-thread>toggle the tag on the current thread
    Esc v<collapse-thread>toggle collapse for the current thread
    Esc V<collapse-all>toggle collapse for all threads
    P<parent-message>jump to parent message in thread

    -Collapsing a thread displays only the first message in the thread and -hides the others. This is useful when threads contain so many messages -that you can only see a handful of threads on the screen. See %M in -$index_format. For example, you -could use “%?M?(#%03M)&(%4l)?” in $index_format to optionally display the -number of hidden messages if the thread is collapsed. The -%?<char>?<if-part>&<else-part>? -syntax is explained in detail in format string conditionals. +Collapsing a thread displays only the first message +in the thread and hides the others. This is useful when threads +contain so many messages that you can only see a handful of threads on +the screen. See %M in $index_format. +For example, you could use “%?M?(#%03M)&(%4l)?” in $index_format to optionally +display the number of hidden messages if the thread is +collapsed. The %?<char>?<if-part>&<else-part>? +syntax is explained in detail in +format string conditionals.

    Technically, every reply should contain a list of its parent messages in the thread tree, but not all do. In these cases, Mutt groups them by -subject which can be controlled using the $strict_threads variable. -

    5.4. Miscellaneous Functions

    -In addition, the index and -pager menus have these interesting functions: +subject which can be controlled using the +$strict_threads variable. +

    5.4. Miscellaneous Functions

    +In addition, the index and pager +menus have these interesting functions:

    -<create-alias> -(default: a) +<create-alias> (default: a)

    -Creates a new alias based upon the current message (or prompts for a new -one). Once editing is complete, an alias command is added to the -file specified by the $alias_file -variable for future use -

    Note

    -Mutt does not read the $alias_file -upon startup so you must explicitly source the file. +Creates a new alias based upon the current message (or prompts for a +new one). Once editing is complete, an alias +command is added to the file specified by +the $alias_file variable +for future use +

    Note

    +Mutt does not read the $alias_file +upon startup so you must explicitly source the file.

    <check-traditional-pgp> (default: Esc P)

    This function will search the current message for content signed or -encrypted with PGP the “traditional” way, that is, without -proper MIME tagging. Technically, this function will temporarily change -the MIME content types of the body parts containing PGP data; this is -similar to the <edit-type> -function's effect. +encrypted with PGP the “traditional” way, that is, without proper +MIME tagging. Technically, this function will temporarily change +the MIME content types of the body parts containing PGP data; this +is similar to the <edit-type> function's +effect.

    <edit> (default: e)

    -This command (available in the index and pager) allows you to edit the -raw current message as it's present in the mail folder. After you have -finished editing, the changed message will be appended to the current -folder, and the original message will be marked for deletion; if the -message is unchanged it won't be replaced. +This command (available in the index and pager) allows you to +edit the raw current message as it's present in the mail folder. +After you have finished editing, the changed message will be +appended to the current folder, and the original message will be +marked for deletion; if the message is unchanged it won't be replaced.

    <edit-type> (default: -^E on the attachment menu, and in the pager and index menus; ^T on the -compose menu) +^E on the attachment menu, and in the pager and index menus; +^T on the compose menu)

    -This command is used to temporarily edit an attachment's content type to -fix, for instance, bogus character set parameters. When invoked from -the index or from the pager, you'll have the opportunity to edit the -top-level attachment's content type. On the attachment menu, you can change any +This command is used to temporarily edit an attachment's content +type to fix, for instance, bogus character set parameters. When +invoked from the index or from the pager, you'll have the +opportunity to edit the top-level attachment's content type. On the +attachment menu, you can change any attachment's content type. These changes are not persistent, and get lost upon changing folders.

    -Note that this command is also available on the compose menu. There, it's used to -fine-tune the properties of attachments you are going to send. +Note that this command is also available on the compose +menu. There, it's used to fine-tune the properties of attachments you are going +to send.

    -<enter-command> -(default: “:”) +<enter-command> (default: “:”)

    This command is used to execute any command you would normally put in a -configuration file. A common use is to check the settings of variables, -or in conjunction with macros to change -settings on the fly. +configuration file. A common use is to check the settings of variables, or +in conjunction with macros to change settings on the +fly.

    -<extract-keys> -(default: ^K) +<extract-keys> (default: ^K)

    This command extracts PGP public keys from the current or tagged message(s) and adds them to your PGP public key ring.

    -<forget-passphrase> (default: ^F) +<forget-passphrase> (default: +^F)

    -This command wipes the passphrase(s) from memory. It is useful, if you -misspelled the passphrase. +This command wipes the passphrase(s) from memory. It is useful, if +you misspelled the passphrase.

    -<list-reply> (default: -L) +<list-reply> (default: L)

    -Reply to the current or tagged message(s) by extracting any addresses -which match the regular expressions given by the lists or -subscribe commands, but also honor any -Mail-Followup-To header(s) if the $honor_followup_to configuration -variable is set. Using this when replying to messages posted to mailing -lists helps avoid duplicate copies being sent to the author of the -message you are replying to. +Reply to the current or tagged message(s) by extracting any addresses which +match the regular expressions given by the lists or subscribe +commands, but also honor any Mail-Followup-To header(s) if the +$honor_followup_to +configuration variable is set. Using this when replying to messages posted +to mailing lists helps avoid duplicate copies being sent to the author of +the message you are replying to.

    -<pipe-message> -(default: |) +<pipe-message> (default: |)

    -Asks for an external Unix command and pipes the current or tagged -message(s) to it. The variables $pipe_decode, $pipe_split, $pipe_sep and $wait_key control the exact behavior of this -function. +Asks for an external Unix command and pipes the current or +tagged message(s) to it. The variables $pipe_decode, $pipe_split, +$pipe_sep and $wait_key control the exact behavior of this function.

    -<resend-message> -(default: Esc e) +<resend-message> (default: Esc e)

    -Mutt takes the current message as a template for a new message. This -function is best described as "recall from arbitrary folders". It can -conveniently be used to forward MIME messages while preserving the -original mail structure. Note that the amount of headers included here -depends on the value of the $weed variable. +Mutt takes the current message as a template for a +new message. This function is best described as "recall from arbitrary +folders". It can conveniently be used to forward MIME messages while +preserving the original mail structure. Note that the amount of headers +included here depends on the value of the $weed +variable.

    -This function is also available from the attachment menu. You can use -this to easily resend a message which was included with a bounce message +This function is also available from the attachment menu. You can use this +to easily resend a message which was included with a bounce message as a message/rfc822 body part.

    -<shell-escape> -(default: !) +<shell-escape> (default: !)

    -Asks for an external Unix command and executes it. The $wait_key can be used to control whether Mutt -will wait for a key to be pressed when the command returns (presumably -to let the user read the output of the command), based on the return -status of the named command. If no command is given, an interactive -shell is executed. +Asks for an external Unix command and executes it. The $wait_key can be used to control +whether Mutt will wait for a key to be pressed when the command returns +(presumably to let the user read the output of the command), based on +the return status of the named command. If no command is given, an +interactive shell is executed.

    -<toggle-quoted> -(default: T) +<toggle-quoted> (default: T)

    -The pager uses the $quote_regexp -variable to detect quoted text when displaying the body of the message. -This function toggles the display of the quoted material in the message. -It is particularly useful when being interested in just the response and -there is a large amount of quoted text in the way. +The pager uses the $quote_regexp variable to detect quoted text when +displaying the body of the message. This function toggles the display +of the quoted material in the message. It is particularly useful when +being interested in just the response and there is a large amount of +quoted text in the way.

    -<skip-quoted> -(default: S) +<skip-quoted> (default: S)

    This function will go to the next line of non-quoted text which comes after a line of quoted text in the internal pager. -

    6. Sending Mail

    6.1. Introduction

    -The bindings shown in Table 2.11, “Most common mail sending keys” are available in -the index and pager to start a -new message. +

    6. Sending Mail

    6.1. Introduction

    +The bindings shown in Table 2.11, “Most common mail sending keys” are available in the +index and pager to start a new message.

    Table 2.11. Most common mail sending keys

    KeyFunctionDescription
    m<compose>compose a new message
    r<reply>reply to sender
    g<group-reply>reply to all recipients
    L<list-reply>reply to mailing list address
    f<forward>forward message
    b<bounce>bounce (remail) message
    Esc k<mail-key>mail a PGP public key to someone

    -Bouncing a message sends the message as-is to the -recipient you specify. Forwarding a message allows -you to add comments or modify the message you are forwarding. These -items are discussed in greater detail in the next section “Forwarding and Bouncing Mail.” -

    -Mutt will then enter the compose menu and prompt -you for the recipients to place on the “To:” header field -when you hit m to start a new message. Next, it will -ask you for the “Subject:” field for the message, providing -a default if you are replying to or forwarding a message. You again have -the chance to adjust recipients, subject, and security settings right -before actually sending the message. See also $askcc, $askbcc, -$autoedit, $bounce, $fast_reply, and $include for changing how and if Mutt asks -these questions. +Bouncing a message sends the message as-is to the recipient you +specify. Forwarding a message allows you to add comments or +modify the message you are forwarding. These items are discussed +in greater detail in the next section “Forwarding +and Bouncing Mail.” +

    +Mutt will then enter the compose menu and prompt you for the +recipients to place on the “To:” header field when you hit m to start a new message. Next, it will ask +you for the “Subject:” field for the message, providing a default if +you are replying to or forwarding a message. You again +have the chance to adjust recipients, subject, and security settings +right before actually sending the message. See also +$askcc, +$askbcc, +$autoedit, +$bounce, +$fast_reply, +and $include +for changing how and if Mutt asks these questions.

    When replying, Mutt fills these fields with proper values depending on the reply type. The types of replying supported are: @@ -508,167 +514,156 @@ Reply to the author directly.

    Group reply

    Reply to the author as well to all recipients except you; this consults -alternates. +alternates.

    List reply

    Reply to all mailing list addresses found, either specified via -configuration or auto-detected. See Section 12, “Mailing Lists” for +configuration or auto-detected. See Section 12, “Mailing Lists” for details.

    After getting recipients for new messages, forwards or replies, Mutt -will then automatically start your $editor -on the message body. If the $edit_headers variable is set, the headers -will be at the top of the message in your editor. Any messages you are -replying to will be added in sort order to the message, with appropriate -$attribution, $indent_string and $post_indent_string. When -forwarding a message, if the $mime_forward variable is unset, a copy of -the forwarded message will be included. If you have specified a $signature, it will be appended to the -message. +will then automatically start your $editor on the message body. If the $edit_headers variable is +set, the headers will be at the top of the message in your editor. Any +messages you are replying to will be added in sort order to the message, +with appropriate $attribution, +$indent_string and +$post_indent_string. +When forwarding a message, if the $mime_forward variable is +unset, a copy of the forwarded message will be included. If you have +specified a $signature, it will +be appended to the message.

    Once you have finished editing the body of your mail message, you are -returned to the compose menu providing the -functions shown in Table 2.12, “Most common compose menu keys” to modify, send or -postpone the message. -

    Table 2.12. Most common compose menu keys

    KeyFunctionDescription
    a<attach-file>attach a file
    A<attach-message>attach message(s) to the message
    Esc k<attach-key>attach a PGP public key
    d<edit-description>edit description on attachment
    D<detach-file>detach a file
    t<edit-to>edit the To field
    Esc f<edit-from>edit the From field
    r<edit-reply-to>edit the Reply-To field
    c<edit-cc>edit the Cc field
    b<edit-bcc>edit the Bcc field
    y<send-message>send the message
    s<edit-subject>edit the Subject
    S<smime-menu>select S/MIME options
    f<edit-fcc>specify an “Fcc” mailbox
    p<pgp-menu>select PGP options
    P<postpone-message>postpone this message until later
    q<quit>quit (abort) sending the message
    w<write-fcc>write the message to a folder
    i<ispell>check spelling (if available on your system)
    ^F<forget-passphrase>wipe passphrase(s) from memory

    -The compose menu is also used to edit the attachments for a message -which can be either files or other messages. The -<attach-message> function to will prompt you -for a folder to attach messages from. You can now tag messages in that -folder and they will be attached to the message you are sending. -

    Note

    -Note that certain operations like composing a new mail, replying, -forwarding, etc. are not permitted when you are in that folder. The %r -in $status_format will change to a -“A” to indicate that you are in attach-message mode. -

    6.2. Editing the Message Header

    -When editing the header because of $edit_headers being set, there are a -several pseudo headers available which will not be included in sent -messages but trigger special Mutt behavior. -

    6.2.1. Fcc: Pseudo Header

    +returned to the compose menu providing the functions +shown in Table 2.12, “Most common compose menu keys” to modify, send or postpone the +message. +

    Table 2.12. Most common compose menu keys

    KeyFunctionDescription
    a<attach-file>attach a file
    A<attach-message>attach message(s) to the message
    Esc k<attach-key>attach a PGP public key
    d<edit-description>edit description on attachment
    D<detach-file>detach a file
    t<edit-to>edit the To field
    Esc f<edit-from>edit the From field
    r<edit-reply-to>edit the Reply-To field
    c<edit-cc>edit the Cc field
    b<edit-bcc>edit the Bcc field
    y<send-message>send the message
    s<edit-subject>edit the Subject
    S<smime-menu>select S/MIME options
    f<edit-fcc>specify an “Fcc” mailbox
    p<pgp-menu>select PGP options
    P<postpone-message>postpone this message until later
    q<quit>quit (abort) sending the message
    w<write-fcc>write the message to a folder
    i<ispell>check spelling (if available on your system)
    ^F<forget-passphrase>wipe passphrase(s) from memory

    +The compose menu is also used to edit the attachments for a message which can be either files +or other messages. The <attach-message> function to will prompt you for a folder to +attach messages from. You can now tag messages in that folder and they +will be attached to the message you are sending. +

    Note

    +Note that certain +operations like composing a new mail, replying, forwarding, etc. are +not permitted when you are in that folder. The %r in +$status_format will change to +a “A” to indicate that you are in attach-message mode. +

    6.2. Editing the Message Header

    +When editing the header because of $edit_headers +being set, there are a several pseudo headers available which +will not be included in sent messages but trigger special Mutt behavior. +

    6.2.1. Fcc: Pseudo Header

    If you specify

    Fcc: filename

    -as a header, Mutt will pick up filename just as if -you had used the <edit-fcc> function in the -compose menu. It can later be changed from the -compose menu. -

    6.2.2. Attach: Pseudo Header

    +as a header, Mutt will pick up filename +just as if you had used the <edit-fcc> function in the compose menu. +It can later be changed from the compose menu. +

    6.2.2. Attach: Pseudo Header

    You can also attach files to your message by specifying

    Attach: filename [ description ]

    -where filename is the file to attach and -description is an optional string to use as the -description of the attached file. Spaces in filenames have to be escaped -using backslash (“\”). The file can be removed as well as -more added from the compose menu. -

    6.2.3. Pgp: Pseudo Header

    +where filename is the file to attach and description is an +optional string to use as the description of the attached file. Spaces +in filenames have to be escaped using backslash (“\”). +The file can be removed as well as more added from the compose menu. +

    6.2.3. Pgp: Pseudo Header

    If you want to use PGP, you can specify

    Pgp: [ E | S | S<id> ]

    -“E” selects encryption, “S” selects signing -and “S<id>” selects signing with the given key, -setting $pgp_sign_as permanently. The -selection can later be changed in the compose menu. -

    6.2.4. In-Reply-To: Header

    -When replying to messages, the In-Reply-To: header -contains the Message-Id of the message(s) you reply to. If you remove or -modify its value, Mutt will not generate a -References: field, which allows you to create a new -message thread, for example to create a new message to a mailing list -without having to enter the mailing list's address. -

    -If you intend to start a new thread by replying, please make really sure -you remove the In-Reply-To: header in your -editor. Otherwise, though you'll produce a technically valid reply, some -netiquette guardians will be annoyed by this so-called “thread -hijacking”. -

    6.3. Sending Cryptographically Signed/Encrypted Messages

    -If you have told Mutt to PGP or S/MIME encrypt a message, it will guide -you through a key selection process when you try to send the message. -Mutt will not ask you any questions about keys which have a certified -user ID matching one of the message recipients' mail addresses. -However, there may be situations in which there are several keys, weakly -certified user ID fields, or where no matching keys can be found. +“E” selects encryption, “S” selects signing and +“S<id>” selects signing with the given key, setting +$pgp_sign_as +permanently. The selection can later be changed in the compose menu. +

    6.2.4. In-Reply-To: Header

    +When replying to messages, the In-Reply-To: header contains the +Message-Id of the message(s) you reply to. If you remove or modify its value, Mutt will not generate a +References: field, which allows you to create a new message thread, for example +to create a new message to a mailing list without having to enter the mailing list's address. +

    6.3. Sending Cryptographically Signed/Encrypted Messages

    +If you have told Mutt to PGP or S/MIME encrypt a message, it will guide you +through a key selection process when you try to send the message. +Mutt will not ask you any questions about keys which have a +certified user ID matching one of the message recipients' mail +addresses. However, there may be situations in which there are +several keys, weakly certified user ID fields, or where no matching +keys can be found.

    In these cases, you are dropped into a menu with a list of keys from -which you can select one. When you quit this menu, or Mutt can't find -any matching keys, you are prompted for a user ID. You can, as usually, -abort this prompt using ^G. When you do so, Mutt -will return to the compose screen. -

    -Once you have successfully finished the key selection, the message will -be encrypted using the selected public keys when sent out. -

    -Most fields of the entries in the key selection menu (see also $pgp_entry_format) have obvious -meanings. But some explanations on the capabilities, flags, and -validity fields are in order. +which you can select one. When you quit this menu, or Mutt can't +find any matching keys, you are prompted for a user ID. You can, as +usually, abort this prompt using ^G. When you do so, Mutt will +return to the compose screen. +

    +Once you have successfully finished the key selection, the message +will be encrypted using the selected public keys when sent out. +

    +Most fields of the entries in the key selection menu (see also $pgp_entry_format) +have obvious meanings. But some explanations on the capabilities, flags, +and validity fields are in order.

    -The flags sequence (“%f”) will expand to one of the flags -in Table 2.13, “PGP key menu flags”. +The flags sequence (“%f”) will expand to one of the flags in +Table 2.13, “PGP key menu flags”.

    Table 2.13. PGP key menu flags

    FlagDescription
    RThe key has been revoked and can't be used.
    XThe key is expired and can't be used.
    dYou have marked the key as disabled.
    cThere are unknown critical self-signature packets.

    -The capabilities field (“%c”) expands to a two-character -sequence representing a key's capabilities. The first character gives -the key's encryption capabilities: A minus sign (“-”) means -that the key cannot be used for encryption. A dot (“.”) -means that it's marked as a signature key in one of the user IDs, but -may also be used for encryption. The letter “e” indicates -that this key can be used for encryption. +The capabilities field (“%c”) expands to a two-character sequence +representing a key's capabilities. The first character gives +the key's encryption capabilities: A minus sign (“-”) means +that the key cannot be used for encryption. A dot (“.”) means that +it's marked as a signature key in one of the user IDs, but may +also be used for encryption. The letter “e” indicates that +this key can be used for encryption.

    The second character indicates the key's signing capabilities. Once -again, a “-” implies “not for signing”, -“.” implies that the key is marked as an encryption key in -one of the user-ids, and “s” denotes a key which can be -used for signing. -

    -Finally, the validity field (“%t”) indicates how -well-certified a user-id is. A question mark (“?”) -indicates undefined validity, a minus character (“-”) marks -an untrusted association, a space character means a partially trusted -association, and a plus character (“+”) indicates complete -validity. -

    6.4. Sending Format=Flowed Messages

    6.4.1. Concept

    -format=flowed-style messages (or -f=f for short) are text/plain -messages that consist of paragraphs which a receiver's mail client may -reformat to its own needs which mostly means to customize line lengths -regardless of what the sender sent. Technically this is achieved by -letting lines of a “flowable” paragraph end in spaces +again, a “-” implies “not for signing”, “.” implies +that the key is marked as an encryption key in one of the user-ids, and +“s” denotes a key which can be used for signing. +

    +Finally, the validity field (“%t”) indicates how well-certified a user-id +is. A question mark (“?”) indicates undefined validity, a minus +character (“-”) marks an untrusted association, a space character +means a partially trusted association, and a plus character (“+”) +indicates complete validity. +

    6.4. Sending Format=Flowed Messages

    6.4.1. Concept

    +format=flowed-style messages (or f=f +for short) are text/plain messages that consist of paragraphs which a receiver's +mail client may reformat to its own needs which mostly means to +customize line lengths regardless of what the sender sent. Technically this is +achieved by letting lines of a “flowable” paragraph end in spaces except for the last line.

    While for text-mode clients like Mutt it's the best way to assume only a standard 80x25 character cell terminal, it may be desired to let the receiver decide completely how to view a message. -

    6.4.2. Mutt Support

    +

    6.4.2. Mutt Support

    Mutt only supports setting the required format=flowed -MIME parameter on outgoing messages if the $text_flowed variable is set, specifically -it does not add the trailing spaces. +MIME parameter on outgoing messages if the $text_flowed +variable is set, specifically it does not add the +trailing spaces.

    -After editing the initial message text and before entering the compose -menu, Mutt properly space-stuffs the message. +After editing the initial message text and before entering +the compose menu, Mutt properly space-stuffes the message. Space-stuffing is required by RfC3676 defining format=flowed and means to prepend a space to: -

    • all lines starting with a space

    • lines starting with the word -“From” followed by -space

    • all lines starting with -“>” which is not intended to be a -quote character

    Note

    -Mutt only supports space-stuffing for the first two types of lines but -not for the third: It is impossible to safely detect whether a leading -> character starts a quote or not. Furthermore, -Mutt only applies space-stuffing once after the -initial edit is finished. +

    • all lines starting with a space

    • lines starting with the word “From” +followed by space

    • all lines starting with “>” which +is not intended to be a quote character

    Note

    +Mutt only supports space-stuffing +for the first two types of lines but not for the third: It is impossible to +safely detect whether a leading > character starts a +quote or not. Furthermore, Mutt only applies space-stuffing +once after the initial edit is finished.

    -All leading spaces are to be removed by receiving clients to restore the -original message prior to further processing. -

    6.4.3. Editor Considerations

    -As Mutt provides no additional features to compose -f=f messages, it's completely up to the user and his -editor to produce proper messages. Please consider your editor's -documentation if you intend to send f=f messages. +All leading spaces are to be removed by receiving clients to restore +the original message prior to further processing. +

    6.4.3. Editor Considerations

    +As Mutt provides no additional features to compose f=f +messages, it's completely up to the user and his editor to produce +proper messages. Please consider your editor's documentation if you +intend to send f=f messages.

    Please note that when editing messages from the compose menu several times before really sending a mail, it's up to the user to ensure that @@ -678,120 +673,113 @@ flag for its formatoptions setting to assist in creating f=f messages, see :help fo-table for details. -

    7. Forwarding and Bouncing Mail

    +

    7. Forwarding and Bouncing Mail

    Bouncing and forwarding let you send an existing message to recipients that you specify. Bouncing a message sends a verbatim copy of a message to alternative addresses as if they were the message's original -recipients specified in the Bcc header. Forwarding a message, on the -other hand, allows you to modify the message before it is resent (for -example, by adding your own comments). Bouncing is done using the -<bounce> function and forwarding using the -<forward> function bound to “b” -and “f” respectively. +recipients specified in the Bcc header. +Forwarding a message, on the other hand, allows you to modify the message +before it is resent (for example, by adding your own comments). Bouncing +is done using the <bounce> function and forwarding +using the <forward> function bound to “b” and “f” +respectively.

    Forwarding can be done by including the original message in the new -message's body (surrounded by indicating lines) or including it as a -MIME attachment, depending on the value of the $mime_forward variable. Decoding of -attachments, like in the pager, can be controlled by the $forward_decode and $mime_forward_decode variables, +message's body (surrounded by indicating lines) or including it as a MIME +attachment, depending on the value of the $mime_forward variable. Decoding of attachments, +like in the pager, can be controlled by the $forward_decode and $mime_forward_decode variables, respectively. The desired forwarding format may depend on the content, -therefore $mime_forward is a -quadoption which, for example, can be set to “ask-no”. +therefore $mime_forward is a quadoption which, for +example, can be set to “ask-no”.

    The inclusion of headers is controlled by the current setting of the -$weed variable, unless $mime_forward is set. +$weed variable, unless $mime_forward is set.

    Editing the message to forward follows the same procedure as sending or replying to a message does. -

    8. Postponing Mail

    +

    8. Postponing Mail

    At times it is desirable to delay sending a message that you have -already begun to compose. When the -<postpone-message> function is used in the -compose menu, the body of your message and -attachments are stored in the mailbox specified by the $postponed variable. This means that you can -recall the message even if you exit Mutt and then restart it at a later -time. -

    -Once a message is postponed, there are several ways to resume it. From -the command line you can use the “-p” option, or if you -compose a new message from the index or -pager you will be prompted if postponed messages -exist. If multiple messages are currently postponed, the -postponed menu will pop up and you can select which -message you would like to resume. -

    Note

    -If you postpone a reply to a message, the reply setting of the message -is only updated when you actually finish the message and send it. Also, -you must be in the same folder with the message you replied to for the -status of the message to be updated. +already begun to compose. When the <postpone-message> function is +used in the compose menu, the body of your message and attachments +are stored in the mailbox specified by the $postponed variable. This means that you can recall the +message even if you exit Mutt and then restart it at a later time. +

    +Once a message is postponed, there are several ways to resume it. From the +command line you can use the “-p” option, or if you compose a new +message from the index or pager you will be prompted if postponed +messages exist. If multiple messages are currently postponed, the +postponed menu will pop up and you can select which message you would +like to resume. +

    Note

    +If you postpone a reply to a message, the reply setting of +the message is only updated when you actually finish the message and +send it. Also, you must be in the same folder with the message you +replied to for the status of the message to be updated.

    -See also the $postpone quad-option. -

    Chapter 3. Configuration

    Table of Contents

    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Header Display
    10.2. Selecting Headers
    10.3. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    26.4. Type Conversions
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding

    1. Location of Initialization Files

    -While the default configuration (or “preferences”) make -Mutt usable right out of the box, it is often desirable to tailor Mutt -to suit your own tastes. When Mutt is first invoked, it will attempt to -read the “system” configuration file (defaults set by your -local system administrator), unless the “-n” command line option is specified. This -file is typically /usr/local/share/mutt/Muttrc or -/etc/Muttrc. Mutt will next look for a file named -.muttrc in your home directory. If this file does -not exist and your home directory has a subdirectory named -.mutt, Mutt tries to load a file named +See also the $postpone quad-option. +

    Chapter 3. Configuration

    Table of Contents

    1. Location of Initialization Files
    2. Syntax of Initialization Files
    3. Address Groups
    4. Defining/Using Aliases
    5. Changing the Default Key Bindings
    6. Defining Aliases for Character Sets
    7. Setting Variables Based Upon Mailbox
    8. Keyboard Macros
    9. Using Color and Mono Video Attributes
    10. Message Header Display
    10.1. Selecting Headers
    10.2. Ordering Displayed Headers
    11. Alternative Addresses
    12. Mailing Lists
    13. Using Multiple Spool Mailboxes
    14. Monitoring Incoming Mail
    15. User-Defined Headers
    16. Specify Default Save Mailbox
    17. Specify Default Fcc: Mailbox When Composing
    18. Specify Default Save Filename and Default Fcc: Mailbox at Once
    19. Change Settings Based Upon Message Recipients
    20. Change Settings Before Formatting a Message
    21. Choosing the Cryptographic Key of the Recipient
    22. Adding Key Sequences to the Keyboard Buffer
    23. Executing Functions
    24. Message Scoring
    25. Spam Detection
    26. Setting and Querying Variables
    26.1. Variable Types
    26.2. Commands
    26.3. User-Defined Variables
    27. Reading Initialization Commands From Another File
    28. Removing Hooks
    29. Format Strings
    29.1. Basic usage
    29.2. Conditionals
    29.3. Filters
    29.4. Padding

    1. Location of Initialization Files

    +While the default configuration (or “preferences”) make Mutt +usable right out of the box, it is often desirable to tailor Mutt to +suit your own tastes. When Mutt is first invoked, it will attempt to +read the “system” configuration file (defaults set by your local +system administrator), unless the “-n” command line option is specified. This file is typically +/usr/local/share/mutt/Muttrc or /etc/Muttrc. Mutt +will next look for a file named .muttrc in your home +directory. If this file does not exist and your home directory has +a subdirectory named .mutt, Mutt tries to load a file named .mutt/muttrc.

    -.muttrc is the file where you will usually place your -commands to configure Mutt. +.muttrc is the file where you will usually place your commands to configure Mutt.

    In addition, Mutt supports version specific configuration files that are -parsed instead of the default files as explained above. For instance, -if your system has a Muttrc-0.88 file in the system -configuration directory, and you are running version 0.88 of Mutt, this -file will be sourced instead of the Muttrc file. The -same is true of the user configuration file, if you have a file -.muttrc-0.88.6 in your home directory, when you run -Mutt version 0.88.6, it will source this file instead of the default -.muttrc file. The version number is the same which -is visible using the “-v” command line switch or using the -show-version key (default: V) from the index menu. -

    2. Syntax of Initialization Files

    -An initialization file consists of a series of commands. Each line of the file may contain -one or more commands. When multiple commands are used, they must be -separated by a semicolon (“;”). +parsed instead of the default files as explained above. For instance, if +your system has a Muttrc-0.88 file in the system configuration +directory, and you are running version 0.88 of Mutt, this file will be +sourced instead of the Muttrc file. The same is true of the user +configuration file, if you have a file .muttrc-0.88.6 in your home +directory, when you run Mutt version 0.88.6, it will source this file +instead of the default .muttrc file. The version number is the +same which is visible using the “-v” command line switch or using the show-version key (default: +V) from the index menu. +

    2. Syntax of Initialization Files

    +An initialization file consists of a series of commands. Each line of the file may contain one or more commands. +When multiple commands are used, they must be separated by a semicolon +(“;”).

    Example 3.1. Multiple configuration commands per line

     set realname='Mutt user' ; ignore x-

    -The hash mark, or pound sign (“#”), is used as a -“comment” character. You can use it to annotate your -initialization file. All text after the comment character to the end of -the line is ignored. +The hash mark, or pound sign +(“#”), is used as a “comment” character. You can use it to +annotate your initialization file. All text after the comment character +to the end of the line is ignored.

    Example 3.2. Commenting configuration files

    -my_hdr X-Disclaimer: Why are you listening to me? # This is a comment
+my_hdr X-Disclaimer: Why are you listening to me? # This is a comment

    -Single quotes (“'”) and double quotes (“"”) -can be used to quote strings which contain spaces or other special -characters. The difference between the two types of quotes is similar -to that of many popular shell programs, namely that a single quote is -used to specify a literal string (one that is not interpreted for shell -variables or quoting with a backslash [see next paragraph]), while -double quotes indicate a string for which should be evaluated. For -example, backticks are evaluated inside of double quotes, but -not for single quotes. -

    -“\” quotes the next character, just as in shells such as -bash and zsh. For example, if want to put quotes “"” -inside of a string, you can use “\” to force the next -character to be a literal instead of interpreted character. -

    Example 3.3. Escaping quotes in configuration files

    +Single quotes (“'”) and double quotes (“"”) can be used to quote strings
+which contain spaces or other special characters.  The difference between
+the two types of quotes is similar to that of many popular shell programs,
+namely that a single quote is used to specify a literal string (one that is
+not interpreted for shell variables or quoting with a backslash [see
+next paragraph]), while double quotes indicate a string for which
+should be evaluated.  For example, backticks are evaluated inside of double
+quotes, but not for single quotes.
+
    
+“\” quotes the next character, just as in shells such as bash and zsh.
+For example, if want to put quotes “"” inside of a string, you can use
+“\” to force the next character to be a literal instead of interpreted
+character.
+
    Example 3.3. Escaping quotes in congfiguration files
     set realname="Michael \"MuttDude\" Elkins"
 

    
-“\\” means to insert a literal “\” into the line.
-“\n” and “\r” have their usual C meanings of linefeed and
+“\\” means to insert a literal “\” into the line.
+“\n” and “\r” have their usual C meanings of linefeed and
 carriage-return, respectively.
 
    
-A “\” at the end of a line can be used to split commands
-over multiple lines as it “escapes” the line end, provided
-that the split points don't appear in the middle of command names. Lines
-are first concatenated before interpretation so that a multi-line can be
-commented by commenting out the first line only.
+A “\” at the end of a line can be used to split commands over
+multiple lines as it “escapes” the line end, provided that the split points don't appear in the
+middle of command names. Lines are first concatenated before
+interpretation so that a multi-line can be commented by commenting out
+the first line only.
 
    Example 3.4. Splitting long configuration commands over several lines
     set status_format="some very \
 long value split \
@@ -799,52 +787,53 @@
 

    
 It is also possible to substitute the output of a Unix command in an
 initialization file.  This is accomplished by enclosing the command in
-backticks (``). In Example 3.5, “Using external command's output in configuration files”, the output of the
-Unix command “uname -a” will be substituted before the line
-is parsed.  Since initialization files are line oriented, only the first
-line of output from the Unix command will be substituted.
+backticks (``). In Example 3.5, “Using external command's output in configuration files”, the output of the
+Unix command “uname -a” will be substituted before the
+line is parsed.
+Since initialization files are line oriented, only
+the first line of output from the Unix command will be substituted.
 
    Example 3.5. Using external command's output in configuration files
     my_hdr X-Operating-System: `uname -a`
 

    
 Both environment variables and Mutt variables can be accessed by
-prepending “$” to the name of the variable. For example,
+prepending “$” to the name of the variable. For example,
 
    Example 3.6. Using environment variables in configuration files
     set record=+sent_on_$HOSTNAME
 

    
 will cause Mutt to save outgoing messages to a folder named
-“sent_on_kremvax” if the environment variable
-$HOSTNAME is set to “kremvax.” (See
-$record for details.)
+“sent_on_kremvax” if the environment variable $HOSTNAME is set to
+“kremvax.” (See $record for
+details.)
 
    
 Mutt expands the variable when it is assigned, not when it is used. If
-the value of a variable on the right-hand side of an assignment changes
-after the assignment, the variable on the left-hand side will not be
-affected.
+the value of a variable on the right-hand side of an assignment
+changes after the assignment, the variable on the left-hand side will
+not be affected.
 
    
 The commands understood by Mutt are explained in the next paragraphs.
-For a complete list, see the command
-reference.
+For a complete list, see the command reference.
 
    
 All configuration files are expected to be in the current locale as
-specified by the $charset variable which
-doesn't have a default value since it's determined by Mutt at startup.
+specified by the $charset variable
+which doesn't have a default value since it's determined by Mutt at startup.
 If a configuration file is not encoded in the same character set the
-$config_charset variable should be
-used: all lines starting with the next are recoded from $config_charset to $charset.
-
    
-This mechanism should be avoided if possible as it has the following
-implications:
-
    • These variables should be set early in a configuration
-file with $charset preceding $config_charset so Mutt knows what
-character set to convert to.
    • If $config_charset
-is set, it should be set in each configuration file because the value is
-global and not per configuration
-file.
    • Because Mutt first recodes a line before it attempts to
-parse it, a conversion introducing question marks or other characters as
-part of errors (unconvertable characters, transliteration) may introduce
-syntax errors or silently change the meaning of certain tokens
-(e.g. inserting question marks into regular
-expressions).

    3. Address Groups

    Usage:

    group [ +$config_charset +variable should be used: all lines starting with the next are recoded +from $config_charset +to $charset. +

    +This mechanism should be avoided if possible as it has the +following implications: +

    • These variables should be set early in a configuration +file with $charset preceding +$config_charset so Mutt +knows what character set to convert to.

    • If $config_charset is set, it should be set +in each configuration file because the value is global and not +per configuration file.

    • Because Mutt first recodes a line before it attempts to parse it, +a conversion introducing question marks or other characters as +part of errors (unconvertable characters, transliteration) may introduce syntax +errors or silently change the meaning of certain tokens (e.g. inserting +question marks into regular expressions).

    3. Address Groups

    Usage:

    group [ -group name ...] { @@ -865,51 +854,30 @@ -addr expr ... }

    -Mutt supports grouping addresses logically into named groups. An address -or address pattern can appear in several groups at the same time. These -groups can be used in patterns (for searching, limiting and tagging) and -in hooks by using group patterns. This can be useful to classify mail -and take certain actions depending on in what groups the message is. -For example, the mutt user's mailing list would fit into the categories -“mailing list” and “mutt-related”. Using send-hook, the sender can -be set to a dedicated one for writing mailing list messages, and the -signature could be set to a mutt-related one for writing to a mutt list -— for other lists, the list sender setting still applies but a -different signature can be selected. Or, given a group only containing -recipients known to accept encrypted mail, -“auto-encryption” can be achieved easily. -

    -The group command is used to directly add either -addresses or regular expressions to the specified group or groups. The -different categories of arguments to the group -command can be in any order. The flags -rx and +group is used to directly add either addresses or +regular expressions to the specified group or groups. The different +categories of arguments to the group command can be +in any order. The flags -rx and -addr specify what the following strings (that cannot begin with a hyphen) should be interpreted as: either a regular expression or an email address, respectively.

    -These address groups can also be created implicitly by the alias, lists, subscribe and alternates commands by -specifying the optional -group option. For example, -

    -alternates -group me address1 address2
-alternates -group me -group work address3
-

    -would create a group named “me” which contains all your -addresses and a group named “work” which contains only your -work address address3. Besides many other -possibilities, this could be used to automatically mark your own -messages in a mailing list folder as read or use a special signature for -work-related messages. -

    -The ungroup command is used to remove addresses or -regular expressions from the specified group or groups. The syntax is -similar to the group command, however the special -character * can be used to empty a group of all of -its contents. As soon as a group gets empty because all addresses and -regular expressions have been removed, it'll internally be removed, too -(i.e. there cannot be an empty group). When removing regular expressions -from a group, the pattern must be specified exactly as given to the -group command or -group argument. -

    4. Defining/Using Aliases

    Usage:

    alias [ +These address groups can also be created implicitly by the +alias, lists, +subscribe and +alternates commands by specifying the +optional -group option. +

    +Once defined, these address groups can be used in +patterns to search for and limit the +display to messages matching a group. +

    +ungroup is used to remove addresses or regular +expressions from the specified group or groups. The syntax is similar to +the group command, however the special character +* can be used to empty a group of all of its +contents. +

    4. Defining/Using Aliases

    Usage:

    alias [ -group name ...] @@ -926,57 +894,53 @@ | key ... }

    -It's usually very cumbersome to remember or type out the address of -someone you are communicating with. Mutt allows you to create -“aliases” which map a short string to a full address. -

    Note

    -If you want to create an alias for more than one address, you -must separate the addresses with a comma -(“,”). +It's usually very cumbersome to remember or type out the address of someone +you are communicating with. Mutt allows you to create “aliases” which map +a short string to a full address. +

    Note

    +If you want to create an alias for more than +one address, you must separate the addresses with a comma (“,”).

    The optional -group argument to alias causes the aliased address(es) to be added to the named group.

    -To remove an alias or aliases (“*” means all aliases): +To remove an alias or aliases (“*” means all aliases): 

     alias muttdude me@cs.hmc.edu (Michael Elkins)
 alias theguys manny, moe, jack

    -Unlike other mailers, Mutt doesn't require aliases to be defined in a -special file. The alias command can appear anywhere -in a configuration file, as long as this file is sourced. Consequently, you -can have multiple alias files, or you can have all aliases defined in -your .muttrc. +Unlike other mailers, Mutt doesn't require aliases to be defined +in a special file. The alias command can appear anywhere in +a configuration file, as long as this file is sourced. Consequently, you can have multiple alias files, or +you can have all aliases defined in your .muttrc.

    On the other hand, the <create-alias> -function can use only one file, the one pointed to by the $alias_file variable (which is -~/.muttrc by default). This file is not special -either, in the sense that Mutt will happily append aliases to any file, -but in order for the new aliases to take effect you need to explicitly -source this file too. +function can use only one file, the one pointed to by the $alias_file variable (which is +˜/.muttrc by default). This file is not special either, +in the sense that Mutt will happily append aliases to any file, but in +order for the new aliases to take effect you need to explicitly source this file too.

    Example 3.7. Configuring external alias files

     source /usr/local/share/Mutt.aliases
 source ~/.mail_aliases
 set alias_file=~/.mail_aliases

    To use aliases, you merely use the alias at any place in Mutt where Mutt -prompts for addresses, such as the To: or -Cc: prompt. You can also enter aliases in your -editor at the appropriate headers if you have the $edit_headers variable set. -

    -In addition, at the various address prompts, you can use the tab -character to expand a partial alias to the full alias. If there are -multiple matches, Mutt will bring up a menu with the matching aliases. -In order to be presented with the full list of aliases, you must hit tab -without a partial alias, such as at the beginning of the prompt or after -a comma denoting multiple addresses. +prompts for addresses, such as the To: or Cc: prompt. You can +also enter aliases in your editor at the appropriate headers if you have the +$edit_headers variable set. +

    +In addition, at the various address prompts, you can use the tab character +to expand a partial alias to the full alias. If there are multiple matches, +Mutt will bring up a menu with the matching aliases. In order to be +presented with the full list of aliases, you must hit tab without a partial +alias, such as at the beginning of the prompt or after a comma denoting +multiple addresses.

    In the alias menu, you can select as many aliases as you want with the -select-entry key (default: <Return>), and use -the exit key (default: q) to return to the address -prompt. -

    5. Changing the Default Key Bindings

    Usage:

    bind +select-entry key (default: <Return>), and use the +exit key (default: q) to return to the address prompt. +

    5. Changing the Default Key Bindings

    Usage:

    bind map key @@ -986,30 +950,26 @@ This command allows you to change the default key bindings (operation invoked when pressing a key).

    -map specifies in which menu the binding belongs. -Multiple maps may be specified by separating them with commas (no -additional whitespace is allowed). The currently defined maps are: +map specifies in which menu the binding belongs. Multiple maps may +be specified by separating them with commas (no additional whitespace is +allowed). The currently defined maps are:

    generic

    This is not a real menu, but is used as a fallback for all of the other menus except for the pager and editor modes. If a key is not defined in -another menu, Mutt will look for a binding to use in this menu. This -allows you to bind a key to a certain function in multiple menus instead -of having multiple bind statements to accomplish the -same task. +another menu, Mutt will look for a binding to use in this menu. This allows +you to bind a key to a certain function in multiple menus instead of having +multiple bind statements to accomplish the same task.

    alias

    The alias menu is the list of your personal aliases as defined in your -.muttrc. It is the mapping from a short alias name -to the full email address(es) of the recipient(s). +.muttrc. It is the mapping from a short alias name to the full email +address(es) of the recipient(s).

    attach

    -The attachment menu is used to access the attachments on received -messages. +The attachment menu is used to access the attachments on received messages.

    browser

    -The browser is used for both browsing the local directory structure, and -for listing all of your incoming mailboxes. +The browser is used for both browsing the local directory structure, and for +listing all of your incoming mailboxes.

    editor

    -The editor is used to allow the user to enter a single line of text, such as -the To or Subject prompts in the -compose menu. +The editor is the line-based editor the user enters text data.

    index

    The index is the list of messages contained in a mailbox.

    compose

    @@ -1021,44 +981,35 @@ The pgp menu is used to select the OpenPGP keys used to encrypt outgoing messages.

    smime

    -The smime menu is used to select the OpenSSL certificates used to -encrypt outgoing messages. +The smime menu is used to select the OpenSSL certificates used to encrypt outgoing +messages.

    postpone

    The postpone menu is similar to the index menu, except is used when recalling a message the user was composing, but saved until later.

    query

    -The query menu is the browser for results returned by $query_command. +The query menu is the browser for results returned by +$query_command.

    mix

    The mixmaster screen is used to select remailer options for outgoing messages (if Mutt is compiled with Mixmaster support).

    -key is the key (or key sequence) you wish to bind. -To specify a control character, use the sequence -\Cx, where x is the letter of -the control character (for example, to specify control-A use -“\Ca”). Note that the case of x as -well as \C is ignored, so that -\CA, \Ca, -\cA and \ca are all +key is the key (or key sequence) you wish to bind. To specify a +control character, use the sequence \Cx, where x is the +letter of the control character (for example, to specify control-A use +“\Ca”). Note that the case of x as well as \C is +ignored, so that \CA, \Ca, \cA and \ca are all equivalent. An alternative form is to specify the key as a three digit -octal number prefixed with a “\” (for example -\177 is equivalent to \c?). In -addition, key may be a symbolic name as shown in -Table 3.1, “Symbolic key names”. +octal number prefixed with a “\” (for example \177 is +equivalent to \c?). In addition, key may +be a symbolic name as shown in Table 3.1, “Symbolic key names”.

    Table 3.1. Symbolic key names

    Symbolic nameMeaning
    \ttab
    <tab>tab
    <backtab>backtab / shift-tab
    \rcarriage return
    \nnewline
    \eescape
    <esc>escape
    <up>up arrow
    <down>down arrow
    <left>left arrow
    <right>right arrow
    <pageup>Page Up
    <pagedown>Page Down
    <backspace>Backspace
    <delete>Delete
    <insert>Insert
    <enter>Enter
    <return>Return
    <home>Home
    <end>End
    <space>Space bar
    <f1>function key 1
    <f10>function key 10

    -key does not need to be enclosed in quotes unless -it contains a space (“ ”) or semi-colon -(“;”). -

    -function specifies which action to take when -key is pressed. For a complete list of functions, -see the reference. Note that the -bind expects function to be -specified without angle brackets. -

    -The special function <noop> unbinds the -specified key sequence. -

    6. Defining Aliases for Character Sets

    Usage:

    charset-hook +key does not need to be enclosed in quotes unless it contains a +space (“ ”) or semi-colon (“;”). +

    +function specifies which action to take when key is pressed. +For a complete list of functions, see the reference. The special function <noop> unbinds the specified key +sequence. +

    6. Defining Aliases for Character Sets

    Usage:

    charset-hook alias charset @@ -1067,52 +1018,50 @@ local-charset

    -The charset-hook command defines an alias for a -character set. This is useful to properly display messages which are -tagged with a character set name not known to Mutt. -

    -The iconv-hook command defines a system-specific name -for a character set. This is helpful when your systems character -conversion library insists on using strange, system-specific names for -character sets. -

    7. Setting Variables Based Upon Mailbox

    Usage:

    folder-hook +The charset-hook command defines an alias for a character set. +This is useful to properly display messages which are tagged with a +character set name not known to Mutt. +

    +The iconv-hook command defines a system-specific name for a +character set. This is helpful when your systems character +conversion library insists on using strange, system-specific names +for character sets. +

    7. Setting Variables Based Upon Mailbox

    Usage:

    folder-hook [!]regexp command

    It is often desirable to change settings based on which mailbox you are -reading. The folder-hook command provides a method -by which you can execute any configuration command. -regexp is a regular expression specifying in which -mailboxes to execute command before loading. If a -mailbox matches multiple folder-hooks, they are -executed in the order given in the .muttrc. -

    Note

    -If you use the “!” shortcut for $spoolfile at the beginning of the pattern, -you must place it inside of double or single quotes in order to -distinguish it from the logical not operator for -the expression. -

    Note

    -Settings are not restored when you leave the -mailbox. For example, a command action to perform is to change the -sorting method based upon the mailbox being read: +reading. The folder-hook command provides a method by which you can execute +any configuration command. regexp is a regular expression specifying +in which mailboxes to execute command before loading. If a mailbox +matches multiple folder-hooks, they are executed in the order given in the +.muttrc. +

    Note

    +If you use the “!” shortcut for $spoolfile at the beginning of the pattern, you must place it +inside of double or single quotes in order to distinguish it from the +logical not operator for the expression. +

    Note

    +Settings are not restored when you leave the mailbox. +For example, a command action to perform is to change the sorting method +based upon the mailbox being read: + 

     folder-hook mutt "set sort=threads"

    + However, the sorting method is not restored to its previous value when -reading a different mailbox. To specify a default -command, use the pattern “.” before other -folder-hooks adjusting a value on a per-folder basis -because folder-hooks are evaluated in the order given -in the configuration file. +reading a different mailbox. To specify a default command, use the +pattern “.” before other folder-hooks adjusting a value on a per-folder basis +because folder-hooks are evaluated in the order given in the +configuration file.

    -The following example will set the sort -variable to date-sent for all folders but to -threads for all folders containing -“mutt” in their name. +The following example will set the sort variable +to date-sent for all folders but to threads +for all folders containing “mutt” in their name.

    Example 3.8. Setting sort method based on mailbox name

     folder-hook . "set sort=date-sent"
 folder-hook mutt "set sort=threads"
-

    8. Keyboard Macros

    Usage:

    macro +


    8. Keyboard Macros

    Usage:

    macro menu key @@ -1121,43 +1070,39 @@ [ description ]

    -Macros are useful when you would like a single key to perform a series -of actions. When you press key in menu -menu, Mutt will behave as if you had typed -sequence. So if you have a common sequence of -commands you type, you can create a macro to execute those commands with -a single key or fewer keys. -

    -menu is the map which -the macro will be bound in. Multiple maps may be specified by -separating multiple menu arguments by commas. Whitespace may not be used -in between the menu arguments and the commas separating them. -

    -key and sequence are expanded -by the same rules as the key bindings with -some additions. The first is that control characters in -sequence can also be specified as -^x. In order to get a caret (“^”) you -need to use ^^. Secondly, to specify a certain key -such as up or to invoke a function directly, you -can use the format <key name> and -<function name>. For a listing of key names -see the section on key bindings. Functions -are listed in the reference. +Macros are useful when you would like a single key to perform a series of +actions. When you press key in menu menu, Mutt will behave as if +you had typed sequence. So if you have a common sequence of commands +you type, you can create a macro to execute those commands with a single +key or fewer keys. +

    +menu is the map which the macro will be bound in. +Multiple maps may be specified by separating multiple menu arguments by +commas. Whitespace may not be used in between the menu arguments and the +commas separating them. +

    +key and sequence are expanded by the same rules as the +key bindings with some additions. The +first is that control characters in sequence can also be specified +as ^x. In order to get a caret (“^”) you need to use +^^. Secondly, to specify a certain key such as up +or to invoke a function directly, you can use the format +<key name> and <function name>. For a listing of key +names see the section on key bindings. Functions +are listed in the reference.

    The advantage with using function names directly is that the macros will -work regardless of the current key bindings, so they are not dependent -on the user having particular key definitions. This makes them more -robust and portable, and also facilitates defining of macros in files -used by more than one user (e.g., the system Muttrc). -

    -Optionally you can specify a descriptive text after -sequence, which is shown in the help screens if -they contain a description. -

    Note

    +work regardless of the current key bindings, so they are not dependent on +the user having particular key definitions. This makes them more robust +and portable, and also facilitates defining of macros in files used by more +than one user (e.g., the system Muttrc). +

    +Optionally you can specify a descriptive text after sequence, +which is shown in the help screens if they contain a description. +

    Note

    Macro definitions (if any) listed in the help screen(s), are silently truncated at the screen width, and are not wrapped. -

    9. Using Color and Mono Video Attributes

    Usage:

    color +

    9. Using Color and Mono Video Attributes

    Usage:

    color object foreground @@ -1192,61 +1137,48 @@ | pattern ... }

    -If your terminal supports color, you can spice up Mutt by creating your -own color scheme. To define the color of an object (type of -information), you must specify both a foreground color -and a background color (it is not possible to only -specify one or the other). -

    -header and body match -regexp in the header/body of a message, -index matches pattern (see -Section 3, “Patterns: Searching, Limiting and Tagging”) in the message index. +If your terminal supports color, you can spice up Mutt by creating your own +color scheme. To define the color of an object (type of information), you +must specify both a foreground color and a background color (it is not +possible to only specify one or the other). +

    +header and body match regexp +in the header/body of a message, index matches pattern +(see Section 2, “Patterns: Searching, Limiting and Tagging”) in the message index.

    object can be one of: -

    • attachment

    • bold (highlighting bold patterns in the body of messages)

    • error (error messages printed by Mutt)

    • hdrdefault (default color of the message header in the pager)

    • indicator (arrow or bar used to indicate the current item in a menu)

    • markers (the “+” markers at the beginning of wrapped lines in the pager)

    • message (informational messages)

    • normal

    • quoted (text matching $quote_regexp in the body of a message)

    • quoted1, quoted2, ..., quotedN (higher levels of quoting)

    • search (highlighting of words in the pager)

    • signature

    • status (mode lines used to display info about the mailbox or message)

    • tilde (the “~” used to pad blank lines in the pager)

    • tree (thread tree drawn in the message index and attachment menu)

    • underline (highlighting underlined patterns in the body of messages)

    -foreground and background can -be one of the following: -

    • white

    • black

    • green

    • magenta

    • blue

    • cyan

    • yellow

    • red

    • default

    • colorx

    -foreground can optionally be prefixed with the -keyword bright to make the foreground color boldfaced -(e.g., brightred). -

    -If your terminal supports it, the special keyword -default can be used as a transparent color. The -value brightdefault is also valid. If Mutt is -linked against the S-Lang library, you also need to -set the $COLORFGBG environment variable to the -default colors of your terminal for this to work; for example (for -Bourne-like shells): +

    • attachment

    • bold (hiliting bold patterns in the body of messages)

    • error (error messages printed by Mutt)

    • hdrdefault (default color of the message header in the pager)

    • indicator (arrow or bar used to indicate the current item in a menu)

    • markers (the “+” markers at the beginning of wrapped lines in the pager)

    • message (informational messages)

    • normal

    • quoted (text matching $quote_regexp in the body of a message)

    • quoted1, quoted2, ..., quotedN (higher levels of quoting)

    • search (hiliting of words in the pager)

    • signature

    • status (mode lines used to display info about the mailbox or message)

    • tilde (the “˜” used to pad blank lines in the pager)

    • tree (thread tree drawn in the message index and attachment menu)

    • underline (hiliting underlined patterns in the body of messages)

    +foreground and background can be one of the following: +

    • white

    • black

    • green

    • magenta

    • blue

    • cyan

    • yellow

    • red

    • default

    • colorx

    +foreground can optionally be prefixed with the keyword bright to make +the foreground color boldfaced (e.g., brightred). +

    +If your terminal supports it, the special keyword default can be +used as a transparent color. The value brightdefault is also valid. +If Mutt is linked against the S-Lang library, you also need to set +the $COLORFGBG environment variable to the default colors of your +terminal for this to work; for example (for Bourne-like shells): 

     set COLORFGBG="green;black"
 export COLORFGBG
-

    Note

    -The S-Lang library requires you to use the -lightgray and brown keywords -instead of white and yellow -when setting this variable. -

    Note

    -The uncolor command can be applied to the index, -header and body objects only. It removes entries from the list. You -must specify the same pattern specified in the -color command for it to be removed. The pattern -“*” is a special token which means to clear the color list -of all entries. +

    Note

    +The S-Lang library requires you to use the lightgray +and brown keywords instead of white and yellow when +setting this variable. +

    Note

    +The uncolor command can be applied to the index, header and body objects only. It +removes entries from the list. You must specify the same pattern +specified in the color command for it to be removed. The pattern “*” is +a special token which means to clear the color list of all entries.

    -Mutt also recognizes the keywords color0, -color1, ..., -colorN-1 -(N being the number of colors supported by your -terminal). This is useful when you remap the colors for your display -(for example by changing the color associated with -color2 for your xterm), since color names may then -lose their normal meaning. +Mutt also recognizes the keywords color0, color1, …, +colorN-1 (N being the number of colors supported +by your terminal). This is useful when you remap the colors for your +display (for example by changing the color associated with color2 +for your xterm), since color names may then lose their normal meaning.

    -If your terminal does not support color, it is still possible change the -video attributes through the use of the “mono” -command. Usage: +If your terminal does not support color, it is still possible change the video +attributes through the use of the “mono” command. Usage:

    mono object @@ -1276,15 +1208,9 @@ | pattern ... }

    -For object, see the color -command. attribute can be one of the following: -

    • none

    • bold

    • underline

    • reverse

    • standout

    10. Message Header Display

    10.1. Header Display

    -When displaying a message in the pager, Mutt folds long header lines at -$wrap columns. Though there're precise rules -about where to break and how, Mutt always folds headers using a tab for -readability. (Note that the sending side is not affected by this, Mutt -tries to implement standards compliant folding.) -

    10.2. Selecting Headers

    Usage:

    ignore +For object, see the color command. attribute +can be one of the following: +

    • none

    • bold

    • underline

    • reverse

    • standout

    10. Message Header Display

    10.1. Selecting Headers

    Usage:

    ignore pattern [ pattern @@ -1293,30 +1219,26 @@ | pattern ... }

    -Messages often have many header fields added by automatic processing -systems, or which may not seem useful to display on the screen. This -command allows you to specify header fields which you don't normally -want to see in the pager. +Messages often have many header fields added by automatic processing systems, +or which may not seem useful to display on the screen. This command allows +you to specify header fields which you don't normally want to see in the pager.

    You do not need to specify the full header field name. For example, -“ignore content-” will ignore all header fields that begin -with the pattern “content-”. “ignore *” will -ignore all headers. -

    -To remove a previously added token from the list, use the -“unignore” command. The “unignore” command -will make Mutt display headers with the given pattern. For example, if -you do “ignore x-” it is possible to “unignore -x-mailer”. +“ignore content-” will ignore all header fields that begin with the pattern +“content-”. “ignore *” will ignore all headers.

    -“unignore *” will remove all tokens from the ignore list. +To remove a previously added token from the list, use the “unignore” command. +The “unignore” command will make Mutt display headers with the given pattern. +For example, if you do “ignore x-” it is possible to “unignore x-mailer”. +

    +“unignore *” will remove all tokens from the ignore list.

    Example 3.9. Header weeding

    -# Sven's draconian header weeding
+# Sven's draconian header weeding
 ignore *
 unignore from date subject to cc
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
 unignore posted-to:
-

    10.3. Ordering Displayed Headers

    Usage:

    hdr_order +


    10.2. Ordering Displayed Headers

    Usage:

    hdr_order header [ header @@ -1325,16 +1247,14 @@ | header ... }

    -With the hdr_order command you can specify an order -in which Mutt will attempt to present these headers to you when viewing -messages. +With the hdr_order command you can specify an order in +which Mutt will attempt to present these headers to you when viewing messages.

    -“unhdr_order *” will clear all previous -headers from the order list, thus removing the header order effects set -by the system-wide startup file. +“unhdr_order *” will clear all previous headers from the order list, +thus removing the header order effects set by the system-wide startup file.

    Example 3.10. Configuring header display order

     hdr_order From Date: From: To: Cc: Subject:
-

    11. Alternative Addresses

    Usage:

    alternates [ +


    11. Alternative Addresses

    Usage:

    alternates [ -group name ...] @@ -1349,17 +1269,17 @@ | regexp ... }

    -With various functions, Mutt will treat messages differently, depending -on whether you sent them or whether you received them from someone else. -For instance, when replying to a message that you sent to a different -party, Mutt will automatically suggest to send the response to the -original message's recipients — responding to yourself won't make -much sense in many cases. (See $reply_to.) +With various functions, Mutt will treat messages differently, +depending on whether you sent them or whether you received them from +someone else. For instance, when replying to a message that you +sent to a different party, Mutt will automatically suggest to send +the response to the original message's recipients — responding to +yourself won't make much sense in many cases. (See $reply_to.)

    Many users receive e-mail under a number of different addresses. To -fully use Mutt's features here, the program must be able to recognize -what e-mail addresses you receive mail under. That's the purpose of the -alternates command: It takes a list of regular +fully use Mutt's features here, the program must be able to +recognize what e-mail addresses you receive mail under. That's the +purpose of the alternates command: It takes a list of regular expressions, each of which can identify an address under which you receive e-mail.

    @@ -1369,38 +1289,38 @@ 

     alternates user@example

    -Mutt will consider “some-user@example” -as being your address, too which may not be desired. As a solution, in -such cases addresses should be specified as: +Mutt will consider “some-user@example” as +being your address, too which may not be desired. As a solution, in such +cases addresses should be specified as: 

     alternates '^user@example$'

    -The -group flag causes all of the subsequent regular -expressions to be added to the named group. +The -group flag causes all of the subsequent regular expressions +to be added to the named group.

    -The unalternates command can be used to write -exceptions to alternates patterns. If an address -matches something in an alternates command, but you -nonetheless do not think it is from you, you can list a more precise -pattern under an unalternates command. -

    -To remove a regular expression from the alternates -list, use the unalternates command with exactly the -same regexp. Likewise, if the -regexp for an alternates command -matches an entry on the unalternates list, that -unalternates entry will be removed. If the -regexp for unalternates is -“*”, all entries on -alternates will be removed. -

    12. Mailing Lists

    Usage:

    lists [ +The unalternates command can be used to write exceptions to +alternates patterns. If an address matches something in an +alternates command, but you nonetheless do not think it is +from you, you can list a more precise pattern under an unalternates +command. +

    +To remove a regular expression from the alternates list, use the +unalternates command with exactly the same regexp. +Likewise, if the regexp for an alternates command matches +an entry on the unalternates list, that unalternates +entry will be removed. If the regexp for unalternates +is “*”, all entries on alternates will be removed. +

    12. Mailing Lists

    Usage:

    lists [ -group name ...] regexp [ regexp -...]
    unlists { +...]
    unlists [ +-group +name +...] { * | regexp @@ -1411,84 +1331,84 @@ regexp [ regexp -...]
    unsubscribe { +...]
    unsubscribe [ +-group +name +...] { * | regexp ... }

    -Mutt has a few nice features for handling -mailing lists. In order to take advantage of them, you must -specify which addresses belong to mailing lists, and which mailing lists -you are subscribed to. Mutt also has limited support for auto-detecting -mailing lists: it supports parsing mailto: links in -the common List-Post: header which has the same -effect as specifying the list address via the lists -command (except the group feature). Once you have done this, the <list-reply> -function will work for all known lists. Additionally, when you send a -message to a subscribed list, Mutt will add a Mail-Followup-To header to -tell other users' mail user agents not to send copies of replies to your -personal address. -

    Note

    +Mutt has a few nice features for handling mailing lists. In order to take advantage of them, you must +specify which addresses belong to mailing lists, and which mailing +lists you are subscribed to. Mutt also has limited support for +auto-detecting mailing lists: it supports parsing +mailto: links in the common +List-Post: header which has the same effect as +specifying the list address via the lists command +(except the group feature). Once you have done this, the +<list-reply> +function will work for all known lists. +Additionally, when you send a message to a subscribed list, Mutt will +add a Mail-Followup-To header to tell other users' mail user agents +not to send copies of replies to your personal address. +

    Note

    The Mail-Followup-To header is a non-standard extension which is not -supported by all mail user agents. Adding it is not bullet-proof -against receiving personal CCs of list messages. Also note that the -generation of the Mail-Followup-To header is controlled by the $followup_to configuration variable since -it's common practice on some mailing lists to send Cc upon replies -(which is more a group- than a list-reply). +supported by all mail user agents. Adding it is not bullet-proof against +receiving personal CCs of list messages. Also note that the generation +of the Mail-Followup-To header is controlled by the +$followup_to +configuration variable since it's common practice on some mailing lists +to send Cc upons replies (which is more a group- than a list-reply).

    -More precisely, Mutt maintains lists of patterns for the addresses of -known and subscribed mailing lists. Every subscribed mailing list is -known. To mark a mailing list as known, use the list +More precisely, Mutt maintains lists of patterns for the addresses +of known and subscribed mailing lists. Every subscribed mailing +list is known. To mark a mailing list as known, use the list command. To mark it as subscribed, use subscribe.

    -You can use regular expressions with both commands. To mark all messages -sent to a specific bug report's address on Debian's bug tracking system -as list mail, for instance, you could say +You can use regular expressions with both commands. To mark all +messages sent to a specific bug report's address on Debian's bug +tracking system as list mail, for instance, you could say 

     subscribe [0-9]*.*@bugs.debian.org

    -as it's often sufficient to just give a portion of the list's e-mail -address. +as it's often, it's sufficient to just give a portion of the list's e-mail address.

    Specify as much of the address as you need to to remove ambiguity. For -example, if you've subscribed to the Mutt mailing list, you will receive -mail addressed to mutt-users@mutt.org. So, to tell -Mutt that this is a mailing list, you could add lists -mutt-users@ to your initialization file. To tell Mutt that -you are subscribed to it, add subscribe -mutt-users to your initialization file instead. If you also -happen to get mail from someone whose address is +example, if you've subscribed to the Mutt mailing list, you will receive mail +addressed to mutt-users@mutt.org. So, to tell Mutt +that this is a mailing list, you could add lists mutt-users@ to your +initialization file. To tell Mutt that you are subscribed to it, +add subscribe mutt-users to your initialization file instead. +If you also happen to get mail from someone whose address is mutt-users@example.com, you could use -lists ^mutt-users@mutt\\.org$ or -subscribe ^mutt-users@mutt\\.org$ -to match only mail from the actual list. -

    -The -group flag adds all of the subsequent regular -expressions to the named address group -in addition to adding to the specified address list. -

    -The “unlists” command is used to remove a token from the -list of known and subscribed mailing-lists. Use “unlists *” -to remove all tokens. -

    -To remove a mailing list from the list of subscribed mailing lists, but -keep it on the list of known mailing lists, use -unsubscribe. -

    13. Using Multiple Spool Mailboxes

    Usage:

    mbox-hook +lists ^mutt-users@mutt\\.org$ +or subscribe ^mutt-users@mutt\\.org$ to +match only mail from the actual list. +

    +The -group flag adds all of the subsequent regular expressions +to the named group. +

    +The “unlists” command is used to remove a token from the list of +known and subscribed mailing-lists. Use “unlists *” to remove all +tokens. +

    +To remove a mailing list from the list of subscribed mailing lists, +but keep it on the list of known mailing lists, use unsubscribe. +

    13. Using Multiple Spool Mailboxes

    Usage:

    mbox-hook [!]pattern mailbox

    This command is used to move read messages from a specified mailbox to a different mailbox automatically when you quit or change folders. -pattern is a regular expression specifying the -mailbox to treat as a “spool” mailbox and -mailbox specifies where mail should be saved when +pattern is a regular expression specifying the mailbox to treat as a +“spool” mailbox and mailbox specifies where mail should be saved when read.

    -Unlike some of the other hook commands, only the -first matching pattern is used (it is not possible -to save read mail in more than a single mailbox). -

    14. Monitoring Incoming Mail

    Usage:

    mailboxes +Unlike some of the other hook commands, only the first matching +pattern is used (it is not possible to save read mail in more than a single +mailbox). +

    14. Monitoring Incoming Mail

    Usage:

    mailboxes mailbox [ mailbox @@ -1497,119 +1417,132 @@ | mailbox ... }

    -This command specifies folders which can receive mail and which will be -checked for new messages periodically. +This command specifies folders which can receive mail and +which will be checked for new messages periodically.

    folder can either be a local file or directory (Mbox/Mmdf or Maildir/Mh). If Mutt was built with POP and/or IMAP support, folder can also be a POP/IMAP folder -URL. The URL syntax is described in Section 1.2, “URL Syntax”, POP -and IMAP are described in Section 3, “POP3 Support” and Section 4, “IMAP Support” respectively. +URL. The URL syntax is described in Section 1.2, “URL Syntax”, +POP and IMAP are described in Section 3, “POP3 Support” and Section 4, “IMAP Support” +respectively.

    Mutt provides a number of advanced features for handling (possibly many) -folders and new mail within them, please refer to Section 10, “New Mail Detection” for details (including in what situations and how -often Mutt checks for new mail). +folders and new mail within them, please refer to +Section 9, “Handling multiple folders” for details (including in what +situations and how often Mutt checks for new mail). +

    +The “unmailboxes” command is used to remove a token from the list +of folders which receive mail. Use “unmailboxes *” to remove all +tokens. +

    Note

    +The folders in the mailboxes command are resolved when +the command is executed, so if these names contain shortcut characters (such as “=” and “!”), any variable +definition that affects these characters (like $folder and $spoolfile) +should be set before the mailboxes command. If +none of these shorcuts are used, a local path should be absolute as +otherwise Mutt tries to find it relative to the directory +from where Mutt was started which may not always be desired. +

    +For Mbox and Mmdf folders, new mail is detected by comparing access and/or +modification times of files: Mutt assumes a folder has new mail if it wasn't +accessed after it was last modified. Utilities like biff or +frm or any other program which accesses the mailbox might cause +Mutt to never detect new mail for that mailbox if they do not properly reset the +access time. Other possible causes of Mutt not detecting new mail in these folders +are backup tools (updating access times) or filesystems mounted without +access time update support.

    -The “unmailboxes” command is used to remove a token from -the list of folders which receive mail. Use “unmailboxes *” -to remove all tokens. -

    Note

    -The folders in the mailboxes command are resolved -when the command is executed, so if these names contain shortcut characters (such as “=” -and “!”), any variable definition that affects these -characters (like $folder and $spoolfile) should be set before the -mailboxes command. If none of these shortcuts are -used, a local path should be absolute as otherwise Mutt tries to find it -relative to the directory from where Mutt was started which may not -always be desired. -

    15. User-Defined Headers

    Usage:

    my_hdr +In cases where new mail detection for Mbox or Mmdf folders appears to be +unreliable, the +$check_mbox_size +option can be used to make Mutt track and consult file sizes for new +mail detection instead which won't work for size-neutral changes. +

    15. User-Defined Headers

    Usage:

    my_hdr string
    unmy_hdr { * | field ... }

    -The my_hdr command allows you to create your own -header fields which will be added to every message you send and appear -in the editor if $edit_headers is -set. -

    -For example, if you would like to add an “Organization:” -header field to all of your outgoing messages, you can put the command -something like shown in Example 3.11, “Defining custom headers” in your -.muttrc. +The my_hdr command allows you to create your own header +fields which will be added to every message you send and appear in the +editor if $edit_headers is set. +

    +For example, if you would like to add an “Organization:” header field to +all of your outgoing messages, you can put the command something like +shown in Example 3.11, “Defining custom headers” in your .muttrc.

    Example 3.11. Defining custom headers

     my_hdr Organization: A Really Big Company, Anytown, USA
-

    Note

    -Space characters are not allowed between the -keyword and the colon (“:”). The standard for electronic -mail (RFC2822) says that space is illegal there, so Mutt enforces the -rule. +


    Note

    +Space characters are not allowed between the keyword and +the colon (“:”). The standard for electronic mail (RFC2822) says that +space is illegal there, so Mutt enforces the rule.

    If you would like to add a header field to a single message, you should -either set the $edit_headers -variable, or use the <edit-headers> function -(default: “E”) in the compose menu so that you can edit the -header of your message along with the body. -

    -To remove user defined header fields, use the -unmy_hdr command. You may specify an asterisk -(“*”) to remove all header fields, or the fields to -remove. For example, to remove all “To” and -“Cc” header fields, you could use: +either set the $edit_headers variable, +or use the <edit-headers> function (default: “E”) in the compose menu so +that you can edit the header of your message along with the body. +

    +To remove user defined header fields, use the unmy_hdr +command. You may specify an asterisk (“*”) to remove all header +fields, or the fields to remove. For example, to remove all “To” and +“Cc” header fields, you could use: 

     unmy_hdr to cc
-

    16. Specify Default Save Mailbox

    Usage:

    save-hook +

    16. Specify Default Save Mailbox

    Usage:

    save-hook [!]pattern mailbox

    This command is used to override the default mailbox used when saving -messages. mailbox will be used as the default if -the message matches pattern, see Message Matching in Hooks for information on the exact format. +messages. mailbox will be used as the default if the message +matches pattern, see Message Matching in Hooks for information +on the exact format.

    -To provide more flexibility and good defaults, Mutt applies the expandos -of $index_format to +To provide more flexibility and good defaults, Mutt applies the +expandos of $index_format to mailbox after it was expanded.

    Example 3.12. Using %-expandos in save-hook

    -# default: save all to ~/Mail/<author name>
+# default: save all to ~/Mail/<author name>
 save-hook . ~/Mail/%F
 
-# save from me@turing.cs.hmc.edu and me@cs.hmc.edu to $folder/elkins
+# save from me@turing.cs.hmc.edu and me@cs.hmc.edu to $folder/elkins
 save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins
 
-# save from aol.com to $folder/spam
+# save from aol.com to $folder/spam
 save-hook aol\\.com$ +spam

    -Also see the fcc-save-hook command. -

    17. Specify Default Fcc: Mailbox When Composing

    Usage:

    fcc-hook +Also see the fcc-save-hook command. +

    17. Specify Default Fcc: Mailbox When Composing

    Usage:

    fcc-hook [!]pattern mailbox

    -This command is used to save outgoing mail in a mailbox other than $record. Mutt searches the initial list of -message recipients for the first matching regexp -and uses mailbox as the default Fcc: mailbox. If -no match is found the message will be saved to $record mailbox. +This command is used to save outgoing mail in a mailbox other than +$record. Mutt searches the initial list of +message recipients for the first matching regexp and uses mailbox +as the default Fcc: mailbox. If no match is found the message will be saved +to $record mailbox.

    To provide more flexibility and good defaults, Mutt applies the -expandos of $index_format to +expandos of $index_format to mailbox after it was expanded.

    -See Message Matching in Hooks for information on the exact format -of pattern. +See Message Matching in Hooks for information on the exact format of pattern. 

    fcc-hook [@.]aol\\.com$ +spammers

    -...will save a copy of all messages going to the aol.com domain to the -`+spammers' mailbox by default. Also see the fcc-save-hook command. -

    18. Specify Default Save Filename and Default Fcc: Mailbox at Once

    Usage:

    fcc-save-hook +...will save a copy of all messages going to the aol.com domain to +the `+spammers' mailbox by default. Also see the fcc-save-hook command. +

    18. Specify Default Save Filename and Default Fcc: Mailbox at Once

    Usage:

    fcc-save-hook [!]pattern mailbox

    -This command is a shortcut, equivalent to doing both a fcc-hook and a save-hook with its -arguments, including %-expansion on mailbox -according to $index_format. -

    19. Change Settings Based Upon Message Recipients

    Usage:

    reply-hook +This command is a shortcut, equivalent to doing both a fcc-hook +and a save-hook with its arguments, +including %-expansion on mailbox according +to $index_format. +

    19. Change Settings Based Upon Message Recipients

    Usage:

    reply-hook [!]pattern command @@ -1622,124 +1555,99 @@ command

    -These commands can be used to execute arbitrary configuration commands -based upon recipients of the message. pattern is -used to match the message, see Message Matching in Hooks for -details. command is executed when -pattern matches. -

    -reply-hook is matched against the message you are -replying to, instead of the message you are -sending. send-hook is matched -against all messages, both new and -replies. -

    Note

    -reply-hooks are matched before -the send-hook, regardless of the -order specified in the user's configuration file. +These commands can be used to execute arbitrary configuration commands based +upon recipients of the message. pattern is used to match +the message, see Message Matching in Hooks for details. command +is executed when pattern matches. +

    +reply-hook is matched against the message you are replying to, +instead of the message you are sending. send-hook is +matched against all messages, both new +and replies. +

    Note

    +reply-hooks are matched before the send-hook, regardless +of the order specified in the user's configuration file.

    -send2-hook is matched every time a message is -changed, either by editing it, or by using the compose menu to change -its recipients or subject. send2-hook is executed -after send-hook, and can, e.g., be used to set -parameters such as the $sendmail -variable depending on the message's sender address. -

    -For each type of send-hook or -reply-hook, when multiple matches occur, commands are -executed in the order they are specified in the -.muttrc (for that type of hook). +send2-hook is matched every time a message is changed, either +by editing it, or by using the compose menu to change its recipients +or subject. send2-hook is executed after send-hook, and +can, e.g., be used to set parameters such as the $sendmail variable depending on the message's sender +address. +

    +For each type of send-hook or reply-hook, when multiple matches +occur, commands are executed in the order they are specified in the .muttrc +(for that type of hook).

    -Example: send-hook mutt -"set mime_forward signature=''" +Example: send-hook mutt "set mime_forward signature=''"

    Another typical use for this command is to change the values of the -$attribution, $signature and $locale variables in order to change the -language of the attributions and signatures based upon the recipients. -

    Note

    +$attribution, $signature and $locale +variables in order to change the language of the attributions and +signatures based upon the recipients. +

    Note

    send-hook's are only executed once after getting the initial list of recipients. Adding a recipient after replying or -editing the message will not cause any send-hook to -be executed, similarly if $autoedit is -set (as then the initial list of recipients is empty). Also note that -my_hdr commands which +editing the message will not cause any send-hook to be executed, +similarily if $autoedit is set +(as then the initial list of recipients is empty). Also note that my_hdr commands which modify recipient headers, or the message's subject, don't have any effect on the current message when executed from a send-hook. -

    20. Change Settings Before Formatting a Message

    Usage:

    message-hook +

    20. Change Settings Before Formatting a Message

    Usage:

    message-hook [!]pattern command

    This command can be used to execute arbitrary configuration commands -before viewing or formatting a message based upon information about the -message. command is executed if the -pattern matches the message to be displayed. When -multiple matches occur, commands are executed in the order they are -specified in the .muttrc. +before viewing or formatting a message based upon information about the message. +command is executed if the pattern matches the message to be +displayed. When multiple matches occur, commands are executed in the order +they are specified in the .muttrc.

    -See Message Matching in Hooks for information on the exact format -of pattern. +See Message Matching in Hooks for +information on the exact format of pattern.

    Example: 

     message-hook ~A 'set pager=builtin'
 message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject: .*\""'
-

    21. Choosing the Cryptographic Key of the Recipient

    Usage:

    crypt-hook +

    21. Choosing the Cryptographic Key of the Recipient

    Usage:

    crypt-hook pattern keyid

    -When encrypting messages with PGP/GnuPG or OpenSSL, you may want to -associate a certain key with a given e-mail address automatically, -either because the recipient's public key can't be deduced from the -destination address, or because, for some reasons, you need to override -the key Mutt would normally use. The crypt-hook -command provides a method by which you can specify the ID of the public -key to be used when encrypting messages to a certain recipient. -

    -The meaning of keyid is to be taken broadly in this -context: You can either put a numerical key ID here, an e-mail address, -or even just a real name. -

    22. Adding Key Sequences to the Keyboard Buffer

    Usage:

    push +When encrypting messages with PGP/GnuPG or OpenSSL, you may want to associate a certain +key with a given e-mail address automatically, either because the +recipient's public key can't be deduced from the destination address, +or because, for some reasons, you need to override the key Mutt would +normally use. The crypt-hook command provides a +method by which you can specify the ID of the public key to be used +when encrypting messages to a certain recipient. +

    +The meaning of keyid is to be taken broadly in this context: You +can either put a numerical key ID here, an e-mail address, or even +just a real name. +

    22. Adding Key Sequences to the Keyboard Buffer

    Usage:

    push string

    -This command adds the named string to the keyboard buffer. The string -may contain control characters, key names and function names like the -sequence string in the macro command. You -may use it to automatically run a sequence of commands at startup, or -when entering certain folders. For example, Example 3.13, “Embedding push in folder-hook” shows how to automatically collapse all -threads when entering a folder. +This command adds the named string to the keyboard buffer. The string may +contain control characters, key names and function names like the sequence +string in the macro command. You may use it to +automatically run a sequence of commands at startup, or when entering +certain folders. For example, Example 3.13, “Embedding push in folder-hook” +shows how to automatically collapse all threads when entering a folder.

    Example 3.13. Embedding push in folder-hook

     folder-hook . 'push <collapse-all>'
-

    -For using functions like shown in the example, it's important to use -angle brackets (“<” and “>”) to make -Mutt recognize the input as a function name. Otherwise it will simulate -individual just keystrokes, i.e. “push -collapse-all” would be interpreted as if you had typed -“c”, followed by “o”, followed by -“l”, ..., which is not desired and may lead to very -unexpected behavior. -

    -Keystrokes can be used, too, but are less portable because of -potentially changed key bindings. With default bindings, this is -equivalent to the above example: -

    -folder-hook . 'push \eV'
-

    -because it simulates that Esc+V was pressed (which is the default -binding of <collapse-all>). -

    23. Executing Functions

    Usage:

    exec +


    23. Executing Functions

    Usage:

    exec function [ function ...]

    -This command can be used to execute any function. Functions are listed -in the function reference. -“exec function” is -equivalent to “push <function>”. -

    24. Message Scoring

    Usage:

    score +This command can be used to execute any function. Functions are +listed in the function reference. +“execfunction” is equivalent to +“push <function>”. +

    24. Message Scoring

    Usage:

    score pattern value @@ -1748,25 +1656,20 @@ | pattern ... }

    -The score commands adds value to -a message's score if pattern matches it. -pattern is a string in the format described in the -patterns section (note: For efficiency -reasons, patterns which scan information not available in the index, -such as ~b, ~B or -~h, may not be used). value is -a positive or negative integer. A message's final score is the sum -total of all matching score entries. However, you -may optionally prefix value with an equal sign -(“=”) to cause evaluation to stop at a particular entry if -there is a match. Negative final scores are rounded up to 0. -

    -The unscore command removes score entries from the -list. You must specify the same pattern specified -in the score command for it to be removed. The -pattern “*” is a special token which means to clear the -list of all score entries. -

    25. Spam Detection

    Usage:

    spam +The score commands adds value to a message's score if pattern +matches it. pattern is a string in the format described in the patterns section (note: For efficiency reasons, patterns +which scan information not available in the index, such as ˜b, +˜B or ˜h, may not be used). value is a +positive or negative integer. A message's final score is the sum total of all +matching score entries. However, you may optionally prefix value with +an equal sign (“=”) to cause evaluation to stop at a particular entry if there is +a match. Negative final scores are rounded up to 0. +

    +The unscore command removes score entries from the list. You must +specify the same pattern specified in the score command for it to be +removed. The pattern “*” is a special token which means to clear the list +of all score entries. +

    25. Spam Detection

    Usage:

    spam pattern format @@ -1775,149 +1678,134 @@ | pattern }

    -Mutt has generalized support for external spam-scoring filters. By -defining your spam patterns with the spam and -nospam commands, you can limit, -search, and sort your mail -based on its spam attributes, as determined by the external filter. You -also can display the spam attributes in your index display using the -%H selector in the $index_format variable. (Tip: try -%?H?[%H] ? to display spam tags only when they are -defined for a given message.) +Mutt has generalized support for external spam-scoring filters. +By defining your spam patterns with the spam and nospam +commands, you can limit, search, and sort your +mail based on its spam attributes, as determined by the external +filter. You also can display the spam attributes in your index +display using the %H selector in the $index_format variable. (Tip: try %?H?[%H] ? +to display spam tags only when they are defined for a given message.)

    Your first step is to define your external filter's spam patterns using -the spam command. pattern should -be a regular expression that matches a header in a mail message. If any -message in the mailbox matches this regular expression, it will receive -a “spam tag” or “spam attribute” (unless it -also matches a nospam pattern — see below.) The -appearance of this attribute is entirely up to you, and is governed by -the format parameter. format -can be any static text, but it also can include back-references from the -pattern expression. (A regular expression -“back-reference” refers to a sub-expression contained -within parentheses.) %1 is replaced with the first -back-reference in the regex, %2 with the second, etc. +the spam command. pattern should be a regular expression +that matches a header in a mail message. If any message in the mailbox +matches this regular expression, it will receive a “spam tag” or +“spam attribute” (unless it also matches a nospam pattern — see +below.) The appearance of this attribute is entirely up to you, and is +governed by the format parameter. format can be any static +text, but it also can include back-references from the pattern +expression. (A regular expression “back-reference” refers to a +sub-expression contained within parentheses.) %1 is replaced with +the first back-reference in the regex, %2 with the second, etc.

    To match spam tags, mutt needs the corresponding header information which is always the case for local and POP folders but not for IMAP in the default configuration. Depending on the spam header to be analyzed, -$imap_headers may need to be -adjusted. +$imap_headers may need +to be adjusted.

    -If you're using multiple spam filters, a message can have more than one -spam-related header. You can define spam patterns for -each filter you use. If a message matches two or more of these patterns, -and the $spam_separator variable -is set to a string, then the message's spam tag will consist of all the -format strings joined together, with the value of -$spam_separator separating them. +If you're using multiple spam filters, a message can have more than +one spam-related header. You can define spam patterns for each +filter you use. If a message matches two or more of these patterns, and +the $spam_separator variable is set to a string, then the +message's spam tag will consist of all the format strings joined +together, with the value of $spam_separator separating +them.

    For example, suppose one uses DCC, SpamAssassin, and PureMessage, then -the configuration might look like in Example 3.14, “Configuring spam detection”. +the configuration might look like in Example 3.14, “Configuring spam detection”.

    Example 3.14. Configuring spam detection

     spam "X-DCC-.*-Metrics:.*(....)=many"         "90+/DCC-%1"
 spam "X-Spam-Status: Yes"                     "90+/SA"
 spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM"
 set spam_separator=", "

    -If then a message is received that DCC registered with -“many” hits under the “Fuz2” checksum, and -that PureMessage registered with a 97% probability of being spam, that -message's spam tag would read 90+/DCC-Fuz2, -97/PM. (The four characters before “=many” in a -DCC report indicate the checksum used — in this case, -“Fuz2”.) -

    -If the $spam_separator variable is -unset, then each spam pattern match supersedes the previous one. Instead -of getting joined format strings, you'll get only -the last one to match. +If then a message is received that DCC registered with “many” hits +under the “Fuz2” checksum, and that PureMessage registered with a +97% probability of being spam, that message's spam tag would read +90+/DCC-Fuz2, 97/PM. (The four characters before “=many” in a +DCC report indicate the checksum used — in this case, “Fuz2”.) +

    +If the $spam_separator variable is unset, then each +spam pattern match supersedes the previous one. Instead of getting +joined format strings, you'll get only the last one to match.

    The spam tag is what will be displayed in the index when you use -%H in the $index_format variable. It's also the -string that the ~H pattern-matching expression -matches against for <search> and -<limit> functions. And it's what sorting by -spam attribute will use as a sort key. +%H in the $index_format variable. It's also the +string that the ˜H pattern-matching expression matches against for +<search> and <limit> functions. And it's what sorting by spam +attribute will use as a sort key.

    That's a pretty complicated example, and most people's actual environments will have only one spam filter. The simpler your configuration, the more effective Mutt can be, especially when it comes to sorting.

    -Generally, when you sort by spam tag, Mutt will sort -lexically — that is, by ordering strings -alphanumerically. However, if a spam tag begins with a number, Mutt will -sort numerically first, and lexically only when two numbers are equal in -value. (This is like UNIX's sort -n.) A message with -no spam attributes at all — that is, one that didn't match -any of your spam patterns -— is sorted at lowest priority. Numbers are sorted next, beginning -with 0 and ranging upward. Finally, non-numeric strings are sorted, with -“a” taking lower priority than “z”. Clearly, -in general, sorting by spam tags is most effective when you can coerce -your filter to give you a raw number. But in case you can't, Mutt can -still do something useful. -

    -The nospam command can be used to write exceptions to -spam patterns. If a header pattern matches something -in a spam command, but you nonetheless do not want it -to receive a spam tag, you can list a more precise pattern under a -nospam command. -

    -If the pattern given to nospam -is exactly the same as the pattern on an existing -spam list entry, the effect will be to remove the -entry from the spam list, instead of adding an exception. Likewise, if -the pattern for a spam command -matches an entry on the nospam list, that nospam -entry will be removed. If the pattern for -nospam is “*”, all entries on -both lists will be removed. This might be the default action -if you use spam and nospam in -conjunction with a folder-hook. -

    -You can have as many spam or -nospam commands as you like. You can even do your -own primitive spam detection within Mutt — for -example, if you consider all mail from MAILER-DAEMON -to be spam, you can use a spam command like this: +Generally, when you sort by spam tag, Mutt will sort lexically — +that is, by ordering strings alphanumerically. However, if a spam tag +begins with a number, Mutt will sort numerically first, and lexically +only when two numbers are equal in value. (This is like UNIX's +sort -n.) A message with no spam attributes at all — that is, one +that didn't match any of your spam patterns — is sorted at +lowest priority. Numbers are sorted next, beginning with 0 and ranging +upward. Finally, non-numeric strings are sorted, with “a” taking lower +priority than “z”. Clearly, in general, sorting by spam tags is most +effective when you can coerce your filter to give you a raw number. But +in case you can't, Mutt can still do something useful. +

    +The nospam command can be used to write exceptions to spam +patterns. If a header pattern matches something in a spam command, +but you nonetheless do not want it to receive a spam tag, you can list a +more precise pattern under a nospam command. +

    +If the pattern given to nospam is exactly the same as the +pattern on an existing spam list entry, the effect will be to +remove the entry from the spam list, instead of adding an exception. +Likewise, if the pattern for a spam command matches an entry +on the nospam list, that nospam entry will be removed. If the +pattern for nospam is “*”, all entries on both lists +will be removed. This might be the default action if you use spam +and nospam in conjunction with a folder-hook. +

    +You can have as many spam or nospam commands as you like. +You can even do your own primitive spam detection within Mutt — for +example, if you consider all mail from MAILER-DAEMON to be spam, +you can use a spam command like this: 

     spam "^From: .*MAILER-DAEMON"       "999"
-

    26. Setting and Querying Variables

    26.1. Variable Types

    +

    26. Setting and Querying Variables

    26.1. Variable Types

    Mutt supports these types of configuration variables:

    boolean

    -A boolean expression, either “yes” or “no”. +A boolean expression, either “yes” or “no”.

    number

    A signed integer number in the range -32768 to 32767.

    string

    Arbitrary text.

    path

    A specialized string for representing paths including support for -mailbox shortcuts (see Section 8, “Mailbox Shortcuts”) as well as tilde -(“~”) for a user's home directory and more. +mailbox shortcuts (see Section 7, “Mailbox Shortcuts”) as well as tilde +(“˜”) for a user's home directory and more.

    quadoption

    -Like a boolean but triggers a prompt when set to “ask-yes” -or “ask-no” with “yes” and “no” +Like a boolean but triggers a prompt when set to “ask-yes” +or “ask-no” with “yes” and “no” preselected respectively.

    sort order

    A specialized string allowing only particular words as values depending on the variable.

    regular expression

    -A regular expression, see Section 2, “Regular Expressions” for an introduction. +A regular expression, see Section 1, “Regular Expressions” for an introduction.

    folder magic

    Specifies the type of folder to use: mbox, -mmdf, mh or -maildir. Currently only used to determine the type -for newly created folders. +mmdf, mh +or maildir. +Currently only used to determine the type for newly created folders.

    e-mail address

    -An e-mail address either with or without realname. The older -“user@example.org (Joe User)” form is -supported but strongly deprecated. +An e-mail address either with or without +realname. The older “user@example.org (Joe User)” +form is supported but strongly deprecated.

    user-defined

    -Arbitrary text, see Section 26.3, “User-Defined Variables” for details. -

    26.2. Commands

    +Arbitrary text, see Section 26.3, “User-Defined Variables” for details. +

    26.2. Commands

    The following commands are available to manipulate and query variables:

    Usage:

    set { [ no | inv ] @@ -1937,85 +1825,81 @@ [ variable ...]

    -This command is used to set (and unset) configuration variables. There are four -basic types of variables: boolean, number, string and quadoption. -boolean variables can be set -(true) or unset (false). -number variables can be assigned a positive integer -value. string variables consist of any number of -printable characters and must be enclosed in quotes if they contain -spaces or tabs. You may also use the escape sequences “\n” -and “\t” for newline and tab, respectively. -quadoption variables are used to control whether or -not to be prompted for certain actions, or to specify a default action. -A value of yes will cause the action to be carried -out automatically as if you had answered yes to the question. -Similarly, a value of no will cause the action to -be carried out as if you had answered “no.” A value of -ask-yes will cause a prompt with a default answer -of “yes” and ask-no will provide a -default answer of “no.” -

    -Prefixing a variable with “no” will unset it. Example: -set noaskbcc. -

    -For boolean variables, you may optionally prefix -the variable name with inv to toggle the value (on or -off). This is useful when writing macros. Example: -set invsmart_wrap. -

    -The toggle command automatically prepends the -inv prefix to all specified variables. -

    -The unset command automatically prepends the -no prefix to all specified variables. -

    -Using the <enter-command> function in the -index menu, you can query the value of a variable -by prefixing the name of the variable with a question mark: +This command is used to set (and unset) configuration variables. There are four basic types of variables: +boolean, number, string and quadoption. boolean variables can be +set (true) or unset (false). number variables can be +assigned a positive integer value. +string variables consist of any number of printable characters and +must be enclosed in quotes if they contain spaces or tabs. You +may also use the escape sequences “\n” and “\t” for newline and tab, respectively. +quadoption variables are used to control whether or not to be prompted +for certain actions, or to specify a default action. A value of yes +will cause the action to be carried out automatically as if you had answered +yes to the question. Similarly, a value of no will cause the +action to be carried out as if you had answered “no.” A value of +ask-yes will cause a prompt with a default answer of “yes” and +ask-no will provide a default answer of “no.” +

    +Prefixing a variable with “no” will unset it. Example: set noaskbcc. +

    +For boolean variables, you may optionally prefix the variable name with +inv to toggle the value (on or off). This is useful when writing +macros. Example: set invsmart_wrap. +

    +The toggle command automatically prepends the inv prefix to all +specified variables. +

    +The unset command automatically prepends the no prefix to all +specified variables. +

    +Using the <enter-command> function in the index menu, you can query the +value of a variable by prefixing the name of the variable with a question +mark: 

     set ?allow_8bit

    The question mark is actually only required for boolean and quadoption variables.

    -The reset command resets all given variables to the -compile time defaults (hopefully mentioned in this manual). If you use -the command set and prefix the variable with -“&” this has the same behavior as the -reset command. -

    -With the reset command there exists the special -variable “all”, which allows you to reset all variables to -their system defaults. -

    26.3. User-Defined Variables

    26.3.1. Introduction

    -Along with the variables listed in the Configuration variables section, Mutt -supports user-defined variables with names starting with -my_ as in, for example, my_cfgdir. -

    -The set command either creates a custom -my_ variable or changes its value if it does exist -already. The unset and reset +The reset command resets all given variables to the compile time +defaults (hopefully mentioned in this manual). If you use the command +set and prefix the variable with “&” this has the same +behavior as the reset command. +

    +With the reset command there exists the special variable “all”, +which allows you to reset all variables to their system defaults. +

    26.3. User-Defined Variables

    26.3.1. Introduction

    +Along with the variables listed in the +Configuration variables section, Mutt +supports user-defined variables with names starting +with my_ as in, for +example, my_cfgdir. +

    +The set command either creates a +custom my_ variable or changes its +value if it does exist already. The unset and reset commands remove the variable entirely.

    Since user-defined variables are expanded in the same way that -environment variables are (except for the shell-escape command and backtick -expansion), this feature can be used to make configuration files more -readable. -

    26.3.2. Examples

    -The following example defines and uses the variable -my_cfgdir to abbreviate the calls of the source command: +environment variables are (except for +the shell-escape command and +backtick expansion), this feature can be used to make configuration +files more readable. +

    26.3.2. Examples

    +The following example defines and uses the variable my_cfgdir +to abbreviate the calls of the source command:

    Example 3.15. Using user-defined variables for config file readability

     set my_cfgdir = $HOME/mutt/config
 
 source $my_cfgdir/hooks
 source $my_cfgdir/macros
-# more source commands...
+# more source commands...

    A custom variable can also be used in macros to backup the current value -of another variable. In the following example, the value of the $delete is changed temporarily while its -original value is saved as my_delete. After the -macro has executed all commands, the original value of $delete is restored. +of another variable. In the following example, the value of the +$delete is changed temporarily +while its original value is saved as my_delete. +After the macro has executed all commands, the original value of $delete is restored.

    Example 3.16. Using user-defined variables for backing up other config option values

     macro pager ,x '\
 <enter-command>set my_delete=$delete<enter>\
@@ -2025,9 +1909,9 @@

    Since Mutt expands such values already when parsing the configuration file(s), the value of $my_delete in the -last example would be the value of $delete exactly +last example would be the value of $delete exactly as it was at that point during parsing the configuration file. If -another statement would change the value for $delete +another statement would change the value for $delete later in the same or another file, it would have no effect on $my_delete. However, the expansion can be deferred to runtime, as shown in the next example, when escaping the @@ -2039,123 +1923,81 @@ <enter-command> set pager_stop=\$my_old_pager_stop<Enter>\ <enter-command> unset my_old_pager_stop<Enter>"


    -Note that there is a space between -<enter-command> and the set -configuration command, preventing Mutt from recording the -macro's commands into its history. -

    26.4. Type Conversions

    -Variables are always assigned string values which Mutt parses into its -internal representation according to the type of the variable, for -example an integer number for numeric types. For all queries (including -$-expansion) the value is converted from its internal type back into -string. As a result, any variable can be assigned any value given that -its content is valid for the target. This also counts for custom -variables which are of type string. In case of parsing errors, Mutt will -print error messages. Example 3.18, “Type conversions using variables” demonstrates type -conversions. -

    Example 3.18. Type conversions using variables

    -set my_lines = "5"                # value is string "5"
-set pager_index_lines = $my_lines # value is integer 5
-
-set my_sort = "date-received"     # value is string "date-received"
-set sort = "last-$my_sort"        # value is sort last-date-received
-
-set my_inc = $read_inc            # value is string "10" (default of $read_inc)
-set my_foo = $my_inc              # value is string "10"
-

    -These assignments are all valid. If, however, the value of -$my_lines would have been -“five” (or something else that cannot be parsed into a -number), the assignment to -$pager_index_lines would have -produced an error message. -

    -Type conversion applies to all configuration commands which take -arguments. But please note that every expanded value of a variable is -considered just a single token. A working example is: -

    -set my_pattern = "~A"
-set my_number = "10"
-
-# same as: score ~A +10
-score $my_pattern +$my_number

    -What does not work is: -

    -set my_mx = "+mailbox1 +mailbox2"
-mailboxes $my_mx +mailbox3

    -because the value of $my_mx is interpreted as a -single mailbox named “+mailbox1 +mailbox2” and not two -distinct mailboxes. -

    27. Reading Initialization Commands From Another File

    Usage:

    source +Note that there is a space +between <enter-command> and +the set configuration command, preventing Mutt from +recording the macro's commands into its history. +

    27. Reading Initialization Commands From Another File

    Usage:

    source filename

    -This command allows the inclusion of initialization commands from other -files. For example, I place all of my aliases in -~/.mail_aliases so that I can make my -~/.muttrc readable and keep my aliases private. -

    -If the filename begins with a tilde (“~”), it will be -expanded to the path of your home directory. -

    -If the filename ends with a vertical bar (“|”), then -filename is considered to be an executable program -from which to read input (e.g. source -~/bin/myscript|). -

    28. Removing Hooks

    Usage:

    unhook { +This command allows the inclusion of initialization commands +from other files. For example, I place all of my aliases in +˜/.mail_aliases so that I can make my +˜/.muttrc readable and keep my aliases private. +

    +If the filename begins with a tilde (“˜”), it will be expanded to the +path of your home directory. +

    +If the filename ends with a vertical bar (“|”), then filename is +considered to be an executable program from which to read input (eg. +source ˜/bin/myscript|). +

    28. Removing Hooks

    Usage:

    unhook { * | hook-type }

    This command permits you to flush hooks you have previously defined. -You can either remove all hooks by giving the “*” character -as an argument, or you can remove all hooks of a specific type by saying +You can either remove all hooks by giving the “*” character as an +argument, or you can remove all hooks of a specific type by saying something like unhook send-hook. -

    29. Format Strings

    29.1. Basic usage

    +

    29. Format Strings

    29.1. Basic usage

    Format strings are a general concept you'll find in several locations -through the Mutt configuration, especially in the $index_format, $pager_format, $status_format, and other related -variables. These can be very straightforward, and it's quite possible -you already know how to use them. -

    -The most basic format string element is a percent symbol followed by -another character. For example, %s represents a -message's Subject: header in the $index_format variable. The -“expandos” available are documented with each format -variable, but there are general modifiers available with all formatting -expandos, too. Those are our concern here. -

    -Some of the modifiers are borrowed right out of C (though you might know -them from Perl, Python, shell, or another language). These are the -[-]m.n modifiers, as in -%-12.12s. As with such programming languages, these -modifiers allow you to specify the minimum and maximum size of the -resulting string, as well as its justification. If the “-” -sign follows the percent, the string will be left-justified instead of -right-justified. If there's a number immediately following that, it's -the minimum amount of space the formatted string will occupy — if -it's naturally smaller than that, it will be padded out with spaces. If -a decimal point and another number follow, that's the maximum space -allowable — the string will not be permitted to exceed that width, -no matter its natural size. Each of these three elements is optional, so -that all these are legal format strings: %-12s, -%4c, %.15F and -%-12.15L. +through the Mutt configuration, especially in the +$index_format, +$pager_format, +$status_format, +and other related variables. These can be very straightforward, +and it's quite possible you already know how to use them. +

    +The most basic format string element is a percent symbol followed +by another character. For example, %s +represents a message's Subject: header in the $index_format variable. The +“expandos” available are documented with each format variable, but +there are general modifiers available with all formatting expandos, +too. Those are our concern here. +

    +Some of the modifiers are borrowed right out of C (though you might +know them from Perl, Python, shell, or another language). These are +the [-]m.n modifiers, as in %-12.12s. As with +such programming languages, these modifiers allow you to specify the +minimum and maximum size of the resulting string, as well as its +justification. If the “-” sign follows the percent, the string will +be left-justified instead of right-justified. If there's a number +immediately following that, it's the minimum amount of space the +formatted string will occupy — if it's naturally smaller than that, it +will be padded out with spaces. If a decimal point and another number +follow, that's the maximum space allowable — the string will not be +permitted to exceed that width, no matter its natural size. Each of +these three elements is optional, so that all these are legal format +strings: %-12s, %4c, +%.15F and %-12.15L.

    Mutt adds some other modifiers to format strings. If you use an equals symbol (=) as a numeric prefix (like the minus -above), it will force the string to be centered within its minimum space -range. For example, %=14y will reserve 14 characters -for the %y expansion — that's the X-Label: header, in $index_format. If the expansion results in -a string less than 14 characters, it will be centered in a 14-character -space. If the X-Label for a message were “test”, that -expansion would look like -“     test     ”. +above), it will force the string to be centered within its minimum +space range. For example, %=14y will reserve 14 +characters for the %y expansion — that's the X-Label: header, in +$index_format. If the expansion +results in a string less than 14 characters, it will be centered in a +14-character space. If the X-Label for a message were “test”, that +expansion would look like “     test     ”.

    There are two very little-known modifiers that affect the way that an -expando is replaced. If there is an underline (“_”) -character between any format modifiers (as above) and the expando -letter, it will expands in all lower case. And if you use a colon -(“:”), it will replace all decimal points with underlines. -

    29.2. Conditionals

    +expando is replaced. If there is an underline (“_”) character +between any format modifiers (as above) and the expando letter, it will +expands in all lower case. And if you use a colon (“:”), it will +replace all decimal points with underlines. +

    29.2. Conditionals

    Depending on the format string variable, some of its sequences can be used to optionally print a string if their value is nonzero. For example, you may only want to see the number of flagged messages if such @@ -2165,50 +2007,55 @@ 

     %?<sequence_char>?<optional_string>?

    where sequence_char is an expando, and -optional_string is the string you would like -printed if sequence_char is nonzero. -optional_string may contain other sequences as well -as normal text, but you may not nest optional strings. +optional_string is the string you would like printed if +sequence_char is nonzero. +optional_string may contain other +sequences as well as normal text, but you may not nest optional +strings.

    Here is an example illustrating how to optionally print the number of -new messages in a mailbox in $status_format: +new messages in a mailbox in +$status_format: 

     %?n?%n new messages.?

    You can also switch between two strings using the following construct: 

     %?<sequence_char>?<if_string>&<else_string>?

    -If the value of sequence_char is non-zero, -if_string will be expanded, otherwise -else_string will be expanded. -

    29.3. Filters

    -Any format string ending in a vertical bar (“|”) will be -expanded and piped through the first word in the string, using spaces as -separator. The string returned will be used for display. If the -returned string ends in %, it will be passed through the formatter a -second time. This allows the filter to generate a replacement format -string including % expandos. -

    -All % expandos in a format string are expanded before the script is -called so that: -

    Example 3.19. Using external filters in format strings

    +If the value of sequence_char is
+non-zero, if_string will be expanded,
+otherwise else_string will be expanded.
+

    29.3. Filters

    +Any format string ending in a vertical bar (“|”) will be +expanded and piped through the first word in the string, using spaces +as separator. The string returned will be used for display. +If the returned string ends in %, it will be passed through +the formatter a second time. This allows the filter to generate a +replacement format string including % expandos. +

    +All % expandos in a format string are expanded before the script +is called so that: +

    Example 3.18. Using external filters in format strings

     set status_format="script.sh '%r %f (%L)'|"

    -will make Mutt expand %r, %f and -%L before calling the script. The example also shows -that arguments can be quoted: the script will receive the expanded -string between the single quotes as the only argument. -

    -A practical example is the mutt_xtitle script -installed in the samples subdirectory of the Mutt -documentation: it can be used as filter for $status_format to set the current +will make Mutt expand %r, +%f and %L +before calling the script. The example also shows that arguments can be +quoted: the script will receive the expanded string between the single quotes +as the only argument. +

    +A practical example is the mutt_xtitle +script installed in the samples +subdirectory of the Mutt documentation: it can be used as filter for +$status_format to set the current terminal's title, if supported. -

    29.4. Padding

    +

    29.4. Padding

    In most format strings, Mutt supports different types of padding using special %-expandos:

    %|X

    -When this occurs, Mutt will fill the rest of the line with the character -X. For example, filling the rest of the line with -dashes is done by setting: +When this occurs, Mutt will fill the rest of the +line with the character X. For +example, filling the rest of the line with dashes is +done by setting: 

     set status_format = "%v on %h: %B: %?n?%n&no? new messages %|-"
    %>X @@ -2225,133 +2072,72 @@

    Normal right-justification will print everything to the left of the %>, displaying padding and whatever lies to the -right only if there's room. By contrast, “soft-fill” gives +right only if there's room. By contrast, “soft-fill” gives priority to the right-hand side, guaranteeing space to display it and showing padding only if there's still room. If necessary, soft-fill will eat text leftwards to make room for rightward text. For example, to right-justify the subject making sure as much as possible of it fits on -screen, one might use (note two spaces after %* : the -second ensures there's a space between the truncated right-hand side and -the subject): -

    -set index_format="%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?)%*  %s"

    Chapter 4. Advanced Usage

    Table of Contents

    1. Character Set Handling
    2. Regular Expressions
    3. Patterns: Searching, Limiting and Tagging
    3.1. Pattern Modifier
    3.2. Simple Searches
    3.3. Nesting and Boolean Operators
    3.4. Searching by Date
    4. Using Tags
    5. Using Hooks
    5.1. Message Matching in Hooks
    6. External Address Queries
    7. Mailbox Formats
    8. Mailbox Shortcuts
    9. Handling Mailing Lists
    10. New Mail Detection
    10.1. How New Mail Detection Works
    10.2. Polling For New Mail
    11. Editing Threads
    11.1. Linking Threads
    11.2. Breaking Threads
    12. Delivery Status Notification (DSN) Support
    13. Start a WWW Browser on URLs
    14. Miscellany

    1. Character Set Handling

    -A “character set” is basically a mapping between bytes and -glyphs and implies a certain character encoding scheme. For example, for -the ISO 8859 family of character sets, an encoding of 8bit per character -is used. For the Unicode character set, different character encodings -may be used, UTF-8 being the most popular. In UTF-8, a character is -represented using a variable number of bytes ranging from 1 to 4. -

    -Since Mutt is a command-line tool run from a shell, and delegates -certain tasks to external tools (such as an editor for composing/editing -messages), all of these tools need to agree on a character set and -encoding. There exists no way to reliably deduce the character set a -plain text file has. Interoperability is gained by the use of -well-defined environment variables. The full set can be printed by -issuing locale on the command line. -

    -Upon startup, Mutt determines the character set on its own using -routines that inspect locale-specific environment variables. Therefore, -it is generally not necessary to set the $charset -variable in Mutt. It may even be counter-productive as Mutt uses system -and library functions that derive the character set themselves and on -which Mutt has no influence. It's safest to let Mutt work out the locale -setup itself. -

    -If you happen to work with several character sets on a regular basis, -it's highly advisable to use Unicode and an UTF-8 locale. Unicode can -represent nearly all characters in a message at the same time. When not -using a Unicode locale, it may happen that you receive messages with -characters not representable in your locale. When displaying such a -message, or replying to or forwarding it, information may get lost -possibly rendering the message unusable (not only for you but also for -the recipient, this breakage is not reversible as lost information -cannot be guessed). -

    -A Unicode locale makes all conversions superfluous which eliminates the -risk of conversion errors. It also eliminates potentially wrong -expectations about the character set between Mutt and external programs. -

    -The terminal emulator used also must be properly configured for the -current locale. Terminal emulators usually do not -derive the locale from environment variables, they need to be configured -separately. If the terminal is incorrectly configured, Mutt may display -random and unexpected characters (question marks, octal codes, or just -random glyphs), format strings may not work as expected, you may not be -abled to enter non-ascii characters, and possible more. Data is always -represented using bytes and so a correct setup is very important as to -the machine, all character sets “look” the same. -

    -Warning: A mismatch between what system and library functions think the -locale is and what Mutt was told what the locale is may make it behave -badly with non-ascii input: it will fail at seemingly random places. -This warning is to be taken seriously since not only local mail handling -may suffer: sent messages may carry wrong character set information the -receiver has too deal with. The need to set -$charset directly in most cases points at terminal -and environment variable setup problems, not Mutt problems. -

    -A list of officially assigned and known character sets can be found at -IANA, -a list of locally supported locales can be obtained by running -locale -a. -

    2. Regular Expressions

    -All string patterns in Mutt including those in more complex patterns must be specified using regular -expressions (regexp) in the “POSIX extended” syntax (which +screen, one might use (note two spaces after %* +: the second ensures there's a space between the truncated +right-hand side and the subject): +

    +set index_format="%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?)%*  %s"

    Chapter 4. Advanced Usage

    Table of Contents

    1. Regular Expressions
    2. Patterns: Searching, Limiting and Tagging
    2.1. Pattern Modifier
    2.2. Simple Searches
    2.3. Nesting and Boolean Operators
    2.4. Searching by Date
    3. Using Tags
    4. Using Hooks
    4.1. Message Matching in Hooks
    5. External Address Queries
    6. Mailbox Formats
    7. Mailbox Shortcuts
    8. Handling Mailing Lists
    9. Handling multiple folders
    10. Editing Threads
    10.1. Linking Threads
    10.2. Breaking Threads
    11. Delivery Status Notification (DSN) Support
    12. Start a WWW Browser on URLs
    13. Miscellany

    1. Regular Expressions

    +All string patterns in Mutt including those in more complex +patterns must be specified +using regular expressions (regexp) in the “POSIX extended” syntax (which is more or less the syntax used by egrep and GNU awk). For your convenience, we have included below a brief description of this syntax.

    The search is case sensitive if the pattern contains at least one upper case letter, and case insensitive otherwise. -

    Note

    -“\” must be quoted if used for a regular expression in an -initialization command: “\\”. +

    Note

    +“\” +must be quoted if used for a regular expression in an initialization +command: “\\”.

    A regular expression is a pattern that describes a set of strings. Regular expressions are constructed analogously to arithmetic expressions, by using various operators to combine smaller expressions. -

    Note

    -The regular expression can be enclosed/delimited by either " or ' which -is useful if the regular expression includes a white-space character. -See Syntax of Initialization Files for more information on " and ' -delimiter processing. To match a literal " or ' you must preface it -with \ (backslash). +

    Note

    +The regular expression can be enclosed/delimited by either " +or ' which is useful if the regular expression includes a white-space +character. See Syntax of Initialization Files +for more information on " and ' delimiter processing. To match a +literal " or ' you must preface it with \ (backslash).

    -The fundamental building blocks are the regular expressions that match a -single character. Most characters, including all letters and digits, +The fundamental building blocks are the regular expressions that match +a single character. Most characters, including all letters and digits, are regular expressions that match themselves. Any metacharacter with special meaning may be quoted by preceding it with a backslash.

    -The period “.” matches any single character. The caret -“^” and the dollar sign “$” are metacharacters -that respectively match the empty string at the beginning and end of a -line. -

    -A list of characters enclosed by “[” and “]” -matches any single character in that list; if the first character of the -list is a caret “^” then it matches any character -not in the list. For example, the regular -expression [0123456789] matches any single digit. -A range of ASCII characters may be specified by giving the first and -last characters, separated by a hyphen “-”. Most -metacharacters lose their special meaning inside lists. To include a -literal “]” place it first in the list. Similarly, to -include a literal “^” place it anywhere but first. -Finally, to include a literal hyphen “-” place it last. +The period “.” matches any single character. The caret “^” and +the dollar sign “$” are metacharacters that respectively match +the empty string at the beginning and end of a line. +

    +A list of characters enclosed by “[” and “]” matches any +single character in that list; if the first character of the list +is a caret “^” then it matches any character not in the +list. For example, the regular expression [0123456789] +matches any single digit. A range of ASCII characters may be specified +by giving the first and last characters, separated by a hyphen +“-”. Most metacharacters lose their special meaning inside +lists. To include a literal “]” place it first in the list. +Similarly, to include a literal “^” place it anywhere but first. +Finally, to include a literal hyphen “-” place it last.

    Certain named classes of characters are predefined. Character classes -consist of “[:”, a keyword denoting the class, and -“:]”. The following classes are defined by the POSIX -standard in -Table 4.1, “POSIX regular expression character classes” -

    Table 4.1. POSIX regular expression character classes

    Character classDescription
    [:alnum:]Alphanumeric characters
    [:alpha:]Alphabetic characters
    [:blank:]Space or tab characters
    [:cntrl:]Control characters
    [:digit:]Numeric characters
    [:graph:]Characters that are both printable and visible. (A space is printable, but not visible, while an “a” is both)
    [:lower:]Lower-case alphabetic characters
    [:print:]Printable characters (characters that are not control characters)
    [:punct:]Punctuation characters (characters that are not letter, digits, control characters, or space characters)
    [:space:]Space characters (such as space, tab and formfeed, to name a few)
    [:upper:]Upper-case alphabetic characters
    [:xdigit:]Characters that are hexadecimal digits

    +consist of “[:”, a keyword denoting the class, and “:]”. +The following classes are defined by the POSIX standard in +Table 4.1, “POSIX regular expression character classes” +

    Table 4.1. POSIX regular expression character classes

    Character classDescription
    [:alnum:]Alphanumeric characters
    [:alpha:]Alphabetic characters
    [:blank:]Space or tab characters
    [:cntrl:]Control characters
    [:digit:]Numeric characters
    [:graph:]Characters that are both printable and visible. (A space is printable, but not visible, while an “a” is both)
    [:lower:]Lower-case alphabetic characters
    [:print:]Printable characters (characters that are not control characters)
    [:punct:]Punctuation characters (characters that are not letter, digits, control characters, or space characters)
    [:space:]Space characters (such as space, tab and formfeed, to name a few)
    [:upper:]Upper-case alphabetic characters
    [:xdigit:]Characters that are hexadecimal digits

    A character class is only valid in a regular expression inside the brackets of a character list. -

    Note

    -Note that the brackets in these class names are part of the symbolic -names, and must be included in addition to the brackets delimiting the -bracket list. For example, [[:digit:]] is -equivalent to [0-9]. +

    Note

    +Note that the brackets in these +class names are part of the symbolic names, and must be included +in addition to the brackets delimiting the bracket list. For +example, [[:digit:]] is equivalent to +[0-9].

    Two additional special sequences can appear in character lists. These apply to non-ASCII character sets, which can have single symbols (called @@ -2360,295 +2146,277 @@ sorting purposes:

    Collating Symbols

    A collating symbol is a multi-character collating element enclosed in -“[.” and “.]”. For example, if -“ch” is a collating element, then -[[.ch.]] is a regexp that matches this collating -element, while [ch] is a regexp that matches either -“c” or “h”. +“[.” and “.]”. For example, if “ch” is a collating +element, then [[.ch.]] is a regexp that matches +this collating element, while [ch] is a regexp that +matches either “c” or “h”.

    Equivalence Classes

    -An equivalence class is a locale-specific name for a list of characters -that are equivalent. The name is enclosed in “[=” and -“=]”. For example, the name “e” might be used -to represent all of “e” with grave -(“è”), “e” with acute -(“é”) and “e”. In this case, -[[=e=]] is a regexp that matches any of: -“e” with grave (“è”), “e” -with acute (“é”) and “e”. +An equivalence class is a locale-specific name for a list of +characters that are equivalent. The name is enclosed in “[=” +and “=]”. For example, the name “e” might be used to +represent all of “è” “é” and “e”. In this case, +[[=e=]] is a regexp that matches any of +“è”, “é” and “e”.

    A regular expression matching a single character may be followed by one -of several repetition operators described in Table 4.2, “Regular expression repetition operators”. +of several repetition operators described in Table 4.2, “Regular expression repetition operators”.

    Table 4.2. Regular expression repetition operators

    OperatorDescription
    ?The preceding item is optional and matched at most once
    *The preceding item will be matched zero or more times
    +The preceding item will be matched one or more times
    {n}The preceding item is matched exactly n times
    {n,}The preceding item is matched n or more times
    {,m}The preceding item is matched at most m times
    {n,m}The preceding item is matched at least n times, but no more than m times

    Two regular expressions may be concatenated; the resulting regular expression matches any string formed by concatenating two substrings that respectively match the concatenated subexpressions.

    -Two regular expressions may be joined by the infix operator -“|”; the resulting regular expression matches any string -matching either subexpression. +Two regular expressions may be joined by the infix operator “|”; +the resulting regular expression matches any string matching either +subexpression.

    Repetition takes precedence over concatenation, which in turn takes precedence over alternation. A whole subexpression may be enclosed in parentheses to override these precedence rules. -

    Note

    +

    Note

    If you compile Mutt with the included regular expression engine, the -following operators may also be used in regular expressions as described -in Table 4.3, “GNU regular expression extensions”. +following operators may also be used in regular expressions as described in Table 4.3, “GNU regular expression extensions”.

    Table 4.3. GNU regular expression extensions

    ExpressionDescription
    \\yMatches the empty string at either the beginning or the end of a word
    \\BMatches the empty string within a word
    \\<Matches the empty string at the beginning of a word
    \\>Matches the empty string at the end of a word
    \\wMatches any word-constituent character (letter, digit, or underscore)
    \\WMatches any character that is not word-constituent
    \\`Matches the empty string at the beginning of a buffer (string)
    \\'Matches the empty string at the end of a buffer

    Please note however that these operators are not defined by POSIX, so they may or may not be available in stock libraries on various systems. -

    3. Patterns: Searching, Limiting and Tagging

    3.1. Pattern Modifier

    +

    2. Patterns: Searching, Limiting and Tagging

    2.1. Pattern Modifier

    Many of Mutt's commands allow you to specify a pattern to match (limit, tag-pattern, -delete-pattern, etc.). Table 4.4, “Pattern modifiers” +delete-pattern, etc.). Table 4.4, “Pattern modifiers” shows several ways to select messages. -

    Table 4.4. Pattern modifiers

    Pattern modifierDescription
    ~Aall messages
    ~b EXPRmessages which contain EXPR in the message body
    =b STRINGmessages which contain STRING in the message body. If IMAP is enabled, searches for STRING on the server, rather than downloading each message and searching it locally.
    ~B EXPRmessages which contain EXPR in the whole message
    ~c EXPRmessages carbon-copied to EXPR
    %c GROUPmessages carbon-copied to any member of GROUP
    ~C EXPRmessages either to: or cc: EXPR
    %C GROUPmessages either to: or cc: to any member of GROUP
    ~d [MIN]-[MAX]messages with “date-sent” in a Date range
    ~Ddeleted messages
    ~e EXPRmessages which contains EXPR in the “Sender” field
    %e GROUPmessages which contain a member of GROUP in the “Sender” field
    ~Eexpired messages
    ~Fflagged messages
    ~f EXPRmessages originating from EXPR
    %f GROUPmessages originating from any member of GROUP
    ~gcryptographically signed messages
    ~Gcryptographically encrypted messages
    ~h EXPRmessages which contain EXPR in the message header
    ~H EXPRmessages with a spam attribute matching EXPR
    ~i EXPRmessages which match EXPR in the “Message-ID” field
    ~kmessages which contain PGP key material
    ~L EXPRmessages either originated or received by EXPR
    %L GROUPmessage either originated or received by any member of GROUP
    ~lmessages addressed to a known mailing list
    ~m [MIN]-[MAX]messages in the range MIN to MAX *)
    ~n [MIN]-[MAX]messages with a score in the range MIN to MAX *)
    ~Nnew messages
    ~Oold messages
    ~pmessages addressed to you (consults alternates)
    ~Pmessages from you (consults alternates)
    ~Qmessages which have been replied to
    ~r [MIN]-[MAX]messages with “date-received” in a Date range
    ~Rread messages
    ~s EXPRmessages having EXPR in the “Subject” field.
    ~Ssuperseded messages
    ~t EXPRmessages addressed to EXPR
    ~Ttagged messages
    ~umessages addressed to a subscribed mailing list
    ~Uunread messages
    ~vmessages part of a collapsed thread.
    ~Vcryptographically verified messages
    ~x EXPRmessages which contain EXPR in the “References” or “In-Reply-To” field
    ~X [MIN]-[MAX]messages with MIN to MAX attachments *)
    ~y EXPRmessages which contain EXPR in the “X-Label” field
    ~z [MIN]-[MAX]messages with a size in the range MIN to MAX *) **)
    ~=duplicated messages (see $duplicate_threads)
    ~$unreferenced messages (requires threaded view)
    ~(PATTERN)messages in threads +

    Table 4.4. Pattern modifiers

    Pattern modifierDescription
    ~Aall messages
    ~b EXPRmessages which contain EXPR in the message body
    =b STRINGmessages which contain STRING in the message body. If IMAP is enabled, searches for STRING on the server, rather than downloading each message and searching it locally.
    ~B EXPRmessages which contain EXPR in the whole message
    ~c EXPRmessages carbon-copied to EXPR
    %c GROUPmessages carbon-copied to any member of GROUP
    ~C EXPRmessages either to: or cc: EXPR
    %C GROUPmessages either to: or cc: to any member of GROUP
    ~d [MIN]-[MAX]messages with “date-sent” in a Date range
    ~Ddeleted messages
    ~e EXPRmessages which contains EXPR in the “Sender” field
    %e GROUPmessages which contain a member of GROUP in the “Sender” field
    ~Eexpired messages
    ~Fflagged messages
    ~f EXPRmessages originating from EXPR
    %f GROUPmessages originating from any member of GROUP
    ~gcryptographically signed messages
    ~Gcryptographically encrypted messages
    ~h EXPRmessages which contain EXPR in the message header
    ~H EXPRmessages with a spam attribute matching EXPR
    ~i EXPRmessages which match EXPR in the “Message-ID” field
    ~kmessages which contain PGP key material
    ~L EXPRmessages either originated or received by EXPR
    %L GROUPmessage either originated or received by any member of GROUP
    ~lmessages addressed to a known mailing list
    ~m [MIN]-[MAX]messages in the range MIN to MAX *)
    ~n [MIN]-[MAX]messages with a score in the range MIN to MAX *)
    ~Nnew messages
    ~Oold messages
    ~pmessages addressed to you (consults alternates)
    ~Pmessages from you (consults alternates)
    ~Qmessages which have been replied to
    ~r [MIN]-[MAX]messages with “date-received” in a Date range
    ~Rread messages
    ~s EXPRmessages having EXPR in the “Subject” field.
    ~Ssuperseded messages
    ~t EXPRmessages addressed to EXPR
    ~Ttagged messages
    ~umessages addressed to a subscribed mailing list
    ~Uunread messages
    ~vmessages part of a collapsed thread.
    ~Vcryptographically verified messages
    ~x EXPRmessages which contain EXPR in the “References” or “In-Reply-To” field
    ~X [MIN]-[MAX]messages with MIN to MAX attachments *)
    ~y EXPRmessages which contain EXPR in the “X-Label” field
    ~z [MIN]-[MAX]messages with a size in the range MIN to MAX *) **)
    ~=duplicated messages (see $duplicate_threads)
    ~$unreferenced messages (requires threaded view)
    ~(PATTERN)messages in threads containing messages matching PATTERN, e.g. all threads containing messages from you: ~(~P)

    -Where EXPR is a regular expression, and GROUP is an -address group. +Where EXPR is a +regular expression.

    -*) The forms “<[MAX]”, -“>[MIN]”, -“[MIN]-” and -“-[MAX]” are allowed, too. -

    -**) The suffixes “K” and “M” are allowed to -specify kilobyte and megabyte respectively. -

    -Special attention has to be payed when using regular expressions inside -of patterns. Specifically, Mutt's parser for these patterns will strip -one level of backslash (“\”), which is normally used for -quoting. If it is your intention to use a backslash in the regular -expression, you will need to use two backslashes instead -(“\\”). You can force Mutt to treat -EXPR as a simple string instead of a regular -expression by using = instead of ~ in the pattern name. For example, -=b *.* will find all messages that contain the -literal string “*.*”. Simple string matches are less -powerful than regular expressions but can be considerably faster. This -is especially true for IMAP folders, because string matches can be -performed on the server instead of by fetching every message. IMAP -treats =h specially: it must be of the form -“header: substring” and will not partially match header -names. The substring part may be omitted if you simply wish to find -messages containing a particular header without regard to its value. -

    -Patterns matching lists of addresses (notably c, C, p, P and t) match if -there is at least one match in the whole list. If you want to make sure -that all elements of that list match, you need to prefix your pattern -with “^”. This example matches all mails which only has -recipients from Germany. +*) The forms “<[MAX]”, “>[MIN]”, +“[MIN]-” and “-[MAX]” +are allowed, too. +

    +**) The suffixes “K” and “M” are allowed to specify kilobyte and megabyte respectively. +

    +Special attention has to be +payed when using regular expressions inside of patterns. Specifically, +Mutt's parser for these patterns will strip one level of backslash (“\”), +which is normally used for quoting. If it is your intention to use a +backslash in the regular expression, you will need to use two backslashes +instead (“\\”). You can force Mutt to treat EXPR as a simple string +instead of a regular expression by using = instead of ˜ in the +pattern name. For example, =b *.* will find all messages that contain +the literal string “*.*”. Simple string matches are less powerful than +regular expressions but can be considerably faster. This is especially +true for IMAP folders, because string matches can be performed on the +server instead of by fetching every message. IMAP treats =h specially: +it must be of the form “header: substring” and will not partially +match header names. The substring part may be omitted if you simply +wish to find messages containing a particular header without regard to +its value. +

    +Patterns matching lists of addresses (notably c, C, p, P and t) +match if there is at least one match in the whole list. If you want to +make sure that all elements of that list match, you need to prefix your +pattern with “^”. +This example matches all mails which only has recipients from Germany.

    Example 4.1. Matching all addresses in address lists

     ^~C \.de$
-

    3.2. Simple Searches

    -Mutt supports two versions of so called “simple -searches”. These are issued if the query entered for searching, -limiting and similar operations does not seem to contain a valid pattern -modifier (i.e. it does not contain one of these characters: -“~”, “=” or “%”). If the query is -supposed to contain one of these special characters, they must be -escaped by prepending a backslash (“\”). +


    2.2. Simple Searches

    +Mutt supports two versions of so called “simple searches”. These are +issued if the query entered for searching, limiting and similar +operations does not seem to contain a valid pattern modifier (i.e. it does not contain +one of these characters: “˜”, “=” or “%”). If the query is +supposed to contain one of these special characters, they must be escaped +by prepending a backslash (“\”).

    The first type is by checking whether the query string equals -a keyword case-insensitively from Table 4.5, “Simple search keywords”: +a keyword case-insensitively from Table 4.5, “Simple search keywords”: If that is the case, Mutt will use the shown pattern modifier instead. If a keyword would conflict with your search keyword, you need to turn it into a regular expression to avoid matching the keyword table. For -example, if you want to find all messages matching “flag” -(using $simple_search) +example, if you want to find all messages matching “flag” +(using $simple_search) but don't want to match flagged messages, simply search for -“[f]lag”. +“[f]lag”.

    Table 4.5. Simple search keywords

    KeywordPattern modifier
    all~A
    .~A
    ^~A
    del~D
    flag~F
    new~N
    old~O
    repl~Q
    read~R
    tag~T
    unread~U

    -The second type of simple search is to build a complex search pattern -using $simple_search as a -template. Mutt will insert your query properly quoted and search for the -composed complex query. -

    3.3. Nesting and Boolean Operators

    +The second type of simple search is to build a complex search +pattern using $simple_search +as a template. Mutt will insert your query properly quoted and search +for the composed complex query. +

    2.3. Nesting and Boolean Operators

    Logical AND is performed by specifying more than one criterion. For example: 

     ~t mutt ~f elkins

    -would select messages which contain the word “mutt” in the -list of recipients and that have the word -“elkins” in the “From” header field. -

    -Mutt also recognizes the following operators to create more complex -search patterns: -

    • +would select messages which contain the word “mutt” in the list of +recipients and that have the word “elkins” in the “From” header +field. +

      +Mutt also recognizes the following operators to create more complex search +patterns: +

      • ! — logical NOT operator -

      • +

      • | — logical OR operator -

      • +

      • () — logical grouping operator

      -Here is an example illustrating a complex search pattern. This pattern -will select all messages which do not contain “mutt” in the -“To” or “Cc” field and which are from -“elkins”. +Here is an example illustrating a complex search pattern. This pattern will +select all messages which do not contain “mutt” in the “To” or “Cc” +field and which are from “elkins”.

      Example 4.2. Using boolean operators in patterns

       !(~t mutt|~c mutt) ~f elkins

      -Here is an example using white space in the regular expression (note the -“'” and “"” delimiters). For this to match, -the mail's subject must match the “^Junk +From +Me$” and it -must be from either “Jim +Somebody” or “Ed -+SomeoneElse”: -

      -'~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")'
-

      Note

      -If a regular expression contains parenthesis, or a vertical bar ("|"), -you must enclose the expression in double or single -quotes since those characters are also used to separate different parts -of Mutt's pattern language. For example: ~f -"me@(mutt\.org|cs\.hmc\.edu)" Without the quotes, the -parenthesis wouldn't end. This would be separated to two OR'd patterns: -~f me@(mutt\.org and -cs\.hmc\.edu). They are never what you want. -

    3.4. Searching by Date

    -Mutt supports two types of dates, absolute and -relative. -

    3.4.1. Absolute Dates

    -Dates must be in DD/MM/YY format (month and year -are optional, defaulting to the current month and year). An example of -a valid range of dates is: +Here is an example using white space in the regular expression (note +the ' and " delimiters). For this to match, the mail's subject must +match the “^Junk +From +Me$” and it must be from either “Jim +Somebody” +or “Ed +SomeoneElse”: +

    + '~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")'
+

    Note

    +If a regular expression contains parenthesis, or a vertical bar +("|"), you must enclose the expression in double or single quotes since +those characters are also used to separate different parts of Mutt's +pattern language. For example: ~f "me@(mutt\.org|cs\.hmc\.edu)" +Without the quotes, the parenthesis wouldn't end. +This would be separated to two OR'd patterns: ˜f me@(mutt\.org +and cs\.hmc\.edu). They are never what you want. +

    2.4. Searching by Date

    +Mutt supports two types of dates, absolute and relative. +

    2.4.1. Absolute Dates

    +Dates must be in DD/MM/YY format (month and year are +optional, defaulting to the current month and year). An example of a valid +range of dates is: 

     Limit to messages matching: ~d 20/1/95-31/10

    -If you omit the minimum (first) date, and just specify -“-DD/MM/YY”, all messages before the -given date will be selected. If you omit the maximum (second) date, and -specify “DD/MM/YY-”, all messages -after the given date will be selected. If you -specify a single date with no dash (“-”), only messages -sent on the given date will be selected. -

    -You can add error margins to absolute dates. An error margin is a sign -(+ or -), followed by a digit, followed by one of the units in Table 4.6, “Date units”. As a special case, you can replace the sign -by a “*” character, which is equivalent to giving identical -plus and minus error margins. +If you omit the minimum (first) date, and just specify “-DD/MM/YY”, all +messages before the given date will be selected. If you omit the maximum +(second) date, and specify “DD/MM/YY-”, all messages after the given +date will be selected. If you specify a single date with no dash (“-”), +only messages sent on the given date will be selected. +

    +You can add error margins to absolute dates. +An error margin is a sign (+ or -), followed by a digit, followed by +one of the units in Table 4.6, “Date units”. As a special case, you can replace the +sign by a “*” character, which is equivalent to giving identical plus and minus error margins.

    Table 4.6. Date units

    UnitDescription
    yYears
    mMonths
    wWeeks
    dDays

    -Example: To select any messages two weeks around January 15, 2001, you'd -use the following pattern: +Example: To select any messages two weeks around January 15, 2001, +you'd use the following pattern: 

     Limit to messages matching: ~d 15/1/2001*2w
-

    3.4.2. Relative Dates

    -This type of date is relative to the current date, and may be specified -as: -

    • ->offset for messages older than -offset units -

    • -<offset for messages newer than -offset units -

    • -=offset for messages exactly -offset units old +

    2.4.2. Relative Dates

    +This type of date is relative to the current date, and may +be specified as: +

    • +>offset for messages older than offset units +

    • +<offset for messages newer than offset units +

    • +=offset for messages exactly offset units old

    -offset is specified as a positive number with one -of the units from Table 4.6, “Date units”. +offset is specified as a positive number with one of the units from Table 4.6, “Date units”.

    Example: to select messages less than 1 month old, you would use 

     Limit to messages matching: ~d <1m
-

    Note

    +

    Note

    All dates used when searching are relative to the -local time zone, so unless you change the setting -of your $index_format to include a -%[...] format, these are not the -dates shown in the main index. -

    4. Using Tags

    -Sometimes it is desirable to perform an operation on a group of messages -all at once rather than one at a time. An example might be to save -messages to a mailing list to a separate folder, or to delete all -messages with a given subject. To tag all messages matching a pattern, -use the <tag-pattern> function, which is bound -to “shift-T” by default. Or you can select individual -messages by hand using the <tag-message> -function, which is bound to “t” by default. See patterns for Mutt's pattern matching syntax. +local time zone, so unless you change the setting of your $index_format to include a +%[...] format, these are not the dates shown +in the main index. +

    3. Using Tags

    +Sometimes it is desirable to perform an operation on a group of +messages all at once rather than one at a time. An example might be +to save messages to a mailing list to a separate folder, or to +delete all messages with a given subject. To tag all messages +matching a pattern, use the <tag-pattern> function, which is bound to +“shift-T” by default. Or you can select individual messages by +hand using the <tag-message> function, which is bound to “t” by +default. See patterns for Mutt's pattern +matching syntax.

    Once you have tagged the desired messages, you can use the -“tag-prefix” operator, which is the “;” -(semicolon) key by default. When the “tag-prefix” operator -is used, the next operation will be applied to all -tagged messages if that operation can be used in that manner. If the -$auto_tag variable is set, the next -operation applies to the tagged messages automatically, without -requiring the “tag-prefix”. -

    -In macros or push commands, you can use the -<tag-prefix-cond> operator. If there are no -tagged messages, Mutt will “eat” the rest of the macro to -abort it's execution. Mutt will stop “eating” the macro -when it encounters the <end-cond> operator; -after this operator the rest of the macro will be executed as normal. -

    5. Using Hooks

    -A hook is a concept found in many other programs -which allows you to execute arbitrary commands before performing some -operation. For example, you may wish to tailor your configuration based -upon which mailbox you are reading, or to whom you are sending mail. In -the Mutt world, a hook consists of a regular expression or pattern along with a configuration -option/command. See: - -

    • -account-hook -

    • -charset-hook -

    • -crypt-hook -

    • -fcc-hook -

    • -fcc-save-hook -

    • -folder-hook -

    • +“tag-prefix” operator, which is the “;” (semicolon) key by default. +When the “tag-prefix” operator is used, the next operation will +be applied to all tagged messages if that operation can be used in that +manner. If the $auto_tag +variable is set, the next operation applies to the tagged messages +automatically, without requiring the “tag-prefix”. +

      +In macros or push commands, +you can use the <tag-prefix-cond> operator. If there are no tagged +messages, Mutt will “eat” the rest of the macro to abort it's execution. +Mutt will stop “eating” the macro when it encounters the <end-cond> +operator; after this operator the rest of the macro will be executed as +normal. +

    4. Using Hooks

    +A hook is a concept found in many other programs which allows you to +execute arbitrary commands before performing some operation. For example, +you may wish to tailor your configuration based upon which mailbox you are +reading, or to whom you are sending mail. In the Mutt world, a hook +consists of a regular expression or +pattern along with a +configuration option/command. See: + +

    for specific details on each type of hook available. -

    Note

    -If a hook changes configuration settings, these changes remain effective -until the end of the current Mutt session. As this is generally not -desired, a “default” hook needs to be added before all -other hooks of that type to restore configuration defaults. -

    Example 4.3. Specifying a “default” hook

    +
    Note
    
+If a hook changes configuration settings, these changes remain
+effective until the end of the current Mutt session. As this is generally
+not desired, a “default” hook needs to be added before all
+other hooks  of that type to restore configuration defaults.
+
    Example 4.3. Specifying a “default” hook
     send-hook . 'unmy_hdr From:'
 send-hook ~C'^b@b\.b$' my_hdr from: c@c.c
 

    
-In Example 4.3, “Specifying a “default” hook”, by default the value of $from and $realname is not overridden. When sending
-messages either To: or Cc: to <b@b.b>, the
-From: header is changed to <c@c.c>.
-
    5.1. Message Matching in Hooks
    
-Hooks that act upon messages (message-hook,
-reply-hook, send-hook,
-send2-hook, save-hook,
-fcc-hook) are evaluated in a slightly different
-manner. For the other types of hooks, a regular
-expression is sufficient.  But in dealing with messages a finer
-grain of control is needed for matching since for different purposes you
-want to match different criteria.
-
    
-Mutt allows the use of the search
-pattern language for matching messages in hook commands.  This
-works in exactly the same way as it would when
-limiting or searching the
-mailbox, except that you are restricted to those operators which match
-information Mutt extracts from the header of the message (i.e., from,
-to, cc, date, subject, etc.).
+In Example 4.3, “Specifying a default hook”, by default the value of
+$from
+and $realname
+is not overridden. When sending messages either To: or Cc:
+to <b@b.b>, the From: header is changed to
+<c@c.c>.
+
    4.1. Message Matching in Hooks
    
+Hooks that act upon messages (message-hook, reply-hook,
+send-hook, send2-hook, save-hook, fcc-hook) are evaluated in a
+slightly different manner. For the other
+types of hooks, a regular expression is
+sufficient.  But in dealing with messages a finer grain of control is
+needed for matching since for different purposes you want to match
+different criteria.
+
    
+Mutt allows the use of the search pattern
+language for matching messages in hook commands.  This works in
+exactly the same way as it would when limiting or
+searching the mailbox, except that you are restricted to those
+operators which match information Mutt extracts from the header of
+the message (i.e., from, to, cc, date, subject, etc.).
 
    
 For example, if you wanted to set your return address based upon sending
 mail to a specific address, you could do something like:
@@ -2658,20 +2426,21 @@
 which would execute the given command when sending mail to
 me@cs.hmc.edu.
 
    
-However, it is not required that you write the pattern to match using
-the full searching language.  You can still specify a simple
-regular expression like the other hooks, in which
-case Mutt will translate your pattern into the full language, using the
-translation specified by the $default_hook variable.  The pattern is
-translated at the time the hook is declared, so the value of $default_hook that is in effect at that
-time will be used.
-
    6. External Address Queries
    
+However, it is not required that you write the pattern to match using the
+full searching language.  You can still specify a simple regular
+expression like the other hooks, in which case Mutt will translate your
+pattern into the full language, using the translation specified by the
+$default_hook variable.  The
+pattern is translated at the time the hook is declared, so the value of
+$default_hook that is in effect
+at that time will be used.
+

    5. External Address Queries

    Mutt supports connecting to external directory databases such as LDAP, ph/qi, bbdb, or NIS through a wrapper script which connects to Mutt -using a simple interface. Using the $query_command variable, you specify the -wrapper command to use. For example: +using a simple interface. Using the $query_command variable, you specify the wrapper +command to use. For example: 

    -set query_command = "mutt_ldap_query.pl %s"
+set query_command = "mutt_ldap_query.pl '%s'"

    The wrapper script should accept the query on the command-line. It should return a one line message, then each matching response on a @@ -2687,294 +2456,273 @@ roessler@does-not-exist.org Thomas Roessler mutt pgp

    There are two mechanisms for accessing the query function of Mutt. One -is to do a query from the index menu using the -<query> function (default: Q). This will -prompt for a query, then bring up the query menu which will list the -matching responses. From the query menu, you can select addresses to -create aliases, or to mail. You can tag multiple addresses to mail, -start a new query, or have a new query appended to the current +is to do a query from the index menu using the <query> function (default: Q). +This will prompt for a query, then bring up the query menu which will +list the matching responses. From the query menu, you can select +addresses to create aliases, or to mail. You can tag multiple addresses +to mail, start a new query, or have a new query appended to the current responses.

    The other mechanism for accessing the query function is for address completion, similar to the alias completion. In any prompt for address -entry, you can use the <complete-query> -function (default: ^T) to run a query based on the current address you -have typed. Like aliases, Mutt will look for what you have typed back -to the last space or comma. If there is a single response for that -query, Mutt will expand the address in place. If there are multiple -responses, Mutt will activate the query menu. At the query menu, you -can select one or more addresses to be added to the prompt. -

    7. Mailbox Formats

    -Mutt supports reading and writing of four different local mailbox -formats: mbox, MMDF, MH and Maildir. The mailbox type is auto detected, -so there is no need to use a flag for different mailbox types. When -creating new mailboxes, Mutt uses the default specified with the $mbox_type variable. A short description of -the formats follows. -

    -mbox. This is a widely used mailbox format for -UNIX. All messages are stored in a single file. Each message has a -line of the form: +entry, you can use the <complete-query> function (default: ^T) to run a +query based on the current address you have typed. Like aliases, Mutt +will look for what you have typed back to the last space or comma. If +there is a single response for that query, Mutt will expand the address +in place. If there are multiple responses, Mutt will activate the query +menu. At the query menu, you can select one or more addresses to be +added to the prompt. +

    6. Mailbox Formats

    +Mutt supports reading and writing of four different local mailbox formats: +mbox, MMDF, MH and Maildir. The mailbox type is autodetected, so there +is no need to use a flag for different mailbox types. When creating new +mailboxes, Mutt uses the default specified with the +$mbox_type variable. A +short description of the formats follows. +

    +mbox. This is a widely used mailbox format for UNIX. All +messages are stored in a single file. Each message has a line of the form: 

     From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST

    to denote the start of a new message (this is often referred to as the -“From_” line). The mbox format requires mailbox locking, is -prone to mailbox corruption with concurrently writing clients or -misinterpreted From_ lines. Depending on the environment, new mail -detection can be unreliable. Mbox folders are fast to open and easy to -archive. -

    -MMDF. This is a variant of the -mbox format. Each message is surrounded by lines -containing “^A^A^A^A” (four times control-A's). The same -problems as for mbox apply (also with finding the right message -separator as four control-A's may appear in message bodies). +“From_” line). The mbox format requires mailbox +locking, is prone to mailbox corruption with concurrently writing +clients or misinterpreted From_ lines. Depending on the +environment, new mail detection can be unreliable. Mbox folders are fast +to open and easy to archive. +

    +MMDF. This is a variant of +the mbox format. Each message is surrounded by +lines containing “^A^A^A^A” (four +control-A's). The same problems as for mbox apply (also with finding the +right message separator as four control-A's may appear in message +bodies).

    -MH. A radical departure from -mbox and MMDF, a mailbox +MH. A radical departure from mbox and MMDF, a mailbox consists of a directory and each message is stored in a separate file. The filename indicates the message number (however, this is may not correspond to the message number Mutt displays). Deleted messages are -renamed with a comma (“,”) prepended to the filename. Mutt -detects this type of mailbox by looking for either -.mh_sequences or .xmhcache files -(needed to distinguish normal directories from MH mailboxes). MH is more -robust with concurrent clients writing the mailbox, but still may suffer -from lost flags; message corruption is less likely to occur than with -mbox/mmdf. It's usually slower to open compared to mbox/mmdf since many -small files have to be read (Mutt provides Section 7.1, “Header Caching” to greatly speed this process up). Depending -on the environment, MH is not very disk-space efficient. -

    -Maildir. The newest of the mailbox formats, used -by the Qmail MTA (a replacement for sendmail). Similar to -MH, except that it adds three subdirectories of the -mailbox: tmp, new and -cur. Filenames for the messages are chosen in such -a way they are unique, even when two programs are writing the mailbox -over NFS, which means that no file locking is needed and corruption is -very unlikely. Maildir maybe slower to open without caching in Mutt, it -too is not very disk-space efficient depending on the environment. Since -no additional files are used for metadata (which is embedded in the -message filenames) and Maildir is locking-free, it's easy to sync across -different machines using file-level synchronization tools. -

    8. Mailbox Shortcuts

    -There are a number of built in shortcuts which refer to specific -mailboxes. These shortcuts can be used anywhere you are prompted for a -file or mailbox path or in path-related configuration variables. Note -that these only work at the beginning of a string. -

    Table 4.7. Mailbox shortcuts

    ShortcutRefers to...
    !your $spoolfile (incoming) mailbox
    >your $mbox file
    <your $record file
    ^the current mailbox
    - or !!the file you've last visited
    ~your home directory
    = or +your $folder directory
    @aliasto the default save folder as determined by the address of the alias

    +renamed with a comma (“,”) prepended to the filename. Mutt +detects this type of mailbox by looking for either .mh_sequences +or .xmhcache files (needed to distinguish normal directories from MH +mailboxes). MH is more robust with concurrent clients writing the mailbox, +but still may suffer from lost flags; message corruption is less likely +to occur than with mbox/mmdf. It's usually slower to open compared to +mbox/mmdf since many small files have to be read (Mutt provides +Section 7.1, “Header Caching” to greatly speed this process up). +Depending on the environment, MH is not very disk-space efficient. +

    +Maildir. The newest of the mailbox formats, used by the Qmail MTA (a +replacement for sendmail). Similar to MH, except that it adds three +subdirectories of the mailbox: tmp, new and cur. Filenames +for the messages are chosen in such a way they are unique, even when two +programs are writing the mailbox over NFS, which means that no file locking +is needed and corruption is very unlikely. Maildir maybe +slower to open without caching in Mutt, it too is not very +disk-space efficient depending on the environment. Since no additional +files are used for metadata (which is embedded in the message filenames) +and Maildir is locking-free, it's easy to sync across different machines +using file-level synchronization tools. +

    7. Mailbox Shortcuts

    +There are a number of built in shortcuts which refer to specific mailboxes. +These shortcuts can be used anywhere you are prompted for a file or mailbox +path or in path-related configuration variables. Note that these only +work at the beginning of a string. +

    • +! — refers to your $spoolfile (incoming) mailbox +

    • +> — refers to your $mbox file +

    • +< — refers to your $record file +

    • +^ — refers to the current mailbox +

    • +- or !! — refers to the file you've last visited +

    • +˜ — refers to your home directory +

    • += or + — refers to your $folder directory +

    • +@alias — refers to the default save folder as determined by the address of the alias +

    For example, to store a copy of outgoing messages in the folder they -were composed in, a folder-hook can be used -to set $record: +were composed in, +a folder-hook can +be used to set $record: 

    -folder-hook . 'set record=^'

    9. Handling Mailing Lists

    +folder-hook . 'set record=^'

    8. Handling Mailing Lists

    Mutt has a few configuration options that make dealing with large -amounts of mail easier. The first thing you must do is to let Mutt know -what addresses you consider to be mailing lists (technically this does -not have to be a mailing list, but that is what it is most often used -for), and what lists you are subscribed to. This is accomplished -through the use of the lists -and subscribe commands in your -.muttrc. +amounts of mail easier. The first thing you must do is to let Mutt +know what addresses you consider to be mailing lists (technically +this does not have to be a mailing list, but that is what it is most +often used for), and what lists you are subscribed to. This is +accomplished through the use of the lists and subscribe commands in your .muttrc.

    Now that Mutt knows what your mailing lists are, it can do several things, the first of which is the ability to show the name of a list -through which you received a message (i.e., of a subscribed list) in the -index menu display. This is useful to distinguish -between personal and list mail in the same mailbox. In the $index_format variable, the expando -“%L” will print the string “To <list>” -when “list” appears in the “To” field, and -“Cc <list>” when it appears in the “Cc” +through which you received a message (i.e., of a subscribed list) in +the index menu display. This is useful to distinguish between +personal and list mail in the same mailbox. In the $index_format variable, the expando “%L” +will print the string “To <list>” when “list” appears in the +“To” field, and “Cc <list>” when it appears in the “Cc” field (otherwise it prints the name of the author).

    -Often times the “To” and “Cc” fields in -mailing list messages tend to get quite large. Most people do not bother -to remove the author of the message they reply to from the list, -resulting in two or more copies being sent to that person. The -<list-reply> function, which by default is -bound to “L” in the index menu and -pager, helps reduce the clutter by only replying to -the known mailing list addresses instead of all recipients (except as +Often times the “To” and “Cc” fields in mailing list messages +tend to get quite large. Most people do not bother to remove the +author of the message they reply to from the list, resulting in +two or more copies being sent to that person. The <list-reply> +function, which by default is bound to “L” in the index menu +and pager, helps reduce the clutter by only replying to the +known mailing list addresses instead of all recipients (except as specified by Mail-Followup-To, see below).

    -Mutt also supports the Mail-Followup-To header. When -you send a message to a list of recipients which includes one or several -subscribed mailing lists, and if the $followup_to option is set, Mutt will -generate a Mail-Followup-To header which contains all the recipients to -whom you send this message, but not your address. This indicates that -group-replies or list-replies (also known as “followups”) -to this message should only be sent to the original recipients of the +Mutt also supports the Mail-Followup-To header. When you send +a message to a list of recipients which includes one or several +subscribed mailing lists, and if the $followup_to option is set, Mutt will generate +a Mail-Followup-To header which contains all the recipients to whom +you send this message, but not your address. This indicates that +group-replies or list-replies (also known as “followups”) to this +message should only be sent to the original recipients of the message, and not separately to you - you'll receive your copy through one of the mailing lists you are subscribed to.

    -Conversely, when group-replying or list-replying to a message which has -a Mail-Followup-To header, Mutt will respect this -header if the $honor_followup_to configuration -variable is set. Using list-reply -will in this case also make sure that the reply goes to the mailing -list, even if it's not specified in the list of recipients in the -Mail-Followup-To. -

    Note

    +Conversely, when group-replying or list-replying to a message which +has a Mail-Followup-To header, Mutt will respect this header if +the $honor_followup_to configuration +variable is set. Using list-reply will in this case also make sure +that the reply goes to the mailing list, even if it's not specified +in the list of recipients in the Mail-Followup-To. +

    Note

    When header editing is enabled, you can create a -Mail-Followup-To header manually. Mutt will only -auto-generate this header if it doesn't exist when you send the message. +Mail-Followup-To header manually. Mutt will only auto-generate +this header if it doesn't exist when you send the message.

    The other method some mailing list admins use is to generate a -“Reply-To” field which points back to the mailing list -address rather than the author of the message. This can create problems -when trying to reply directly to the author in private, since most mail -clients will automatically reply to the address given in the -“Reply-To” field. Mutt uses the $reply_to variable to help decide which -address to use. If set to ask-yes or -ask-no, you will be prompted as to whether or not -you would like to use the address given in the “Reply-To” -field, or reply directly to the address given in the “From” -field. When set to yes, the -“Reply-To” field will be used when present. -

    -The “X-Label:” header field can be used to further identify -mailing lists or list subject matter (or just to annotate messages -individually). The $index_format -variable's “%y” and “%Y” expandos can be used -to expand “X-Label:” fields in the index, and Mutt's -pattern-matcher can match regular expressions to “X-Label:” -fields with the “~y” selector. “X-Label:” is -not a standard message header field, but it can easily be inserted by -procmail and other mail filtering agents. -

    -Lastly, Mutt has the ability to sort the -mailbox into threads. A thread is a -group of messages which all relate to the same subject. This is usually -organized into a tree-like structure where a message and all of its -replies are represented graphically. If you've ever used a threaded -news client, this is the same concept. It makes dealing with large -volume mailing lists easier because you can easily delete uninteresting -threads and quickly find topics of value. -

    10. New Mail Detection

    -Mutt supports setups with multiple folders, allowing all of them to be -monitored for new mail (see Section 14, “Monitoring Incoming Mail” for details). -

    10.1. How New Mail Detection Works

    -For Mbox and Mmdf folders, new mail is detected by comparing access -and/or modification times of files: Mutt assumes a folder has new mail -if it wasn't accessed after it was last modified. Utilities like -biff or frm or any other program -which accesses the mailbox might cause Mutt to never detect new mail for -that mailbox if they do not properly reset the access time. Other -possible causes of Mutt not detecting new mail in these folders are -backup tools (updating access times) or filesystems mounted without -access time update support (for Linux systems, see the -relatime option). -

    Note

    -Contrary to older Mutt releases, it now maintains the new mail status of -a folder by properly resetting the access time if the folder contains at -least one message which is neither read, nor deleted, nor marked as old. -

    -In cases where new mail detection for Mbox or Mmdf folders appears to be -unreliable, the $check_mbox_size -option can be used to make Mutt track and consult file sizes for new -mail detection instead which won't work for size-neutral changes. -

    -New mail for Maildir is assumed if there is one message in the -new/ subdirectory which is not marked deleted (see -$maildir_trash). For MH folders, a -mailbox is considered having new mail if there's at least one message in -the “unseen” sequence as specified by $mh_seq_unseen. -

    -Mutt does not poll POP3 folders for new mail, it only periodically -checks the currently opened folder (if it's a POP3 folder). -

    -For IMAP, by default Mutt uses recent message counts provided by the -server to detect new mail. If the $imap_idle option is set, it'll use the IMAP -IDLE extension if advertised by the server. -

    10.2. Polling For New Mail

    -When in the index menu and being idle (also see $timeout), Mutt periodically checks for new -mail in all folders which have been configured via the +“Reply-To” field which points back to the mailing list address rather +than the author of the message. This can create problems when trying +to reply directly to the author in private, since most mail clients +will automatically reply to the address given in the “Reply-To” +field. Mutt uses the $reply_to +variable to help decide which address to use. If set to ask-yes or +ask-no, you will be +prompted as to whether or not you would like to use the address given in +the “Reply-To” field, or reply directly to the address given in the +“From” field. When set to yes, the “Reply-To” field will be used when +present. +

    +The “X-Label:” header field can be used to further identify mailing +lists or list subject matter (or just to annotate messages +individually). The $index_format variable's “%y” and +“%Y” expandos can be used to expand “X-Label:” fields in the +index, and Mutt's pattern-matcher can match regular expressions to +“X-Label:” fields with the “˜y” selector. “X-Label:” is not a +standard message header field, but it can easily be inserted by procmail +and other mail filtering agents. +

    +Lastly, Mutt has the ability to sort the mailbox into +threads. A thread is a group of messages which all relate to the same +subject. This is usually organized into a tree-like structure where a +message and all of its replies are represented graphically. If you've ever +used a threaded news client, this is the same concept. It makes dealing +with large volume mailing lists easier because you can easily delete +uninteresting threads and quickly find topics of value. +

    9. Handling multiple folders

    +Mutt supports setups with multiple folders, allowing all of them to +be monitored for new mail (see Section 14, “Monitoring Incoming Mail” for details). +

    +When in the index menu and being idle (also see +$timeout), Mutt periodically checks +for new mail in all folders which have been configured via the mailboxes command. The interval depends on the folder -type: for local/IMAP folders it consults $mail_check and $pop_checkinterval for POP folders. -

    -Outside the index menu the directory browser supports checking for new -mail using the <check-new> function which is -unbound by default. Pressing TAB will bring up a menu showing the files -specified by the mailboxes command, and indicate -which contain new messages. Mutt will automatically enter this mode when -invoked from the command line with the -y option. +type: for local/IMAP folders it consults +$mail_check and +$pop_checkinterval +for POP folders. +

    +Outside the index menu the directory browser supports checking +for new mail using the <check-new> function which is +unbound by default. Pressing TAB will bring up a +menu showing the files specified by the mailboxes command, +and indicate which contain new messages. Mutt will automatically enter this +mode when invoked from the command line with the -y option.

    For the pager, index and directory browser menus, Mutt contains the -<buffy-list> function (bound to -“.” by default) which will print a list of folders with new -mail in the command line at the bottom of the screen. +<buffy-list> function (bound to “.” by default) +which will print a list of folders with new mail in the command line at +the bottom of the screen.

    For the index, by default Mutt displays the number of mailboxes with new -mail in the status bar, please refer to the $status_format variable for details. +mail in the status bar, please refer to the +$status_format +variable for details.

    When changing folders, Mutt fills the prompt with the first folder from the mailboxes list containing new mail (if any), pressing -<Space> will cycle through folders with new -mail. The (by default unbound) function -<next-unread-mailbox> in the index can be used -to immediately open the next folder with unread mail (if any). -

    11. Editing Threads

    +space will cycle through folders with new mail. +

    10. Editing Threads

    Mutt has the ability to dynamically restructure threads that are broken either by misconfigured software or bad behavior from some correspondents. This allows to clean your mailboxes from these annoyances which make it hard to follow a discussion. -

    11.1. Linking Threads

    -Some mailers tend to “forget” to correctly set the -“In-Reply-To:” and “References:” headers when -replying to a message. This results in broken discussions because Mutt -has not enough information to guess the correct threading. You can fix -this by tagging the reply, then moving to the parent message and using -the <link-threads> function (bound to & by -default). The reply will then be connected to this parent message. -

    -You can also connect multiple children at once, tagging them and using -the <tag-prefix> command (“;”) or -the $auto_tag option. -

    11.2. Breaking Threads

    +

    10.1. Linking Threads

    +Some mailers tend to “forget” to correctly set the “In-Reply-To:” and +“References:” headers when replying to a message. This results in broken +discussions because Mutt has not enough information to guess the correct +threading. +You can fix this by tagging the reply, then moving to the parent message +and using the <link-threads> function (bound to & by default). The +reply will then be connected to this parent message. +

    +You can also connect multiple children at once, tagging them and using the +<tag-prefix> command (';') or the $auto_tag option. +

    10.2. Breaking Threads

    On mailing lists, some people are in the bad habit of starting a new -discussion by hitting “reply” to any message from the list -and changing the subject to a totally unrelated one. You can fix such -threads by using the <break-thread> function -(bound by default to #), which will turn the subthread starting from the +discussion by hitting “reply” to any message from the list and changing +the subject to a totally unrelated one. +You can fix such threads by using the <break-thread> function (bound +by default to #), which will turn the subthread starting from the current message into a whole different thread. -

    12. Delivery Status Notification (DSN) Support

    +

    11. Delivery Status Notification (DSN) Support

    RFC1894 defines a set of MIME content types for relaying information -about the status of electronic mail messages. These can be thought of -as “return receipts.” +about the status of electronic mail messages. These can be thought of as +“return receipts.”

    -To support DSN, there are two variables. $dsn_notify is used to request receipts for +To support DSN, there are two variables. $dsn_notify is used to request receipts for different results (such as failed message, message delivered, etc.). -$dsn_return requests how much of your -message should be returned with the receipt (headers or full message). -

    -When using $sendmail for mail delivery, -you need to use either Berkeley sendmail 8.8.x (or greater) a MTA -supporting DSN command line options compatible to Sendmail: The -N and --R options can be used by the mail client to make requests as to what -type of status messages should be returned. Please consider your MTA -documentation whether DSN is supported. -

    -For SMTP delivery using $smtp_url, it -depends on the capabilities announced by the server whether Mutt will -attempt to request DSN or not. -

    13. Start a WWW Browser on URLs

    -If a message contains URLs, it is efficient to get a menu with all the -URLs and start a WWW browser on one of them. This functionality is -provided by the external urlview program which can be retrieved at +$dsn_return requests how much +of your message should be returned with the receipt (headers or full +message). +

    +When using $sendmail for mail +delivery, you need to use either Berkeley sendmail 8.8.x (or greater) a MTA +supporting DSN command line options compatible to Sendmail: The -N and -R +options can be used by the mail client to make requests as to what type of +status messages should be returned. Please consider your MTA documentation +whether DSN is supported. +

    +For SMTP delivery using $smtp_url, it depends on the +capabilities announced by the server whether Mutt will attempt to +request DSN or not. +

    12. Start a WWW Browser on URLs

    +If a message contains URLs, it is efficient to get +a menu with all the URLs and start a WWW browser on one of them. This +functionality is provided by the external urlview program which can be +retrieved at ftp://ftp.mutt.org/mutt/contrib/ and the configuration commands: 

     macro index \cb |urlview\n
 macro pager \cb |urlview\n
-

    14. Miscellany

    +

    13. Miscellany

    This section documents various features that fit nowhere else.

    Address normalization

    Mutt normalizes all e-mail addresses to the simplest form possible. If -an address contains a realname, the form Joe User -<joe@example.com> is used and the pure e-mail address -without angle brackets otherwise, i.e. just +an address contains a realname, the form +Joe User <joe@example.com> is used and the +pure e-mail address without angle brackets otherwise, i.e. just joe@example.com.

    This normalization affects all headers Mutt generates including aliases. @@ -2986,65 +2734,30 @@ present. Otherwise, the value of $MAILDIR is taken into account. If that isn't present either, Mutt takes the user's mailbox in the mailspool as determined at compile-time (which may also -reside in the home directory). The $spoolfile setting overrides this -selection. Highest priority has the mailbox given with the +reside in the home directory). The +$spoolfile setting overrides +this selection. Highest priority has the mailbox given with the -f command line option. -

    Chapter 5. Mutt's MIME Support

    Table of Contents

    1. Using MIME in Mutt
    1.1. MIME Overview
    1.2. Viewing MIME Messages in the Pager
    1.3. The Attachment Menu
    1.4. The Compose Menu
    2. MIME Type Configuration with mime.types
    3. MIME Viewer Configuration with Mailcap
    3.1. The Basics of the Mailcap File
    3.2. Secure Use of Mailcap
    3.3. Advanced Mailcap Usage
    3.4. Example Mailcap Files
    4. MIME Autoview
    5. MIME Multipart/Alternative
    6. Attachment Searching and Counting
    7. MIME Lookup

    +

    Chapter 5. Mutt's MIME Support

    Table of Contents

    1. Using MIME in Mutt
    1.1. Viewing MIME Messages in the Pager
    1.2. The Attachment Menu
    1.3. The Compose Menu
    2. MIME Type Configuration with mime.types
    3. MIME Viewer Configuration with Mailcap
    3.1. The Basics of the Mailcap File
    3.2. Secure Use of Mailcap
    3.3. Advanced Mailcap Usage
    3.4. Example Mailcap Files
    4. MIME Autoview
    5. MIME Multipart/Alternative
    6. Attachment Searching and Counting
    7. MIME Lookup

    Quite a bit of effort has been made to make Mutt the premier text-mode MIME MUA. Every effort has been made to provide the functionality that the discerning MIME user requires, and the conformance to the standards wherever possible. When configuring Mutt for MIME, there are two extra types of configuration files which Mutt uses. One is the -mime.types file, which contains the mapping of file -extensions to IANA MIME types. The other is the -mailcap file, which specifies the external commands -to use for handling specific MIME types. -

    1. Using MIME in Mutt

    1.1. MIME Overview

    -MIME is short for “Multipurpose Internet Mail Extension” -and describes mechanisms to internationalize and structure mail -messages. Before the introduction of MIME, messages had a single text -part and were limited to us-ascii header and content. With MIME, -messages can have attachments (and even attachments which itself have -attachments and thus form a tree structure), nearly arbitrary characters -can be used for sender names, recipients and subjects. -

    -Besides the handling of non-ascii characters in message headers, to Mutt -the most important aspect of MIME are so-called MIME types. These are -constructed using a major and -minor type separated by a forward slash. These -specify details about the content that follows. Based upon these, Mutt -decides how to handle this part. The most popular major type is -“text” with minor types for plain text, -HTML and various other formats. Major types also exist for images, -audio, video and of course general application data (e.g. to separate -cryptographically signed data with a signature, send office documents, -and in general arbitrary binary data). There's also the -multipart major type which represents the root of a -subtree of MIME parts. A list of supported MIME types can be found in -Table 5.1, “Supported MIME types”. -

    -MIME also defines a set of encoding schemes for transporting MIME -content over the network: 7bit, -8bit, quoted-printable, -base64 and binary. There're some -rules when to choose what for encoding headers and/or body (if needed), -and Mutt will in general make a good choice. -

    -Mutt does most of MIME encoding/decoding behind the scenes to form -messages conforming to MIME on the sending side. On reception, it can be -flexibly configured as to how what MIME structure is displayed (and if -it's displayed): these decisions are based on the content's MIME type. -There are three areas/menus in dealing with MIME: the pager (while -viewing a message), the attachment menu and the compose menu. -

    1.2. Viewing MIME Messages in the Pager

    +mime.types file, which contains the mapping of file extensions to +IANA MIME types. The other is the mailcap file, which specifies +the external commands to use for handling specific MIME types. +

    1. Using MIME in Mutt

    +There are three areas/menus in Mutt which deal with MIME, they are the +pager (while viewing a message), the attachment menu and the compose +menu. +

    1.1. Viewing MIME Messages in the Pager

    When you select a message from the index and view it in the pager, Mutt -decodes as much of a message as possible to a text representation. Mutt -internally supports a number of MIME types, including the -text major type (with all minor types), the -message/rfc822 (mail messages) type and some -multipart types. In addition, it recognizes a variety -of PGP MIME types, including PGP/MIME and -application/pgp. +decodes the message to a text representation. Mutt internally supports +a number of MIME types, including text/plain, text/enriched, +message/rfc822, and message/news. In addition, the export +controlled version of Mutt recognizes a variety of PGP MIME types, +including PGP/MIME and application/pgp.

    Mutt will denote attachments with a couple lines describing them. These lines are of the form: @@ -3052,121 +2765,105 @@ [-- Attachment #1: Description --] [-- Type: text/plain, Encoding: 7bit, Size: 10000 --]

    -Where the Description is the description or -filename given for the attachment, and the Encoding -is one of the already mentioned content encodings. +Where the Description is the description or filename given for the +attachment, and the Encoding is one of +7bit/8bit/quoted-printable/base64/binary.

    If Mutt cannot deal with a MIME type, it will display a message like: 

     [-- image/gif is unsupported (use 'v' to view this part) --]
-

    1.3. The Attachment Menu

    -The default binding for <view-attachments> is -“v”, which displays the attachment menu for a message. The -attachment menu displays a list of the attachments in a message. From -the attachment menu, you can save, print, pipe, delete, and view -attachments. You can apply these operations to a group of attachments -at once, by tagging the attachments and by using the -<tag-prefix> operator. You can also reply to -the current message from this menu, and only the current attachment (or -the attachments tagged) will be quoted in your reply. You can view -attachments as text, or view them using the mailcap viewer definition -(the mailcap mechanism is explained later in detail). -

    -Finally, you can apply the usual message-related functions (like <resend-message>, -and the <reply> and -<forward> functions) to attachments of type -message/rfc822. -

    -See table Table 9.7, “Default Attachment Menu Bindings” for all available -functions. -

    1.4. The Compose Menu

    +

    1.2. The Attachment Menu

    +The default binding for <view-attachments> is “v”, which displays the +attachment menu for a message. The attachment menu displays a list of +the attachments in a message. From the attachment menu, you can save, +print, pipe, delete, and view attachments. You can apply these +operations to a group of attachments at once, by tagging the attachments +and by using the <tag-prefix> operator. You can also reply to the +current message from this menu, and only the current attachment (or the +attachments tagged) will be quoted in your reply. You can view +attachments as text, or view them using the mailcap viewer definition. +

    +Finally, you can apply the usual message-related functions (like +<resend-message>, and the +<reply> and <forward> +functions) to attachments of type message/rfc822. +

    +See the help on the attachment menu for more information. +

    1.3. The Compose Menu

    The compose menu is the menu you see before you send a message. It -allows you to edit the recipient list, the subject, and other aspects of -your message. It also contains a list of the attachments of your +allows you to edit the recipient list, the subject, and other aspects +of your message. It also contains a list of the attachments of your message, including the main body. From this menu, you can print, copy, -filter, pipe, edit, compose, review, and rename an attachment or a list -of tagged attachments. You can also modifying the attachment +filter, pipe, edit, compose, review, and rename an attachment or a +list of tagged attachments. You can also modifying the attachment information, notably the type, encoding and description.

    -Attachments appear as follows by default: +Attachments appear as follows: 

     - 1 [text/plain, 7bit, 1K]           /tmp/mutt-euler-8082-0 <no description>
   2 [applica/x-gunzip, base64, 422K] ~/src/mutt-0.85.tar.gz <no description>

    -The “-” denotes that Mutt will delete the file after -sending (or postponing, or canceling) the message. It can be toggled -with the <toggle-unlink> command (default: u). -The next field is the MIME content-type, and can be changed with the -<edit-type> command (default: ^T). The next -field is the encoding for the attachment, which allows a binary message -to be encoded for transmission on 7bit links. It can be changed with -the <edit-encoding> command (default: ^E). The -next field is the size of the attachment, rounded to kilobytes or -megabytes. The next field is the filename, which can be changed with -the <rename-file> command (default: R). The -final field is the description of the attachment, and can be changed -with the <edit-description> command (default: -d). See $attach_format for a full -list of available expandos to format this display to your needs. -

    2. MIME Type Configuration with mime.types

    -To get most out of MIME, it's important that a MIME part's content type -matches the content as closely as possible so that the recipient's -client can automatically select the right viewer for the -content. However, there's no reliable for Mutt to know how to detect -every possible file type. Instead, it uses a simple plain text mapping -file that specifies what file extension corresponds to what MIME -type. This file is called mime.types. -

    +The '-' denotes that Mutt will delete the file after sending (or +postponing, or canceling) the message. It can be toggled with the +<toggle-unlink> command (default: u). The next field is the MIME +content-type, and can be changed with the <edit-type> command +(default: ^T). The next field is the encoding for the attachment, +which allows a binary message to be encoded for transmission on 7bit +links. It can be changed with the <edit-encoding> command +(default: ^E). The next field is the size of the attachment, +rounded to kilobytes or megabytes. The next field is the filename, +which can be changed with the <rename-file> command (default: R). +The final field is the description of the attachment, and can be +changed with the <edit-description> command (default: d). +

    2. MIME Type Configuration with mime.types

    When you add an attachment to your mail message, Mutt searches your -personal mime.types file at -$HOME/.mime.types, and then the system -mime.types file at -/usr/local/share/mutt/mime.types or +personal mime.types file at ${HOME}/.mime.types, and then +the system mime.types file at /usr/local/share/mutt/mime.types or /etc/mime.types

    -Each line starts with the full MIME type, followed by a space and -space-separated list of file extensions. For example you could use: -

    Example 5.1. mime.types

    +The mime.types file consist of lines containing a MIME type and a space
+separated list of extensions.  For example:
+
     application/postscript          ps eps
 application/pgp                 pgp
 audio/x-aiff                    aif aifc aiff
-

    -A sample mime.types file comes with the Mutt -distribution, and should contain most of the MIME types you are likely -to use. +

    +A sample mime.types file comes with the Mutt distribution, and +should contain most of the MIME types you are likely to use.

    -If Mutt can not determine the MIME type by the extension of the file you +If Mutt can not determine the mime type by the extension of the file you attach, it will look at the file. If the file is free of binary information, Mutt will assume that the file is plain text, and mark it -as text/plain. If the file contains binary -information, then Mutt will mark it as -application/octet-stream. You can change the MIME -type that Mutt assigns to an attachment by using the -<edit-type> command from the compose menu -(default: ^T), see Table 5.1, “Supported MIME types” for supported -major types. Mutt recognizes all of these if the appropriate entry is -found in the mime.types file. Non-recognized mime -types should only be used if the recipient of the message is likely to -be expecting such attachments. -

    Table 5.1. Supported MIME types

    MIME major typeStandardDescription
    applicationyesGeneral application data
    audioyesAudio data
    imageyesImage data
    messageyesMail messages, message status information
    modelyesVRML and other modeling data
    multipartyesContainer for other MIME parts
    textyesText data
    videoyesVideo data
    chemicalnoMostly molecular data

    -MIME types are not arbitrary, they need to be assigned by IANA. -

    3. MIME Viewer Configuration with Mailcap

    +as text/plain. If the file contains binary information, then Mutt will +mark it as application/octet-stream. You can change the MIME +type that Mutt assigns to an attachment by using the <edit-type> +command from the compose menu (default: ^T). The MIME type is actually a +major mime type followed by the sub-type, separated by a '/'. 6 major +types: application, text, image, video, audio, and model have been approved +after various internet discussions. Mutt recognizes all of these if the +appropriate entry is found in the mime.types file. It also recognizes other +major mime types, such as the chemical type that is widely used in the +molecular modeling community to pass molecular data in various forms to +various molecular viewers. Non-recognized mime types should only be used +if the recipient of the message is likely to be expecting such attachments. +

    3. MIME Viewer Configuration with Mailcap

    Mutt supports RFC 1524 MIME Configuration, in particular the Unix specific format specified in Appendix A of RFC 1524. This file format -is commonly referred to as the “mailcap” format. Many MIME -compliant programs utilize the mailcap format, allowing you to specify -handling for all MIME types in one place for all programs. Programs -known to use this format include Firefox, lynx and metamail. -

    -In order to handle various MIME types that Mutt doesn't have built-in -support for, it parses a series of external configuration files to find -an external handler. The default search string for these files is a -colon delimited list containing the following files: -

    1. $HOME/.mailcap

    2. $PKGDATADIR/mailcap

    3. $SYSCONFDIR/mailcap

    4. /etc/mailcap

    5. /usr/etc/mailcap

    6. /usr/local/etc/mailcap

    +is commonly referred to as the mailcap format. Many MIME compliant +programs utilize the mailcap format, allowing you to specify handling +for all MIME types in one place for all programs. Programs known to +use this format include Firefox, lynx and metamail. +

    +In order to handle various MIME types that Mutt can not handle +internally, Mutt parses a series of external configuration files to +find an external handler. The default search string for these files +is a colon delimited list containing the following files: +

    1. $HOME/.mailcap

    2. $PKGDATADIR/mailcap

    3. $SYSCONFDIR/mailcap

    4. /etc/mailcap

    5. /usr/etc/mailcap

    6. /usr/local/etc/mailcap

    where $HOME is your home directory. The -$PKGDATADIR and the $SYSCONFDIR -directories depend on where Mutt is installed: the former is the default -for shared data, the latter for system configuration files. +$PKGDATADIR and the +$SYSCONFDIR directories depend on where Mutt +is installed: the former is the default for shared data, the +latter for system configuration files.

    The default search path can be obtained by running the following command: @@ -3174,9 +2871,9 @@ mutt -nF /dev/null -Q mailcap_path

    In particular, the metamail distribution will install a mailcap file, -usually as /usr/local/etc/mailcap, which contains -some baseline entries. -

    3.1. The Basics of the Mailcap File

    +usually as /usr/local/etc/mailcap, which contains some baseline +entries. +

    3.1. The Basics of the Mailcap File

    A mailcap file consists of a series of lines which are comments, blank, or definitions.

    @@ -3186,35 +2883,29 @@

    A definition line consists of a content type, a view command, and any number of optional fields. Each field of a definition line is divided -by a semicolon “;” character. +by a semicolon ';' character.

    -The content type is specified in the MIME standard -“type/subtype” notation. For example, -text/plain, text/html, -image/gif, etc. In addition, the mailcap format -includes two formats for wildcards, one using the special -“*” subtype, the other is the implicit wild, where you only -include the major type. For example, image/*, or -video will match all image types and video types, +The content type is specified in the MIME standard type/subtype method. +For example, +text/plain, text/html, image/gif, +etc. In addition, the mailcap format includes two formats for +wildcards, one using the special '*' subtype, the other is the implicit +wild, where you only include the major type. For example, image/*, or +video, will match all image types and video types, respectively.

    The view command is a Unix command for viewing the type specified. There are two different types of commands supported. The default is to send the body of the MIME message to the command on stdin. You can change -this behavior by using %s as a parameter to your view -command. This will cause Mutt to save the body of the MIME message to a -temporary file, and then call the view command with the -%s replaced by the name of the temporary file. In -both cases, Mutt will turn over the terminal to the view program until -the program quits, at which time Mutt will remove the temporary file if -it exists. This means that mailcap does not work -out of the box with programs which detach themselves from the terminal -right after starting, like open on Mac OS X. In order -to nevertheless use these programs with mailcap, you probably need -custom shell scripts. +this behavior by using %s as a parameter to your view command. +This will cause Mutt to save the body of the MIME message to a temporary +file, and then call the view command with the %s replaced by +the name of the temporary file. In both cases, Mutt will turn over the +terminal to the view program until the program quits, at which time Mutt +will remove the temporary file if it exists.

    -So, in the simplest form, you can send a text/plain -message to the external pager more on standard input: +So, in the simplest form, you can send a text/plain message to the +external pager more on stdin: 

     text/plain; more

    @@ -3222,85 +2913,83 @@ 

     text/plain; more %s

    -Perhaps you would like to use lynx to interactively view a -text/html message: +Perhaps you would like to use lynx to interactively view a text/html +message: 

     text/html; lynx %s

    -In this case, lynx does not support viewing a file from standard input, -so you must use the %s syntax. -

    Note

    -Some older versions of lynx contain a bug where they will -check the mailcap file for a viewer for text/html. -They will find the line which calls lynx, and run it. This causes lynx -to continuously spawn itself to view the object. +In this case, lynx does not support viewing a file from stdin, so you +must use the %s syntax. +

    Note

    +Some older versions of lynx contain a bug where they +will check the mailcap file for a viewer for text/html. They will find +the line which calls lynx, and run it. This causes lynx to continuously +spawn itself to view the object.

    On the other hand, maybe you don't want to use lynx interactively, you -just want to have it convert the text/html to -text/plain, then you can use: +just want to have it convert the text/html to text/plain, then you can +use: 

     text/html; lynx -dump %s | more

    -Perhaps you wish to use lynx to view text/html files, -and a pager on all other text formats, then you would use the following: +Perhaps you wish to use lynx to view text/html files, and a pager on +all other text formats, then you would use the following: 

     text/html; lynx %s
 text/*; more
-

    3.2. Secure Use of Mailcap

    +

    +This is the simplest form of a mailcap file. +

    3.2. Secure Use of Mailcap

    The interpretation of shell meta-characters embedded in MIME parameters -can lead to security problems in general. Mutt tries to quote -parameters in expansion of %s syntaxes properly, and -avoids risky characters by substituting them, see the $mailcap_sanitize variable. +can lead to security problems in general. Mutt tries to quote parameters +in expansion of %s syntaxes properly, and avoids risky characters by +substituting them, see the $mailcap_sanitize variable.

    Although Mutt's procedures to invoke programs with mailcap seem to be -safe, there are other applications parsing mailcap, maybe taking less -care of it. Therefore you should pay attention to the following rules: +safe, there are other applications parsing mailcap, maybe taking less care +of it. Therefore you should pay attention to the following rules:

    -Keep the %-expandos away from shell quoting. Don't -quote them with single or double quotes. Mutt does this for you, the -right way, as should any other program which interprets mailcap. Don't -put them into backtick expansions. Be highly careful with evil -statements, and avoid them if possible at all. Trying to fix broken -behavior with quotes introduces new leaks — there is no +Keep the %-expandos away from shell quoting. +Don't quote them with single or double quotes. Mutt does this for +you, the right way, as should any other program which interprets +mailcap. Don't put them into backtick expansions. Be highly careful +with eval statements, and avoid them if possible at all. Trying to fix +broken behavior with quotes introduces new leaks - there is no alternative to correct quoting in the first place.

    If you have to use the %-expandos' values in context where you need -quoting or backtick expansions, put that value into a shell variable and -reference the shell variable where necessary, as in the following -example (using $charset inside the backtick expansion -is safe, since it is not itself subject to any further expansion): +quoting or backtick expansions, put that value into a shell variable +and reference the shell variable where necessary, as in the following +example (using $charset inside the backtick expansion is safe, +since it is not itself subject to any further expansion): 

     text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} \
         && test "`echo $charset | tr '[A-Z]' '[a-z]'`" != iso-8859-1
-

    3.3. Advanced Mailcap Usage

    3.3.1. Optional Fields

    +

    3.3. Advanced Mailcap Usage

    3.3.1. Optional Fields

    In addition to the required content-type and view command fields, you -can add semi-colon “;” separated fields to set flags and -other options. Mutt recognizes the following optional fields: +can add semi-colon ';' separated fields to set flags and other options. +Mutt recognizes the following optional fields:

    copiousoutput

    This flag tells Mutt that the command passes possibly large amounts of -text on standard output. This causes Mutt to invoke a pager (either -the internal pager or the external pager defined by the pager variable) -on the output of the view command. Without this flag, Mutt assumes that -the command is interactive. One could use this to replace the pipe to -more in the lynx -dump example in -the Basic section: +text on stdout. This causes Mutt to invoke a pager (either the internal +pager or the external pager defined by the pager variable) on the output +of the view command. Without this flag, Mutt assumes that the command +is interactive. One could use this to replace the pipe to more +in the lynx -dump example in the Basic section: 

     text/html; lynx -dump %s ; copiousoutput

    -This will cause lynx to format the text/html output -as text/plain and Mutt will use your standard pager -to display the results. -

    -Note that when using the built-in pager, only -entries with this flag will be considered a handler for a MIME type -— all other entries will be ignored. +This will cause lynx to format the text/html output as text/plain +and Mutt will use your standard pager to display the results.

    needsterminal

    -Mutt uses this flag when viewing attachments with auto_view, in order to -decide whether it should honor the setting of the $wait_key variable or not. When an attachment -is viewed using an interactive program, and the corresponding mailcap -entry has a needsterminal flag, Mutt will use $wait_key and the exit status of the program -to decide if it will ask you to press a key after the external program -has exited. In all other situations it will not prompt you for a key. +Mutt uses this flag when viewing attachments with auto_view, in order to decide whether it should honor the setting +of the $wait_key variable or +not. When an attachment is viewed using an interactive program, and the +corresponding mailcap entry has a needsterminal flag, Mutt will use +$wait_key and the exit status +of the program to decide if it will ask you to press a key after the +external program has exited. In all other situations it will not prompt +you for a key.

    compose=<command>

    This flag specifies the command to use to create a new attachment of a specific MIME type. Mutt supports this from the compose menu. @@ -3309,201 +2998,180 @@ specific MIME type. This command differs from the compose command in that Mutt will expect standard MIME headers on the data. This can be used to specify parameters, filename, description, etc. for a new -attachment. Mutt supports this from the compose menu. +attachment. Mutt supports this from the compose menu.

    print=<command>

    This flag specifies the command to use to print a specific MIME type. Mutt supports this from the attachment and compose menus.

    edit=<command>

    This flag specifies the command to use to edit a specific MIME type. Mutt supports this from the compose menu, and also uses it to compose -new attachments. Mutt will default to the defined $editor for text attachments. +new attachments. Mutt will default to the defined editor for text +attachments.

    nametemplate=<template>

    -This field specifies the format for the file denoted by -%s in the command fields. Certain programs will -require a certain file extension, for instance, to correctly view a -file. For instance, lynx will only interpret a file as -text/html if the file ends in -.html. So, you would specify lynx as a -text/html viewer with a line in the mailcap file -like: +This field specifies the format for the file denoted by %s in the +command fields. Certain programs will require a certain file extension, +for instance, to correctly view a file. For instance, lynx will only +interpret a file as text/html if the file ends in .html. +So, you would specify lynx as a text/html viewer with a line in +the mailcap file like: 

     text/html; lynx %s; nametemplate=%s.html
    test=<command>

    -This field specifies a command to run to test whether this mailcap entry -should be used. The command is defined with the command expansion rules -defined in the next section. If the command returns 0, then the test -passed, and Mutt uses this entry. If the command returns non-zero, then -the test failed, and Mutt continues searching for the right entry. Note -that the content-type must match before Mutt performs the test. For -example: +This field specifies a command to run to test whether this mailcap +entry should be used. The command is defined with the command expansion +rules defined in the next section. If the command returns 0, then the +test passed, and Mutt uses this entry. If the command returns non-zero, +then the test failed, and Mutt continues searching for the right entry. +Note that the content-type must match before Mutt performs the test. +For example: 

     text/html; firefox -remote 'openURL(%s)' ; test=RunningX
 text/html; lynx %s

    -In this example, Mutt will run the program RunningX -which will return 0 if the X Window manager is running, and non-zero if -it isn't. If RunningX returns 0, then Mutt will run -firefox to display the text/html object. If RunningX -doesn't return 0, then Mutt will go on to the next entry and use lynx to -display the text/html object. -

    3.3.2. Search Order

    +In this example, Mutt will run the program RunningX which will return 0 +if the X Window manager is running, and non-zero if it isn't. If +RunningX returns 0, then Mutt will call firefox to display the +text/html object. If RunningX doesn't return 0, then Mutt will go on +to the next entry and use lynx to display the text/html object. +

    3.3.2. Search Order

    When searching for an entry in the mailcap file, Mutt will search for the most useful entry for its purpose. For instance, if you are -attempting to print an image/gif, and you have the -following entries in your mailcap file, Mutt will search for an entry -with the print command: +attempting to print an image/gif, and you have the following +entries in your mailcap file, Mutt will search for an entry with the +print command: 

     image/*;        xv %s
 image/gif;      ; print= anytopnm %s | pnmtops | lpr; \
                 nametemplate=%s.gif

    -Mutt will skip the image/* entry and use the -image/gif entry with the print command. +Mutt will skip the image/* entry and use the image/gif +entry with the print command.

    -In addition, you can use this with auto_view to denote two -commands for viewing an attachment, one to be viewed automatically, the -other to be viewed interactively from the attachment menu using the -<view-mailcap> function (bound to -“m” by default). In addition, you can then use the test -feature to determine which viewer to use interactively depending on your -environment. +In addition, you can use this with auto_view +to denote two commands for viewing an attachment, one to be viewed +automatically, the other to be viewed interactively from the attachment +menu. In addition, you can then use the test feature to determine which +viewer to use interactively depending on your environment. 

     text/html;      firefox -remote 'openURL(%s)' ; test=RunningX
 text/html;      lynx %s; nametemplate=%s.html
 text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput

    -For auto_view, Mutt -will choose the third entry because of the -copiousoutput tag. For interactive viewing, Mutt -will run the program RunningX to determine if it -should use the first entry. If the program returns non-zero, Mutt will -use the second entry for interactive viewing. The last entry is for -inline display in the pager and the -<view-attach> function in the attachment menu. -

    -Entries with the copiousoutput tag should always be -specified as the last one per type. For non-interactive use, the last -entry will then actually be the first matching one with the tag set. -For non-interactive use, only copiousoutput-tagged -entries are considered. For interactive use, Mutt ignores this tag and -treats all entries equally. Therefore, if not specified last, all -following entries without this tag would never be considered for -<view-attach> because the -copiousoutput before them matched already. -

    3.3.3. Command Expansion

    +For auto_view, Mutt will choose the third +entry because of the copiousoutput tag. For interactive viewing, Mutt +will run the program RunningX to determine if it should use the first +entry. If the program returns non-zero, Mutt will use the second entry +for interactive viewing. +

    3.3.3. Command Expansion

    The various commands defined in the mailcap files are passed to the -/bin/sh shell using the system(3) -function. Before the command is passed to /bin/sh --c, it is parsed to expand various special parameters with -information from Mutt. The keywords Mutt expands are: +/bin/sh shell using the system(3) function. Before the +command is passed to /bin/sh -c, it is parsed to expand +various special parameters with information from Mutt. The keywords +Mutt expands are:

    %s

    -As seen in the basic mailcap section, this variable is expanded to a -filename specified by the calling program. This file contains the body -of the message to view/print/edit or where the composing program should -place the results of composition. In addition, the use of this keyword -causes Mutt to not pass the body of the message to the view/print/edit -program on stdin. +As seen in the basic mailcap section, this variable is expanded +to a filename specified by the calling program. This file contains +the body of the message to view/print/edit or where the composing +program should place the results of composition. In addition, the +use of this keyword causes Mutt to not pass the body of the message +to the view/print/edit program on stdin.

    %t

    -Mutt will expand %t to the text representation of the -content type of the message in the same form as the first parameter of -the mailcap definition line, i.e. text/html or +Mutt will expand %t to the text representation of the content +type of the message in the same form as the first parameter of the +mailcap definition line, ie text/html or image/gif.

    %{<parameter>}

    -Mutt will expand this to the value of the specified parameter from the -Content-Type: line of the mail message. For instance, if your mail -message contains: +Mutt will expand this to the value of the specified parameter +from the Content-Type: line of the mail message. For instance, if +Your mail message contains: 

     Content-Type: text/plain; charset=iso-8859-1

    -then Mutt will expand %{charset} to -“iso-8859-1”. The default metamail mailcap file uses this -feature to test the charset to spawn an xterm using the right charset to -view the message. +then Mutt will expand %{charset} to iso-8859-1. The default metamail +mailcap file uses this feature to test the charset to spawn an xterm +using the right charset to view the message.

    \%

    -This will be replaced by a literal %. +This will be replaced by a %

    -Mutt does not currently support the %F and -%n keywords specified in RFC 1524. The main purpose -of these parameters is for multipart messages, which is handled -internally by Mutt. -

    3.4. Example Mailcap Files

    +Mutt does not currently support the %F and %n keywords +specified in RFC 1524. The main purpose of these parameters is for +multipart messages, which is handled internally by Mutt. +

    3.4. Example Mailcap Files

    This mailcap file is fairly simple and standard: 

    -# I'm always running X :)
+# I'm always running X :)
 video/*;        xanim %s > /dev/null
 image/*;        xv %s > /dev/null
 
-# I'm always running firefox (if my computer had more memory, maybe)
+# I'm always running firefox (if my computer had more memory, maybe)
 text/html;      firefox -remote 'openURL(%s)'

    This mailcap file shows quite a number of examples: 

    -# Use xanim to view all videos   Xanim produces a header on startup,
-# send that to /dev/null so I don't see it
+# Use xanim to view all videos   Xanim produces a header on startup,
+# send that to /dev/null so I don't see it
 video/*;        xanim %s > /dev/null
 
-# Send html to a running firefox by remote
+# Send html to a running firefox by remote
 text/html;      firefox -remote 'openURL(%s)'; test=RunningFirefox
 
-# If I'm not running firefox but I am running X, start firefox on the
-# object
+# If I'm not running firefox but I am running X, start firefox on the
+# object
 text/html;      firefox %s; test=RunningX
 
-# Else use lynx to view it as text
+# Else use lynx to view it as text
 text/html;      lynx %s
 
-# This version would convert the text/html to text/plain
+# This version would convert the text/html to text/plain
 text/html;      lynx -dump %s; copiousoutput
 
-# I use enscript to print text in two columns to a page
+# I use enscript to print text in two columns to a page
 text/*;         more %s; print=enscript -2Gr %s
 
-# Firefox adds a flag to tell itself to view jpegs internally
+# Firefox adds a flag to tell itself to view jpegs internally
 image/jpeg;xv %s; x-mozilla-flags=internal
 
-# Use xv to view images if I'm running X
-# In addition, this uses the \ to extend the line and set my editor
-# for images
+# Use xv to view images if I'm running X
+# In addition, this uses the \ to extend the line and set my editor
+# for images
 image/*;xv %s; test=RunningX; \
         edit=xpaint %s
 
-# Convert images to text using the netpbm tools
+# Convert images to text using the netpbm tools
 image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | pgmtopbm |
 pbmtoascii -1x2 ) 2>&1 ; copiousoutput
 
-# Send excel spreadsheets to my NT box
+# Send excel spreadsheets to my NT box
 application/ms-excel; open.pl %s
-

    4. MIME Autoview

    +

    4. MIME Autoview

    Usage: -

    auto_view +

    auto-view mimetype [ mimetype -...]
    unauto_view { +...]
    unauto-view { * | mimetype ... }

    In addition to explicitly telling Mutt to view an attachment with the -MIME viewer defined in the mailcap file from the attachments menu, Mutt -has support for automatically viewing MIME attachments while in the -pager. -

    -For this to work, you must define a viewer in the mailcap file which -uses the copiousoutput option to denote that it is -non-interactive. Usually, you also use the entry to convert the -attachment to a text representation which you can view in the pager. -

    -You then use the auto_view configuration command to -list the content-types that you wish to view automatically. For -instance, if you set it to: +MIME viewer defined in the mailcap file, Mutt has support for +automatically viewing MIME attachments while in the pager. +

    +To work, you must define a viewer in the mailcap file which uses the +copiousoutput option to denote that it is non-interactive. +Usually, you also use the entry to convert the attachment to a text +representation which you can view in the pager. +

    +You then use the auto_view .muttrc command to list the +content-types that you wish to view automatically. For instance, if you +set it to: 

     auto_view text/html application/x-gunzip \
   application/postscript image/gif application/x-tar-gz

    -...Mutt would try to find corresponding entries for rendering -attachments of these types as text. A corresponding mailcap could look -like: +Mutt could use the following mailcap entries to automatically view +attachments of these types. 

     text/html;      lynx -dump %s; copiousoutput; nametemplate=%s.html
 image/*;        anytopnm %s | pnmscale -xsize 80 -ysize 50 | ppmtopgm | \
@@ -3512,51 +3180,39 @@
 application/x-tar-gz; gunzip -c %s | tar -tf - ; copiousoutput
 application/postscript; ps2ascii %s; copiousoutput

    -unauto_view can be used to remove previous entries -from the auto_view list. This can be used with message-hook to -autoview messages based on size, etc. -“unauto_view *” will remove all previous -entries. -

    5. MIME Multipart/Alternative

    -The multipart/alternative container type only has -child MIME parts which represent the same content in an alternative -way. This is often used to send HTML messages which contain an -alternative plain text representation. -

    +unauto_view can be used to remove previous entries from the autoview list. +This can be used with message-hook to autoview messages based on size, etc. +“unauto_view *” will remove all previous entries. +

    5. MIME Multipart/Alternative

    Mutt has some heuristics for determining which attachment of a -multipart/alternative type to display: -

    1. -First, Mutt will check the alternative_order list to -determine if one of the available types is preferred. It consists of a -number of MIME types in order, including support for implicit and -explicit wildcards. For example: -

      -alternative_order text/enriched text/plain text \
-  application/postscript image/*
-

    2. -Next, Mutt will check if any of the types have a defined auto_view, and use that. -

    3. -Failing that, Mutt will look for any text type. -

    4. -As a last attempt, Mutt will look for any type it knows how to handle. -

    -To remove a MIME type from the alternative_order -list, use the unalternative_order command. -

    6. Attachment Searching and Counting

    +multipart/alternative type to display. First, Mutt will check the +alternative_order list +to determine if one of the available types is preferred. It consists of +a number of mimetypes in order, including support for implicit and +explicit wildcards, for example: +

    +alternative_order text/enriched text/plain text application/postscript image/*
+

    +Next, Mutt will check if any of the types have a defined +auto_view, and use that. Failing +that, Mutt will look for any text type. As a last attempt, Mutt will +look for any type it knows how to handle. +

    +To remove a MIME type from the alternative_order list, use the +unalternative_order command. +

    6. Attachment Searching and Counting

    If you ever lose track of attachments in your mailboxes, Mutt's attachment-counting and -searching support might be for you. You can make your message index display the number of qualifying attachments in each message, or search for messages by attachment count. You also can configure what kinds of attachments qualify for this feature with the -attachments and unattachments -commands. +attachments and unattachments commands.

    -In order to provide this information, Mutt needs to fully MIME-parse all -messages affected first. This can slow down operation especially for +In order to provide this information, Mutt needs to fully MIME-parse +all messages affected first. This can slow down operation especially for remote mail folders such as IMAP because all messages have to be downloaded first regardless whether the user really wants to view them -or not though using Section 7.2, “Body Caching” usually means to -download the message just once. +or not.

    The syntax is:

    attachments @@ -3570,94 +3226,85 @@
    attachments ?

    -disposition is the attachment's Content-Disposition -type — either inline or -attachment. You can abbreviate this to -I or A. -

    -Disposition is prefixed by either a “+” symbol or a -“-” symbol. If it's a “+”, you're saying that -you want to allow this disposition and MIME type to qualify. If it's a -“-”, you're saying that this disposition and MIME type is -an exception to previous “+” rules. There are examples +disposition is the attachment's Content-Disposition type — either +inline or attachment. +You can abbreviate this to I or A. +

    +Disposition is prefixed by either a + symbol or a - symbol. If it's +a +, you're saying that you want to allow this disposition and MIME +type to qualify. If it's a -, you're saying that this disposition +and MIME type is an exception to previous + rules. There are examples below of how this is useful.

    -mime-type is the MIME type of the attachment you -want the command to affect. A MIME type is always of the format -major/minor, where major describes -the broad category of document you're looking at, and -minor describes the specific type within that -category. The major part of mime-type must be literal text (or the -special token “*”), but the minor part -may be a regular expression. (Therefore, -“*/.*” matches any MIME type.) -

    -The MIME types you give to the attachments directive -are a kind of pattern. When you use the attachments -directive, the patterns you specify are added to a list. When you use -unattachments, the pattern is removed from the list. -The patterns are not expanded and matched to specific MIME types at this -time — they're just text in a list. They're only matched when -actually evaluating a message. +mime-type is, unsurprisingly, the MIME type of the attachment you want +to affect. A MIME type is always of the format major/minor, where +major describes the broad category of document you're looking at, and +minor describes the specific type within that category. The major +part of mime-type must be literal text (or the special token “*”), but +the minor part may be a regular expression. (Therefore, “*/.*” matches +any MIME type.) +

    +The MIME types you give to the attachments directive are a kind of +pattern. When you use the attachments directive, the patterns you +specify are added to a list. When you use unattachments, the pattern +is removed from the list. The patterns are not expanded and matched +to specific MIME types at this time — they're just text in a list. +They're only matched when actually evaluating a message.

    Some examples might help to illustrate. The examples that are not commented out define the default configuration of the lists. -

    Example 5.2. Attachment counting

    -
-# Removing a pattern from a list removes that pattern literally. It
-# does not remove any type matching the pattern.
-#
-#  attachments   +A */.*
-#  attachments   +A image/jpeg
-#  unattachments +A */.*
-#
-# This leaves "attached" image/jpeg files on the allowed attachments
-# list. It does not remove all items, as you might expect, because the
-# second */.* is not a matching expression at this time.
-#
-# Remember: "unattachments" only undoes what "attachments" has done!
-# It does not trigger any matching on actual messages.
-
-# Qualify any MIME part with an "attachment" disposition, EXCEPT for
-# text/x-vcard and application/pgp parts. (PGP parts are already known
-# to mutt, and can be searched for with ~g, ~G, and ~k.)
-#
-# I've added x-pkcs7 to this, since it functions (for S/MIME)
-# analogously to PGP signature attachments. S/MIME isn't supported
-# in a stock mutt build, but we can still treat it specially here.
-#
-
+
    Example 5.1. Attachment counting
    +## Removing a pattern from a list removes that pattern literally. It
+## does not remove any type matching the pattern.
+##
+##  attachments   +A */.*
+##  attachments   +A image/jpeg
+##  unattachments +A */.*
+##
+## This leaves "attached" image/jpeg files on the allowed attachments
+## list. It does not remove all items, as you might expect, because the
+## second */.* is not a matching expression at this time.
+##
+## Remember: "unattachments" only undoes what "attachments" has done!
+## It does not trigger any matching on actual messages.
+
+
+## Qualify any MIME part with an "attachment" disposition, EXCEPT for
+## text/x-vcard and application/pgp parts. (PGP parts are already known
+## to mutt, and can be searched for with ~g, ~G, and ~k.)
+##
+## I've added x-pkcs7 to this, since it functions (for S/MIME)
+## analogously to PGP signature attachments. S/MIME isn't supported
+## in a stock mutt build, but we can still treat it specially here.
+##
 attachments   +A */.*
 attachments   -A text/x-vcard application/pgp.*
 attachments   -A application/x-pkcs7-.*
 
-
-# Discount all MIME parts with an "inline" disposition, unless they're
-# text/plain. (Why inline a text/plain part unless it's external to the
-# message flow?)
-
+## Discount all MIME parts with an "inline" disposition, unless they're
+## text/plain. (Why inline a text/plain part unless it's external to the
+## message flow?)
+##
 attachments   +I text/plain
 
-
-# These two lines make Mutt qualify MIME containers.  (So, for example,
-# a message/rfc822 forward will count as an attachment.)  The first
-# line is unnecessary if you already have "attach-allow */.*", of
-# course.  These are off by default!  The MIME elements contained
-# within a message/* or multipart/* are still examined, even if the
-# containers themselves don't qualify.
-
+## These two lines make Mutt qualify MIME containers.  (So, for example,
+## a message/rfc822 forward will count as an attachment.)  The first
+## line is unnecessary if you already have "attach-allow */.*", of
+## course.  These are off by default!  The MIME elements contained
+## within a message/* or multipart/* are still examined, even if the
+## containers themseves don't qualify.
+##
 #attachments  +A message/.* multipart/.*
 #attachments  +I message/.* multipart/.*
-
 
-## You probably don't really care to know about deleted attachments.
+## You probably don't really care to know about deleted attachments.
 attachments   -A message/external-body
 attachments   -I message/external-body
 

    
-Entering the command “attachments ?” as
-a command will list your current settings in Muttrc format, so that it
-can be pasted elsewhere.
-

    7. MIME Lookup

    +Entering the command “attachments ?” +as a command will list your current settings in Muttrc format, so that +it can be pasted elsewhere. +

    7. MIME Lookup

    Usage:

    mime-lookup mimetype @@ -3668,243 +3315,233 @@ | mimetype ... }

    -Mutt's mime_lookup list specifies a list of MIME -types that should not be treated according to their -mailcap entry. This option is designed to deal with binary types such -as application/octet-stream. When an attachment's -MIME type is listed in mime_lookup, then the -extension of the filename will be compared to the list of extensions in -the mime.types file. The MIME type associated with -this extension will then be used to process the attachment according to -the rules in the mailcap file and according to any other configuration -options (such as auto_view) specified. Common usage -would be: +Mutt's mime_lookup list specifies a list of mime-types that should not +be treated according to their mailcap entry. This option is designed to +deal with binary types such as application/octet-stream. When an attachment's +mime-type is listed in mime_lookup, then the extension of the filename will +be compared to the list of extensions in the mime.types file. The mime-type +associated with this extension will then be used to process the attachment +according to the rules in the mailcap file and according to any other configuration +options (such as auto_view) specified. Common usage would be: 

     mime_lookup application/octet-stream application/X-Lotus-Manuscript

    -In addition, the unmime_lookup command may be used to -disable this feature for any particular MIME type if it had been set, -for example, in a global .muttrc. -

    Chapter 6. Optional Features

    Table of Contents

    1. General Notes
    1.1. Enabling/Disabling Features
    1.2. URL Syntax
    2. SSL/TLS Support
    3. POP3 Support
    4. IMAP Support
    4.1. The IMAP Folder Browser
    4.2. Authentication
    5. SMTP Support
    6. Managing Multiple Accounts
    7. Local Caching
    7.1. Header Caching
    7.2. Body Caching
    7.3. Cache Directories
    7.4. Maintenance
    8. Exact Address Generation
    9. Sending Anonymous Messages via Mixmaster

    1. General Notes

    1.1. Enabling/Disabling Features

    +In addition, the unmime_lookup command may be +used to disable this feature for any particular mime-type if it had been +set, for example, in a global .muttrc. +

    Chapter 6. Optional Features

    Table of Contents

    1. General Notes
    1.1. Enabling/Disabling Features
    1.2. URL Syntax
    2. SSL/TLS Support
    3. POP3 Support
    4. IMAP Support
    4.1. The IMAP Folder Browser
    4.2. Authentication
    5. SMTP Support
    6. Managing Multiple Accounts
    7. Local Caching
    7.1. Header Caching
    7.2. Body Caching
    7.3. Maintenance
    8. Exact Address Generation
    9. Sending Anonymous Messages via Mixmaster

    1. General Notes

    1.1. Enabling/Disabling Features

    Mutt supports several of optional features which can be enabled or -disabled at compile-time by giving the configure -script certain arguments. These are listed in the “Optional -features” section of the configure --help -output. +disabled at compile-time by giving the configure script +certain arguments. These are listed in the “Optional features” section of +the configure --help output.

    Which features are enabled or disabled can later be determined from the output of mutt -v. If a compile option starts with -“+” it is enabled and disabled if prefixed with -“-”. For example, if Mutt was compiled using GnuTLS for -encrypted communication instead of OpenSSL, mutt -v -would contain: +“+” it is enabled and disabled if prefixed with “-”. For example, if +Mutt was compiled using GnuTLS for encrypted communication instead of +OpenSSL, mutt -v would contain: 

    --USE_SSL_OPENSSL +USE_SSL_GNUTLS

    1.2. URL Syntax

    +-USE_SSL_OPENSSL +USE_SSL_GNUTLS

    1.2. URL Syntax

    Mutt optionally supports the IMAP, POP3 and SMTP protocols which require to access servers using URLs. The canonical syntax for specifying URLs -in Mutt is (an item enclosed in [] means it is -optional and may be omitted): +in Mutt is (an item enclosed in [] means it is optional and +may be omitted): 

    -proto[s]://[username[:password]@]server[:port][/path]
+proto[s]://[username[:password]@]server[:port]/[path]

    proto is the communication protocol: imap for IMAP, pop for POP3 and -smtp for SMTP. If “s” for “secure -communication” is appended, Mutt will attempt to establish an +smtp for SMTP. If “s” for “secure +communication” is appended, Mutt will attempt to establish an encrypted communication using SSL or TLS.

    Since all protocols supported by Mutt support/require authentication, login credentials may be specified in the URL. This has the advantage that multiple IMAP, POP3 or SMTP servers may be specified (which isn't -possible using, for example, $imap_user). The username may contain the -“@” symbol being used by many mail systems as part of the -login name. The special characters “/” -(%2F), “:” (%3A) and -“%” (%25) have to be URL-encoded in -usernames using the %-notation. -

    -A password can be given, too but is not recommended if the URL is -specified in a configuration file on disk. +possible using, for example, +$imap_user). The username +may contain the “@” symbol being used by many mail systems +as part of the login name. A password can be given, too but is not +recommended if the URL is specified in a configuration file on disk.

    If no port number is given, Mutt will use the system's default for the given protocol (usually consulting /etc/services).

    -The optional path is only relevant for IMAP and ignored elsewhere. +The optional path is only relevant for IMAP.

    Example 6.1. URLs

     pops://host/
 imaps://user@host/INBOX/Sent
 smtp://user@host:587/
-

    2. SSL/TLS Support

    +


    2. SSL/TLS Support

    If Mutt is compiled with IMAP, POP3 and/or SMTP support, it can also be -compiled with support for SSL or TLS using either OpenSSL or GnuTLS ( by -running the configure script with the +compiled with support for SSL or TLS using either OpenSSL or GnuTLS ( +by running the configure script with the --enable-ssl=... option for OpenSSL or --enable-gnutls=... for GnuTLS). Mutt can then attempt to encrypt communication with remote servers if these protocols -are suffixed with “s” for “secure -communication”. -

    3. POP3 Support

    -If Mutt is compiled with POP3 support (by running the -configure script with the ---enable-pop flag), it has the ability to work with -mailboxes located on a remote POP3 server and fetch mail for local +are suffixed with “s” for “secure communication”. +

    3. POP3 Support

    +If Mutt is compiled with POP3 support (by running the configure +script with the --enable-pop flag), it has the ability to work +with mailboxes located on a remote POP3 server and fetch mail for local browsing.

    -Remote POP3 servers can be accessed using URLs with the -pop protocol for unencrypted and -pops for encrypted communication, see Section 1.2, “URL Syntax” for details. +Remote POP3 servers can be accessed using URLs with the pop protocol +for unencrypted and pops for encrypted +communication, see Section 1.2, “URL Syntax” for details.

    Polling for new mail is more expensive over POP3 than locally. For this reason the frequency at which Mutt will check for mail remotely can be -controlled by the $pop_checkinterval variable, which -defaults to every 60 seconds. +controlled by the +$pop_checkinterval +variable, which defaults to every 60 seconds.

    POP is read-only which doesn't allow for some features like editing -messages or changing flags. However, using Section 7.1, “Header Caching” and Section 7.2, “Body Caching” Mutt -simulates the new/old/read flags as well as flagged and replied. Mutt -applies some logic on top of remote messages but cannot change them so -that modifications of flags are lost when messages are downloaded from -the POP server (either by Mutt or other tools). +messages or changing flags. However, using +Section 7.1, “Header Caching” and Section 7.2, “Body Caching” +Mutt simulates the new/old/read flags as well as flagged and replied. +Mutt applies some logic on top of remote messages but cannot change +them so that modifications of flags are lost when +messages are downloaded from the POP server (either by Mutt or other +tools).

    -Another way to access your POP3 mail is the -<fetch-mail> function (default: G). It allows -to connect to $pop_host, fetch all your -new mail and place it in the local $spoolfile. After this point, Mutt runs -exactly as if the mail had always been local. -

    Note

    -If you only need to fetch all messages to a local mailbox you should -consider using a specialized program, such as -fetchmail(1), getmail(1) or -similar. -

    4. IMAP Support

    -If Mutt was compiled with IMAP support (by running the -configure script with the ---enable-imap flag), it has the ability to work +Another way to access your POP3 mail is the <fetch-mail> function +(default: G). It allows to connect to $pop_host, fetch all your new mail and place it in the +local $spoolfile. After this +point, Mutt runs exactly as if the mail had always been local. +

    Note

    +If you only need to fetch all messages to a +local mailbox you should consider using a specialized program, such as +fetchmail(1), getmail(1) or similar. +

    4. IMAP Support

    +If Mutt was compiled with IMAP support (by running the configure +script with the --enable-imap flag), it has the ability to work with folders located on a remote IMAP server.

    -You can access the remote inbox by selecting the folder by its URL (see -Section 1.2, “URL Syntax” for details) using the +You can access the remote inbox by selecting the folder by its URL +(see Section 1.2, “URL Syntax” for details) using the imap or imaps protocol. -Alternatively, a pine-compatible notation is also supported, i.e. +Alternatively, a pine-compatible notation is also supported, ie {[username@]imapserver[:port][/ssl]}path/to/folder

    -Note that not all servers use “/” as the hierarchy -separator. Mutt should correctly notice which separator is being used -by the server and convert paths accordingly. +Note that not all servers use “/” as the hierarchy separator. Mutt should +correctly notice which separator is being used by the server and convert +paths accordingly.

    When browsing folders on an IMAP server, you can toggle whether to look at only the folders you are subscribed to, or all folders with the -toggle-subscribed command. See also the $imap_list_subscribed variable. +toggle-subscribed command. See also the +$imap_list_subscribed variable.

    -Polling for new mail on an IMAP server can cause noticeable delays. So, -you'll want to carefully tune the $mail_check and $timeout variables. Reasonable values are: +Polling for new mail on an IMAP server can cause noticeable delays. So, you'll +want to carefully tune the +$mail_check +and +$timeout +variables. Reasonable values are: 

     set mail_check=90
 set timeout=15

    with relatively good results even over slow modem lines. -

    Note

    +

    Note

    Note that if you are using mbox as the mail store on UW servers prior to -v12.250, the server has been reported to disconnect a client if another -client selects the same folder. -

    4.1. The IMAP Folder Browser

    +v12.250, the server has been reported to disconnect a client if another client +selects the same folder. +

    4.1. The IMAP Folder Browser

    As of version 1.2, Mutt supports browsing mailboxes on an IMAP server. This is mostly the same as the local file browser, with the following differences: -

    • -In lieu of file permissions, Mutt displays the string -“IMAP”, possibly followed by the symbol “+”, -indicating that the entry contains both messages and subfolders. On +

      • +In lieu of file permissions, Mutt displays the string “IMAP”, +possibly followed by the symbol “+”, indicating +that the entry contains both messages and subfolders. On Cyrus-like servers folders will often contain both messages and subfolders. -

      • -For the case where an entry can contain both messages and subfolders, -the selection key (bound to enter by default) will -choose to descend into the subfolder view. If you wish to view the -messages in that folder, you must use view-file -instead (bound to space by default). -

      • +

      • +For the case where an entry can contain both messages and +subfolders, the selection key (bound to enter by default) +will choose to descend into the subfolder view. If you wish to view +the messages in that folder, you must use view-file instead +(bound to space by default). +

      • You can create, delete and rename mailboxes with the -<create-mailbox>, -<delete-mailbox>, and -<rename-mailbox> commands (default bindings: -C, d and r, -respectively). You may also <subscribe> and -<unsubscribe> to mailboxes (normally these are -bound to s and u, respectively). -

    4.2. Authentication

    +<create-mailbox>, <delete-mailbox>, and +<rename-mailbox> commands (default bindings: C, +d and r, respectively). You may also +<subscribe> and <unsubscribe> to mailboxes (normally +these are bound to s and u, respectively). +

    4.2. Authentication

    Mutt supports four authentication methods with IMAP servers: SASL, GSSAPI, CRAM-MD5, and LOGIN (there is a patch by Grant Edwards to add NTLM authentication for you poor exchange users out there, but it has -yet to be integrated into the main tree). There is also support for the -pseudo-protocol ANONYMOUS, which allows you to log in to a public IMAP -server without having an account. To use ANONYMOUS, simply make your -username blank or “anonymous”. -

    -SASL is a special super-authenticator, which selects among several -protocols (including GSSAPI, CRAM-MD5, ANONYMOUS, and DIGEST-MD5) the -most secure method available on your host and the server. Using some of -these methods (including DIGEST-MD5 and possibly GSSAPI), your entire -session will be encrypted and invisible to those teeming network -snoops. It is the best option if you have it. To use it, you must have -the Cyrus SASL library installed on your system and compile Mutt with -the --with-sasl flag. -

    -Mutt will try whichever methods are compiled in and available on the -server, in the following order: SASL, ANONYMOUS, GSSAPI, CRAM-MD5, -LOGIN. +yet to be integrated into the main tree). There is also support for +the pseudo-protocol ANONYMOUS, which allows you to log in to a public +IMAP server without having an account. To use ANONYMOUS, simply make +your username blank or “anonymous”. +

    +SASL is a special super-authenticator, which selects among several protocols +(including GSSAPI, CRAM-MD5, ANONYMOUS, and DIGEST-MD5) the most secure +method available on your host and the server. Using some of these methods +(including DIGEST-MD5 and possibly GSSAPI), your entire session will be +encrypted and invisible to those teeming network snoops. It is the best +option if you have it. To use it, you must have the Cyrus SASL library +installed on your system and compile Mutt with the --with-sasl flag. +

    +Mutt will try whichever methods are compiled in and available on the server, +in the following order: SASL, ANONYMOUS, GSSAPI, CRAM-MD5, LOGIN.

    There are a few variables which control authentication: -

    • -$imap_user - controls the username -under which you request authentication on the IMAP server, for all -authenticators. This is overridden by an explicit username in the -mailbox path (i.e. by using a mailbox name of the form +

      • +$imap_user - controls +the username under which you request authentication on the IMAP server, +for all authenticators. This is overridden by an explicit username in +the mailbox path (ie by using a mailbox name of the form {user@host}). -

      • -$imap_pass - a password which you may -preset, used by all authentication methods where a password is needed. -

      • -$imap_authenticators - a -colon-delimited list of IMAP authentication methods to try, in the order -you wish to try them. If specified, this overrides Mutt's default -(attempt everything, in the order listed above). -

    5. SMTP Support

    +

  • +$imap_pass - a +password which you may preset, used by all authentication methods where +a password is needed. +

  • +$imap_authenticators - a colon-delimited list of IMAP +authentication methods to try, in the order you wish to try them. If +specified, this overrides Mutt's default (attempt everything, in the order +listed above). +

    • 5. SMTP Support

    Besides supporting traditional mail delivery through a sendmail-compatible program, Mutt supports delivery through SMTP if it was configured and built with --enable-smtp.

    -If the configuration variable $smtp_url -is set, Mutt will contact the given SMTP server to deliver messages; if -it is unset, Mutt will use the program specified by $sendmail. -

    -For details on the URL syntax, please see Section 1.2, “URL Syntax”. -

    -The built-in SMTP support supports encryption (the -smtps protocol using SSL or TLS) as well as SMTP -authentication using SASL. The authentication mechanisms for SASL are -specified in $smtp_authenticators defaulting to -an empty list which makes Mutt try all available methods from -most-secure to least-secure. -

    6. Managing Multiple Accounts

    +If the configuration variable +$smtp_url is set, Mutt +will contact the given SMTP server to deliver messages; if it is unset, +Mutt will use the program specified by $sendmail. +

    +For details on the URL syntax, please see Section 1.2, “URL Syntax”. +

    +The built-in SMTP support supports encryption (the smtps protocol +using SSL or TLS) as well as SMTP authentication using SASL. The authentication mechanisms +for SASL are specified in $smtp_authenticators +defaulting to an empty list which makes Mutt try all available methods +from most-secure to least-secure. +

    6. Managing Multiple Accounts

    Usage:

    account-hook pattern command

    -If you happen to have accounts on multiple IMAP, POP and/or SMTP -servers, you may find managing all the authentication settings -inconvenient and error-prone. The account-hook command -may help. This hook works like folder-hook but is -invoked whenever Mutt needs to access a remote mailbox (including inside -the folder browser), not just when you open the mailbox. This includes -(for example) polling for new mail, storing Fcc messages and saving -messages to a folder. As a consequence, account-hook should -only be used to set connection-related settings such as passwords or -tunnel commands but not settings such as sender address or name (because -in general it should be considered unpredictable which account-hook was last -used). +If you happen to have accounts on multiple IMAP, POP and/or SMTP servers, +you may find managing all the authentication settings inconvenient and +error-prone. The account-hook command may help. This hook works like +folder-hook but is invoked whenever Mutt needs to access a remote mailbox +(including inside the folder browser), not just when you open the +mailbox. This includes (for example) polling for new mail, storing Fcc +messages and saving messages to a folder. As a consequence, +account-hook should only be used to set connection-related settings such +as passwords or tunnel commands but not settings such as sender +address or name (because in general it should be considered unpredictable +which account-hook was last used).

    Some examples: 

    @@ -3913,8 +3550,11 @@
 account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'
 account-hook smtp://user@host3/ 'set tunnel="ssh host3 /usr/libexec/smtpd"'

    -To manage multiple accounts with, for example, different values of $record or sender addresses, folder-hook has to be be -used together with the mailboxes command. +To manage multiple accounts with, for example, different values of +$record or sender addresses, +folder-hook +has to be be used together with +the mailboxes command.

    Example 6.2. Managing multiple accounts

     mailboxes imap://user@host1/INBOX
 folder-hook imap://user@host1/ 'set folder=imap://host1/ ; set record=+INBOX/Sent'
@@ -3922,130 +3562,124 @@
 mailboxes imap://user@host2/INBOX
 folder-hook imap://user@host2/ 'set folder=imap://host2/ ; set record=+INBOX/Sent'

    -In example Example 6.2, “Managing multiple accounts” the folders are defined -using mailboxes so -Mutt polls them for new mail. Each folder-hook triggers -when one mailbox below each IMAP account is opened and sets $folder to the account's root folder. Next, it -sets $record to the -INBOX/Sent folder below the newly set $folder. Please notice that the value the -“+” mailbox shortcut -refers to depends on the current value of $folder and therefore has to be set separately -per account. Setting other values like $from -or $signature is analogous to setting -$record. -

    7. Local Caching

    -Mutt contains two types of local caching: (1) the -so-called “header caching” and (2) the -so-called “body caching” which are both described in this -section. +In example +Example 6.2, “Managing multiple accounts” the folders are defined using +mailboxes so Mutt polls them for new +mail. Each folder-hook triggers when +one mailbox below each IMAP account is opened and sets +$folder to the account's root +folder. Next, it sets $record to +the INBOX/Sent folder below the newly +set $folder. Please notice that the +value the “+” +mailbox shortcut refers to depends on +the current value +of $folder and therefore has to be set +separatedly per account. Setting other values +like $from +or $signature is analogous to setting +$record. +

    7. Local Caching

    +Mutt contains two types of local caching: (1) +the so-called “header caching” and (2) the +so-called “body caching” which are both described in this section.

    Header caching is optional as it depends on external libraries, body caching is always enabled if Mutt is compiled with POP and/or IMAP support as these use it (body caching requires no external library). -

    7.1. Header Caching

    +

    7.1. Header Caching

    Mutt provides optional support for caching message headers for the following types of folders: IMAP, POP, Maildir and MH. Header caching -greatly speeds up opening large folders because for remote folders, -headers usually only need to be downloaded once. For Maildir and MH, -reading the headers from a single file is much faster than looking at -possibly thousands of single files (since Maildir and MH use one file -per message.) +greatly improves speed because for remote folders, headers +usually only need to be downloaded once. For Maildir and MH, reading the +headers from a single file is much faster than looking at possibly +thousands of single files (since Maildir and MH use one file per message.)

    Header caching can be enabled via the configure script and the ---enable-hcache option. It's not turned on by -default because external database libraries are required: one of -tokyocabinet, qdbm, gdbm or bdb must be present. -

    -If enabled, $header_cache can be -used to either point to a file or a directory. If set to point to a -file, one database file for all folders will be used (which may result -in lower performance), but one file per folder if it points to a -directory. -

    7.2. Body Caching

    +--enable-hcache option. It's not turned on +by default because external database libraries are required: one +of tokyocabinet, qdbm, gdbm or bdb must be present. +

    +If enabled, $header_cache can be +used to either point to a file or a directory. If set to point to +a file, one database file for all folders will be used (which may +result in lower performance), but one file per folder if it points +to a directory. +

    7.2. Body Caching

    Both cache methods can be combined using the same directory for storage (and for IMAP/POP even provide meaningful file names) which simplifies manual maintenance tasks.

    -In addition to caching message headers only, Mutt can also cache whole -message bodies. This results in faster display of messages for POP and -IMAP folders because messages usually have to be downloaded only once. -

    -For configuration, the variable $message_cachedir must point to a directory. There, Mutt will -create a hierarchy of subdirectories named like the account and mailbox -path the cache is for. -

    7.3. Cache Directories

    -For using both, header and body caching, $header_cache and $message_cachedir can be safely set -to the same value. +In addition to caching message headers only, Mutt can also cache +whole message bodies. This results in faster display of messages +for POP and IMAP folders because messages usually have to be +downloaded only once.

    -In a header or body cache directory, Mutt creates a directory hierarchy +For configuration, the variable $message_cachedir must point to a +directory. There, Mutt will create a hierarchy of subdirectories named like: proto:user@hostname where -proto is either “pop” or -“imap.” Within there, for each folder, Mutt stores messages -in single files and header caches in files with the -“.hcache” extension. All files can be removed as needed if -the consumed disk space becomes an issue as Mutt will silently fetch -missing items again. Pathnames are always stored in UTF-8 encoding. -

    -For Maildir and MH, the header cache files are named after the MD5 -checksum of the path. -

    7.4. Maintenance

    +proto is either “pop” or “imap.” Within +there for each folder, Mutt stores messages in single files. +All files can be removed as needed if the consumed disk space +becomes an issue as Mutt will silently fetch missing items again. +

    7.3. Maintenance

    Mutt does not (yet) support maintenance features for header cache database files so that files have to be removed in case they grow too big. It depends on the database library used for header caching whether disk space freed by removing messages is re-used.

    -For body caches, Mutt can keep the local cache in sync with the remote -mailbox if the $message_cache_clean variable is -set. Cleaning means to remove messages from the cache which are no -longer present in the mailbox which only happens when other mail clients -or instances of Mutt using a different body cache location delete -messages (Mutt itself removes deleted messages from the cache when -syncing a mailbox). As cleaning can take a noticeable amount of time, it -should not be set in general but only occasionally. -

    8. Exact Address Generation

    -Mutt supports the “Name <user@host>” address syntax -for reading and writing messages, the older “user@host -(Name)” syntax is only supported when reading messages. The ---enable-exact-address switch can be given to -configure to build it with write-support for the latter -syntax. EXACT_ADDRESS in the output of mutt --v indicates whether it's supported. -

    9. Sending Anonymous Messages via Mixmaster

    +For body caches, Mutt can keep the local cache in sync with the +remote mailbox if the +$message_cache_clean +variable is set. Cleaning means to remove messages from the cache which +are no longer present in the mailbox which only happens when other mail +clients or instances of Mutt using a different body cache location +delete messages (Mutt itself removes deleted messages from the cache +when syncing a mailbox). As cleaning can take a noticeable amount of time, +it should not be set in general but only occasionally. +

    8. Exact Address Generation

    +Mutt supports the “Name <user@host>” address syntax for reading and +writing messages, the older “user@host (Name)” syntax is only supported when +reading messages. The --enable-exact-address +switch can be given to configure to build it with write-support +for the latter syntax. EXACT_ADDRESS in the output of +mutt -v indicates whether it's supported. +

    9. Sending Anonymous Messages via Mixmaster

    You may also have compiled Mutt to co-operate with Mixmaster, an anonymous remailer. Mixmaster permits you to send your messages anonymously using a chain of remailers. Mixmaster support in Mutt is for -mixmaster version 2.04 or later. -

    -To use it, you'll have to obey certain restrictions. Most important, -you cannot use the Cc and Bcc -headers. To tell Mutt to use mixmaster, you have to select a remailer -chain, using the mix function on the compose menu. -

    -The chain selection screen is divided into two parts. In the (larger) -upper part, you get a list of remailers you may use. In the lower part, -you see the currently selected chain of remailers. -

    -You can navigate in the chain using the -<chain-prev> and -<chain-next> functions, which are by default -bound to the left and right arrows and to the h and -l keys (think vi keyboard bindings). To insert a -remailer at the current chain position, use the -<insert> function. To append a remailer behind -the current chain position, use <select-entry> -or <append>. You can also delete entries from -the chain, using the corresponding function. Finally, to abandon your -changes, leave the menu, or <accept> them -pressing (by default) the Return key. -

    -Note that different remailers do have different capabilities, indicated -in the %c entry of the remailer menu lines (see $mix_entry_format). Most important is -the “middleman” capability, indicated by a capital -“M”: This means that the remailer in question cannot be -used as the final element of a chain, but will only forward messages to -other mixmaster remailers. For details on the other capabilities, -please have a look at the mixmaster documentation. -

    Chapter 7. Security Considerations

    Table of Contents

    1. Passwords
    2. Temporary Files
    3. Information Leaks
    3.1. Message-Id: headers
    3.2. mailto:-style Links
    4. External Applications

    +mixmaster version 2.04 (beta 45 appears to be the latest) and 2.03. +It does not support earlier versions or the later so-called version 3 betas, +of which the latest appears to be called 2.9b23. +

    +To use it, you'll have to obey certain restrictions. Most +important, you cannot use the Cc and Bcc headers. To tell +Mutt to use mixmaster, you have to select a remailer chain, using +the mix function on the compose menu. +

    +The chain selection screen is divided into two parts. In the +(larger) upper part, you get a list of remailers you may use. In +the lower part, you see the currently selected chain of remailers. +

    +You can navigate in the chain using the <chain-prev> and +<chain-next> functions, which are by default bound to the left +and right arrows and to the h and l keys (think vi +keyboard bindings). To insert a remailer at the current chain +position, use the <insert> function. To append a remailer behind +the current chain position, use <select-entry> or <append>. +You can also delete entries from the chain, using the corresponding +function. Finally, to abandon your changes, leave the menu, or +<accept> them pressing (by default) the Return key. +

    +Note that different remailers do have different capabilities, +indicated in the %c entry of the remailer menu lines (see +$mix_entry_format). Most important is +the “middleman” capability, indicated by a capital “M”: This +means that the remailer in question cannot be used as the final +element of a chain, but will only forward messages to other +mixmaster remailers. For details on the other capabilities, please +have a look at the mixmaster documentation. +

    Chapter 7. Security Considerations

    Table of Contents

    1. Passwords
    2. Temporary Files
    3. Information Leaks
    3.1. Message-Id: headers
    3.2. mailto:-style Links
    4. External Applications

    First of all, Mutt contains no security holes included by intention but may contain unknown security holes. As a consequence, please run Mutt only with as few permissions as possible. Especially, do not run Mutt as @@ -4053,7 +3687,7 @@

    When configuring Mutt, there're some points to note about secure setups so please read this chapter carefully. -

    1. Passwords

    +

    1. Passwords

    Although Mutt can be told the various passwords for accounts, please never store passwords in configuration files. Besides the fact that the system's operator can always read them, you could forget to mask it out @@ -4061,29 +3695,29 @@ your mail including your password could be archived by internet search engines, mail-to-news gateways etc. It may already be too late before you notice your mistake. -

    2. Temporary Files

    +

    2. Temporary Files

    Mutt uses many temporary files for viewing messages, verifying digital signatures, etc. As long as being used, these files are visible by other users and maybe even readable in case of misconfiguration. Also, a different location for these files may be desired which can be changed -via the $tmpdir variable. -

    3. Information Leaks

    3.1. Message-Id: headers

    +via the $tmpdir variable. +

    3. Information Leaks

    3.1. Message-Id: headers

    Message-Id: headers contain a local part that is to be created in a -unique fashion. In order to do so, Mutt will “leak” some +unique fashion. In order to do so, Mutt will “leak” some information to the outside world when sending messages: the generation of this header includes a step counter which is increased (and rotated) with every message sent. In a longer running mutt session, others can -make assumptions about your mailing habits depending on the number of +make assumptions about your mailing habbits depending on the number of messages sent. If this is not desired, the header can be manually -provided using $edit_headers (though -not recommended). -

    3.2. mailto:-style Links

    +provided using $edit_headers (though not +recommended). +

    3.2. mailto:-style Links

    As Mutt be can be set up to be the mail client to handle mailto: style links in websites, there're security considerations, too. Arbitrary header fields can be embedded in these links which could override existing header fields or attach arbitrary -files using the Attach: -pseudoheader. This may be problematic if the $edit-headers variable is +files using the Attach: +psuedoheader. This may be problematic if the $edit-headers variable is unset, i.e. the user doesn't want to see header fields while editing the message and doesn't pay enough attention to the compose menu's listing of attachments. @@ -4094,62 +3728,66 @@ will send out the user's private gnupg keyring to joe@host if the user doesn't follow the information on screen carefully enough. -

    4. External Applications

    +

    4. External Applications

    Mutt in many places has to rely on external applications or for convenience supports mechanisms involving external applications.

    One of these is the mailcap mechanism as defined by RfC1524. Details about a secure use of the mailcap mechanisms is given -in Section 3.2, “Secure Use of Mailcap”. +in Section 3.2, “Secure Use of Mailcap”.

    Besides the mailcap mechanism, Mutt uses a number of other external utilities for operation, for example to provide crypto support, in backtick expansion in configuration files or format string filters. The same security considerations apply for these as for tools involved via mailcap. -

    Chapter 8. Performance Tuning

    Table of Contents

    1. Reading and Writing Mailboxes
    2. Reading Messages from Remote Folders
    3. Searching and Limiting

    1. Reading and Writing Mailboxes

    +

    Chapter 8. Performance Tuning

    Table of Contents

    1. Reading and Writing Mailboxes
    2. Reading Messages from Remote Folders
    3. Searching and Limiting

    1. Reading and Writing Mailboxes

    Mutt's performance when reading mailboxes can be improved in two ways: -

    1. -For remote folders (IMAP and POP) as well as folders using one-file-per -message storage (Maildir and MH), Mutt's performance can be greatly -improved using header caching. +

      1. +For remote folders (IMAP and POP) as well as folders using +one-file-per message storage (Maildir and MH), Mutt's +performance can be greatly improved using +header caching. using a single database per folder. -

      2. -Mutt provides the $read_inc and $write_inc variables to specify at which rate -to update progress counters. If these values are too low, Mutt may spend -more time on updating the progress counter than it spends on actually -reading/writing folders. -

        -For example, when opening a maildir folder with a few thousand messages, -the default value for $read_inc may be -too low. It can be tuned on on a folder-basis using folder-hooks: +

      3. +Mutt provides the $read_inc +and $write_inc +variables to specify at which rate to update progress +counters. If these values are too low, Mutt may spend more +time on updating the progress counter than it spends on +actually reading/writing folders. +

        +For example, when opening a maildir folder with a few +thousand messages, the default value for +$read_inc +may be too low. It can be tuned on on a folder-basis using +folder-hooks: 

        -# use very high $read_inc to speed up reading hcache'd maildirs
+# use very high $read_inc to speed up reading hcache'd maildirs
 folder-hook . 'set read_inc=1000'
-# use lower value for reading slower remote IMAP folders
+# use lower value for reading slower remote IMAP folders
 folder-hook ^imap 'set read_inc=100'
-# use even lower value for reading even slower remote POP folders
-folder-hook ^pop 'set read_inc=1'

      -These settings work on a per-message basis. However, as messages may -greatly differ in size and certain operations are much faster than -others, even per-folder settings of the increment variables may not be +# use even lower value for reading even slower remote POP folders +folder-hook ^pop 'set read_inc=1'

    These settings work on a per-message basis. However, as messages may +greatly differ in size and certain operations are much faster than others, +even per-folder settings of the increment variables may not be desirable as they produce either too few or too much progress updates. -Thus, Mutt allows to limit the number of progress updates per second -it'll actually send to the terminal using the $time_inc variable. -

    2. Reading Messages from Remote Folders

    -Reading messages from remote folders such as IMAP an POP can be slow -especially for large mailboxes since Mutt only caches a very limited -number of recently viewed messages (usually 10) per session (so that it -will be gone for the next session.) -

    -To improve performance and permanently cache whole messages, please -refer to Mutt's so-called body -caching for details. -

    3. Searching and Limiting

    -When searching mailboxes either via a search or a limit action, for some -patterns Mutt distinguishes between regular expression and string +Thus, Mutt allows to limit the number of progress updates per second it'll +actually send to the terminal using the +$time_inc variable.

    2. Reading Messages from Remote Folders

    +Reading messages from remote folders such as IMAP an POP can be +slow especially for large mailboxes since Mutt only caches a very +limited number of recently viewed messages (usually 10) per +session (so that it will be gone for the next session.) +

    +To improve performance and permanently cache whole messages, +please refer to Mutt's so-called +body caching for details. +

    3. Searching and Limiting

    +When searching mailboxes either via a search or a limit action, for +some patterns Mutt distinguishes between regular expression and string searches. For regular expressions, patterns are prefixed with -“~” and with “=” for string searches. +“˜” and with “=” for string searches.

    Even though a regular expression search is fast, it's several times slower than a pure string search which is noticeable especially on large @@ -4160,17 +3798,16 @@ For example, when limiting a large folder to all messages sent to or by an author, it's much faster to search for the initial part of an e-mail address via =Luser@ instead of -~Luser@. This is especially true for searching +˜Luser@. This is especially true for searching message bodies since a larger amount of input has to be searched.

    As for regular expressions, a lower case string search pattern makes Mutt perform a case-insensitive search except for IMAP (because for IMAP -Mutt performs server-side searches which don't support -case-insensitivity). -

    Chapter 9. Reference

    Table of Contents

    1. Command-Line Options
    2. Configuration Commands
    3. Configuration Variables
    3.1. abort_nosubject
    3.2. abort_unmodified
    3.3. alias_file
    3.4. alias_format
    3.5. allow_8bit
    3.6. allow_ansi
    3.7. arrow_cursor
    3.8. ascii_chars
    3.9. askbcc
    3.10. askcc
    3.11. assumed_charset
    3.12. attach_charset
    3.13. attach_format
    3.14. attach_sep
    3.15. attach_split
    3.16. attribution
    3.17. auto_tag
    3.18. autoedit
    3.19. beep
    3.20. beep_new
    3.21. bounce
    3.22. bounce_delivered
    3.23. braille_friendly
    3.24. certificate_file
    3.25. charset
    3.26. check_mbox_size
    3.27. check_new
    3.28. collapse_unread
    3.29. compose_format
    3.30. config_charset
    3.31. confirmappend
    3.32. confirmcreate
    3.33. connect_timeout
    3.34. content_type
    3.35. copy
    3.36. crypt_autoencrypt
    3.37. crypt_autopgp
    3.38. crypt_autosign
    3.39. crypt_autosmime
    3.40. crypt_replyencrypt
    3.41. crypt_replysign
    3.42. crypt_replysignencrypted
    3.43. crypt_timestamp
    3.44. crypt_use_gpgme
    3.45. crypt_use_pka
    3.46. crypt_verify_sig
    3.47. date_format
    3.48. default_hook
    3.49. delete
    3.50. delete_untag
    3.51. digest_collapse
    3.52. display_filter
    3.53. dotlock_program
    3.54. dsn_notify
    3.55. dsn_return
    3.56. duplicate_threads
    3.57. edit_headers
    3.58. editor
    3.59. encode_from
    3.60. entropy_file
    3.61. envelope_from_address
    3.62. escape
    3.63. fast_reply
    3.64. fcc_attach
    3.65. fcc_clear
    3.66. folder
    3.67. folder_format
    3.68. followup_to
    3.69. force_name
    3.70. forward_decode
    3.71. forward_decrypt
    3.72. forward_edit
    3.73. forward_format
    3.74. forward_quote
    3.75. from
    3.76. gecos_mask
    3.77. hdrs
    3.78. header
    3.79. header_cache
    3.80. header_cache_compress
    3.81. header_cache_pagesize
    3.82. help
    3.83. hidden_host
    3.84. hide_limited
    3.85. hide_missing
    3.86. hide_thread_subject
    3.87. hide_top_limited
    3.88. hide_top_missing
    3.89. history
    3.90. history_file
    3.91. honor_disposition
    3.92. honor_followup_to
    3.93. hostname
    3.94. ignore_linear_white_space
    3.95. ignore_list_reply_to
    3.96. imap_authenticators
    3.97. imap_check_subscribed
    3.98. imap_delim_chars
    3.99. imap_headers
    3.100. imap_idle
    3.101. imap_keepalive
    3.102. imap_list_subscribed
    3.103. imap_login
    3.104. imap_pass
    3.105. imap_passive
    3.106. imap_peek
    3.107. imap_pipeline_depth
    3.108. imap_servernoise
    3.109. imap_user
    3.110. implicit_autoview
    3.111. include
    3.112. include_onlyfirst
    3.113. indent_string
    3.114. index_format
    3.115. ispell
    3.116. keep_flagged
    3.117. locale
    3.118. mail_check
    3.119. mail_check_recent
    3.120. mailcap_path
    3.121. mailcap_sanitize
    3.122. maildir_header_cache_verify
    3.123. maildir_trash
    3.124. mark_old
    3.125. markers
    3.126. mask
    3.127. mbox
    3.128. mbox_type
    3.129. menu_context
    3.130. menu_move_off
    3.131. menu_scroll
    3.132. message_cache_clean
    3.133. message_cachedir
    3.134. message_format
    3.135. meta_key
    3.136. metoo
    3.137. mh_purge
    3.138. mh_seq_flagged
    3.139. mh_seq_replied
    3.140. mh_seq_unseen
    3.141. mime_forward
    3.142. mime_forward_decode
    3.143. mime_forward_rest
    3.144. mix_entry_format
    3.145. mixmaster
    3.146. move
    3.147. narrow_tree
    3.148. net_inc
    3.149. pager
    3.150. pager_context
    3.151. pager_format
    3.152. pager_index_lines
    3.153. pager_stop
    3.154. pgp_auto_decode
    3.155. pgp_autoinline
    3.156. pgp_check_exit
    3.157. pgp_clearsign_command
    3.158. pgp_decode_command
    3.159. pgp_decrypt_command
    3.160. pgp_encrypt_only_command
    3.161. pgp_encrypt_sign_command
    3.162. pgp_entry_format
    3.163. pgp_export_command
    3.164. pgp_getkeys_command
    3.165. pgp_good_sign
    3.166. pgp_ignore_subkeys
    3.167. pgp_import_command
    3.168. pgp_list_pubring_command
    3.169. pgp_list_secring_command
    3.170. pgp_long_ids
    3.171. pgp_mime_auto
    3.172. pgp_replyinline
    3.173. pgp_retainable_sigs
    3.174. pgp_show_unusable
    3.175. pgp_sign_as
    3.176. pgp_sign_command
    3.177. pgp_sort_keys
    3.178. pgp_strict_enc
    3.179. pgp_timeout
    3.180. pgp_use_gpg_agent
    3.181. pgp_verify_command
    3.182. pgp_verify_key_command
    3.183. pipe_decode
    3.184. pipe_sep
    3.185. pipe_split
    3.186. pop_auth_try_all
    3.187. pop_authenticators
    3.188. pop_checkinterval
    3.189. pop_delete
    3.190. pop_host
    3.191. pop_last
    3.192. pop_pass
    3.193. pop_reconnect
    3.194. pop_user
    3.195. post_indent_string
    3.196. postpone
    3.197. postponed
    3.198. preconnect
    3.199. print
    3.200. print_command
    3.201. print_decode
    3.202. print_split
    3.203. prompt_after
    3.204. query_command
    3.205. query_format
    3.206. quit
    3.207. quote_regexp
    3.208. read_inc
    3.209. read_only
    3.210. realname
    3.211. recall
    3.212. record
    3.213. reply_regexp
    3.214. reply_self
    3.215. reply_to
    3.216. resolve
    3.217. reverse_alias
    3.218. reverse_name
    3.219. reverse_realname
    3.220. rfc2047_parameters
    3.221. save_address
    3.222. save_empty
    3.223. save_history
    3.224. save_name
    3.225. score
    3.226. score_threshold_delete
    3.227. score_threshold_flag
    3.228. score_threshold_read
    3.229. search_context
    3.230. send_charset
    3.231. sendmail
    3.232. sendmail_wait
    3.233. shell
    3.234. sig_dashes
    3.235. sig_on_top
    3.236. signature
    3.237. simple_search
    3.238. sleep_time
    3.239. smart_wrap
    3.240. smileys
    3.241. smime_ask_cert_label
    3.242. smime_ca_location
    3.243. smime_certificates
    3.244. smime_decrypt_command
    3.245. smime_decrypt_use_default_key
    3.246. smime_default_key
    3.247. smime_encrypt_command
    3.248. smime_encrypt_with
    3.249. smime_get_cert_command
    3.250. smime_get_cert_email_command
    3.251. smime_get_signer_cert_command
    3.252. smime_import_cert_command
    3.253. smime_is_default
    3.254. smime_keys
    3.255. smime_pk7out_command
    3.256. smime_sign_command
    3.257. smime_sign_opaque_command
    3.258. smime_timeout
    3.259. smime_verify_command
    3.260. smime_verify_opaque_command
    3.261. smtp_authenticators
    3.262. smtp_pass
    3.263. smtp_url
    3.264. sort
    3.265. sort_alias
    3.266. sort_aux
    3.267. sort_browser
    3.268. sort_re
    3.269. spam_separator
    3.270. spoolfile
    3.271. ssl_ca_certificates_file
    3.272. ssl_client_cert
    3.273. ssl_force_tls
    3.274. ssl_min_dh_prime_bits
    3.275. ssl_starttls
    3.276. ssl_use_sslv2
    3.277. ssl_use_sslv3
    3.278. ssl_use_tlsv1
    3.279. ssl_usesystemcerts
    3.280. ssl_verify_dates
    3.281. ssl_verify_host
    3.282. status_chars
    3.283. status_format
    3.284. status_on_top
    3.285. strict_threads
    3.286. suspend
    3.287. text_flowed
    3.288. thorough_search
    3.289. thread_received
    3.290. tilde
    3.291. time_inc
    3.292. timeout
    3.293. tmpdir
    3.294. to_chars
    3.295. tunnel
    3.296. uncollapse_jump
    3.297. use_8bitmime
    3.298. use_domain
    3.299. use_envelope_from
    3.300. use_from
    3.301. use_idn
    3.302. use_ipv6
    3.303. user_agent
    3.304. visual
    3.305. wait_key
    3.306. weed
    3.307. wrap
    3.308. wrap_headers
    3.309. wrap_search
    3.310. wrapmargin
    3.311. write_bcc
    3.312. write_inc
    4. Functions
    4.1. Generic Menu
    4.2. Index Menu
    4.3. Pager Menu
    4.4. Alias Menu
    4.5. Query Menu
    4.6. Attachment Menu
    4.7. Compose Menu
    4.8. Postpone Menu
    4.9. Browser Menu
    4.10. Pgp Menu
    4.11. Smime Menu
    4.12. Mixmaster Menu
    4.13. Editor Menu

    1. Command-Line Options

    -Running mutt with no arguments will make Mutt attempt -to read your spool mailbox. However, it is possible to read other -mailboxes and to send messages from the command line as well. +Mutt performs server-side searches which don't support case-insensivity). +

    Chapter 9. Reference

    Table of Contents

    1. Command-Line Options
    2. Configuration Commands
    3. Configuration Variables
    3.1. abort_nosubject
    3.2. abort_unmodified
    3.3. alias_file
    3.4. alias_format
    3.5. allow_8bit
    3.6. allow_ansi
    3.7. arrow_cursor
    3.8. ascii_chars
    3.9. askbcc
    3.10. askcc
    3.11. assumed_charset
    3.12. attach_charset
    3.13. attach_format
    3.14. attach_sep
    3.15. attach_split
    3.16. attribution
    3.17. auto_tag
    3.18. autoedit
    3.19. beep
    3.20. beep_new
    3.21. bounce
    3.22. bounce_delivered
    3.23. braille_friendly
    3.24. certificate_file
    3.25. charset
    3.26. check_mbox_size
    3.27. check_new
    3.28. collapse_unread
    3.29. compose_format
    3.30. config_charset
    3.31. confirmappend
    3.32. confirmcreate
    3.33. connect_timeout
    3.34. content_type
    3.35. copy
    3.36. crypt_autoencrypt
    3.37. crypt_autopgp
    3.38. crypt_autosign
    3.39. crypt_autosmime
    3.40. crypt_replyencrypt
    3.41. crypt_replysign
    3.42. crypt_replysignencrypted
    3.43. crypt_timestamp
    3.44. crypt_use_gpgme
    3.45. crypt_use_pka
    3.46. crypt_verify_sig
    3.47. date_format
    3.48. default_hook
    3.49. delete
    3.50. delete_untag
    3.51. digest_collapse
    3.52. display_filter
    3.53. dotlock_program
    3.54. dsn_notify
    3.55. dsn_return
    3.56. duplicate_threads
    3.57. edit_headers
    3.58. editor
    3.59. encode_from
    3.60. entropy_file
    3.61. envelope_from_address
    3.62. escape
    3.63. fast_reply
    3.64. fcc_attach
    3.65. fcc_clear
    3.66. folder
    3.67. folder_format
    3.68. followup_to
    3.69. force_name
    3.70. forward_decode
    3.71. forward_decrypt
    3.72. forward_edit
    3.73. forward_format
    3.74. forward_quote
    3.75. from
    3.76. gecos_mask
    3.77. hdrs
    3.78. header
    3.79. header_cache
    3.80. header_cache_compress
    3.81. header_cache_pagesize
    3.82. help
    3.83. hidden_host
    3.84. hide_limited
    3.85. hide_missing
    3.86. hide_thread_subject
    3.87. hide_top_limited
    3.88. hide_top_missing
    3.89. history
    3.90. history_file
    3.91. honor_disposition
    3.92. honor_followup_to
    3.93. hostname
    3.94. ignore_linear_white_space
    3.95. ignore_list_reply_to
    3.96. imap_authenticators
    3.97. imap_check_subscribed
    3.98. imap_delim_chars
    3.99. imap_headers
    3.100. imap_idle
    3.101. imap_keepalive
    3.102. imap_list_subscribed
    3.103. imap_login
    3.104. imap_pass
    3.105. imap_passive
    3.106. imap_peek
    3.107. imap_pipeline_depth
    3.108. imap_servernoise
    3.109. imap_user
    3.110. implicit_autoview
    3.111. include
    3.112. include_onlyfirst
    3.113. indent_string
    3.114. index_format
    3.115. ispell
    3.116. keep_flagged
    3.117. locale
    3.118. mail_check
    3.119. mailcap_path
    3.120. mailcap_sanitize
    3.121. maildir_header_cache_verify
    3.122. maildir_trash
    3.123. mark_old
    3.124. markers
    3.125. mask
    3.126. mbox
    3.127. mbox_type
    3.128. menu_context
    3.129. menu_move_off
    3.130. menu_scroll
    3.131. message_cache_clean
    3.132. message_cachedir
    3.133. message_format
    3.134. meta_key
    3.135. metoo
    3.136. mh_purge
    3.137. mh_seq_flagged
    3.138. mh_seq_replied
    3.139. mh_seq_unseen
    3.140. mime_forward
    3.141. mime_forward_decode
    3.142. mime_forward_rest
    3.143. mix_entry_format
    3.144. mixmaster
    3.145. move
    3.146. narrow_tree
    3.147. net_inc
    3.148. pager
    3.149. pager_context
    3.150. pager_format
    3.151. pager_index_lines
    3.152. pager_stop
    3.153. pgp_auto_decode
    3.154. pgp_autoinline
    3.155. pgp_check_exit
    3.156. pgp_clearsign_command
    3.157. pgp_decode_command
    3.158. pgp_decrypt_command
    3.159. pgp_encrypt_only_command
    3.160. pgp_encrypt_sign_command
    3.161. pgp_entry_format
    3.162. pgp_export_command
    3.163. pgp_getkeys_command
    3.164. pgp_good_sign
    3.165. pgp_ignore_subkeys
    3.166. pgp_import_command
    3.167. pgp_list_pubring_command
    3.168. pgp_list_secring_command
    3.169. pgp_long_ids
    3.170. pgp_mime_auto
    3.171. pgp_replyinline
    3.172. pgp_retainable_sigs
    3.173. pgp_show_unusable
    3.174. pgp_sign_as
    3.175. pgp_sign_command
    3.176. pgp_sort_keys
    3.177. pgp_strict_enc
    3.178. pgp_timeout
    3.179. pgp_use_gpg_agent
    3.180. pgp_verify_command
    3.181. pgp_verify_key_command
    3.182. pipe_decode
    3.183. pipe_sep
    3.184. pipe_split
    3.185. pop_auth_try_all
    3.186. pop_authenticators
    3.187. pop_checkinterval
    3.188. pop_delete
    3.189. pop_host
    3.190. pop_last
    3.191. pop_pass
    3.192. pop_reconnect
    3.193. pop_user
    3.194. post_indent_string
    3.195. postpone
    3.196. postponed
    3.197. preconnect
    3.198. print
    3.199. print_command
    3.200. print_decode
    3.201. print_split
    3.202. prompt_after
    3.203. query_command
    3.204. query_format
    3.205. quit
    3.206. quote_regexp
    3.207. read_inc
    3.208. read_only
    3.209. realname
    3.210. recall
    3.211. record
    3.212. reply_regexp
    3.213. reply_self
    3.214. reply_to
    3.215. resolve
    3.216. reverse_alias
    3.217. reverse_name
    3.218. reverse_realname
    3.219. rfc2047_parameters
    3.220. save_address
    3.221. save_empty
    3.222. save_history
    3.223. save_name
    3.224. score
    3.225. score_threshold_delete
    3.226. score_threshold_flag
    3.227. score_threshold_read
    3.228. search_context
    3.229. send_charset
    3.230. sendmail
    3.231. sendmail_wait
    3.232. shell
    3.233. sig_dashes
    3.234. sig_on_top
    3.235. signature
    3.236. simple_search
    3.237. sleep_time
    3.238. smart_wrap
    3.239. smileys
    3.240. smime_ask_cert_label
    3.241. smime_ca_location
    3.242. smime_certificates
    3.243. smime_decrypt_command
    3.244. smime_decrypt_use_default_key
    3.245. smime_default_key
    3.246. smime_encrypt_command
    3.247. smime_encrypt_with
    3.248. smime_get_cert_command
    3.249. smime_get_cert_email_command
    3.250. smime_get_signer_cert_command
    3.251. smime_import_cert_command
    3.252. smime_is_default
    3.253. smime_keys
    3.254. smime_pk7out_command
    3.255. smime_sign_command
    3.256. smime_sign_opaque_command
    3.257. smime_timeout
    3.258. smime_verify_command
    3.259. smime_verify_opaque_command
    3.260. smtp_authenticators
    3.261. smtp_pass
    3.262. smtp_url
    3.263. sort
    3.264. sort_alias
    3.265. sort_aux
    3.266. sort_browser
    3.267. sort_re
    3.268. spam_separator
    3.269. spoolfile
    3.270. ssl_ca_certificates_file
    3.271. ssl_client_cert
    3.272. ssl_force_tls
    3.273. ssl_min_dh_prime_bits
    3.274. ssl_starttls
    3.275. ssl_use_sslv2
    3.276. ssl_use_sslv3
    3.277. ssl_use_tlsv1
    3.278. ssl_usesystemcerts
    3.279. ssl_verify_dates
    3.280. ssl_verify_host
    3.281. status_chars
    3.282. status_format
    3.283. status_on_top
    3.284. strict_threads
    3.285. suspend
    3.286. text_flowed
    3.287. thorough_search
    3.288. thread_received
    3.289. tilde
    3.290. time_inc
    3.291. timeout
    3.292. tmpdir
    3.293. to_chars
    3.294. tunnel
    3.295. uncollapse_jump
    3.296. use_8bitmime
    3.297. use_domain
    3.298. use_envelope_from
    3.299. use_from
    3.300. use_idn
    3.301. use_ipv6
    3.302. user_agent
    3.303. visual
    3.304. wait_key
    3.305. weed
    3.306. wrap
    3.307. wrap_search
    3.308. wrapmargin
    3.309. write_bcc
    3.310. write_inc
    4. Functions
    4.1. Generic Menu
    4.2. Index Menu
    4.3. Pager Menu
    4.4. Alias Menu
    4.5. Query Menu
    4.6. Attach Menu
    4.7. Compose Menu
    4.8. Postpone Menu
    4.9. Browser Menu
    4.10. Pgp Menu
    4.11. Smime Menu
    4.12. Mix Menu
    4.13. Editor Menu

    1. Command-Line Options

    +Running mutt with no arguments will make Mutt attempt to read your spool +mailbox. However, it is possible to read other mailboxes and +to send messages from the command line as well.

    Table 9.1. Command line options

    OptionDescription
    -Aexpand an alias
    -aattach a file to a message
    -bspecify a blind carbon-copy (BCC) address
    -cspecify a carbon-copy (Cc) address
    -Dprint the value of all Mutt variables to stdout
    -especify a config command to be run after initialization files are read
    -fspecify a mailbox to load
    -Fspecify an alternate file to read initialization commands
    -hprint help on command line options
    -Hspecify a draft file from which to read a header and body
    -ispecify a file to include in a message composition
    -mspecify a default mailbox type
    -ndo not read the system Muttrc
    -precall a postponed message
    -Qquery a configuration variable
    -Ropen mailbox in read-only mode
    -sspecify a subject (enclose in quotes if it contains spaces)
    -vshow version number and compile-time definitions
    -xsimulate the mailx(1) compose mode
    -yshow a menu containing the files specified by the mailboxes command
    -zexit immediately if there are no messages in the mailbox
    -Zopen the first folder with new message, exit immediately if none

    To read messages in a mailbox

    mutt [-nz] [-F @@ -4194,42 +3831,32 @@ file [...] -- -] +] address - | -mailto_url - ...

    -Mutt also supports a “batch” mode to send prepared -messages. Simply redirect input from the file you wish to send. For -example, -

    -mutt -s "data set for run #2" professor@bigschool.edu < ~/run2.dat

    -will send a message to -<professor@bigschool.edu> with a subject of -“data set for run #2”. In the body of the message will be -the contents of the file “~/run2.dat”. -

    -All files passed with -a file -will be attached as a MIME part to the message. To attach a single or -several files, use “--” to separate files and recipient -addresses: +...

    +Mutt also supports a “batch” mode to send prepared messages. Simply redirect +input from the file you wish to send. For example, +

    +mutt -s "data set for run #2" professor@bigschool.edu < ˜/run2.dat

    +will send a message to <professor@bigschool.edu> with a subject +of “data set for run #2”. In the body of the message will be the contents +of the file “˜/run2.dat”. +

    +All files passed with -a file will be attached as a MIME +part to the message. To attach a single or several files, use “--” to separate files and +recipient addresses: 

     mutt -a image.png -- some@one.org

    or 

    -mutt -a *.png -- some@one.org

    Note

    +mutt -a *.png -- some@one.org

    Note

    The -a option must be last in the option list. -

    -In addition to accepting a list of email addresses, Mutt also accepts a URL with -the mailto: schema as specified in RFC2368. This is useful -when configuring a web browser to launch Mutt when clicking on mailto links. -

    -mutt mailto:some@one.org?subject=test&cc=other@one.org

    2. Configuration Commands

    +

    2. Configuration Commands

    The following are the commands understood by Mutt: -

    3. Configuration Variables

    3.1. abort_nosubject

    Type: quadoption
    Default: ask-yes

    If set to yes, when composing messages and no subject is given at the subject prompt, composition will be aborted. If set to no, composing messages with no subject given at the subject prompt will never be aborted. -

    3.2. abort_unmodified

    Type: quadoption
    +

    3.2. abort_unmodified

    Type: quadoption
    Default: yes

    If set to yes, composition will automatically abort after editing the message body if no changes are made to the file (this check only happens after the first edit of the file). When set to no, composition will never be aborted. -

    3.3. alias_file

    Type: path
    -Default: “~/.muttrc”

    +

    3.3. alias_file

    Type: path
    +Default: “˜/.muttrc”

    The default file in which to save aliases created by the <create-alias> function. Entries added to this file are -encoded in the character set specified by $config_charset if it +encoded in the character set specified by $config_charset if it is set or the current character set otherwise.

    Note: Mutt will not automatically source this file; you must -explicitly use the “source” command for it to be executed in case +explicitly use the “source” command for it to be executed in case this option points to a dedicated alias file.

    The default for this option is the currently used muttrc file, or -“~/.muttrc” if no user muttrc was found. -

    3.4. alias_format

    Type: string
    -Default: “%4n %2f %t %-10a   %r”

    -Specifies the format of the data displayed for the “alias” menu. The +“˜/.muttrc” if no user muttrc was found. +

    3.4. alias_format

    Type: string
    +Default: “%4n %2f %t %-10a   %r”

    +Specifies the format of the data displayed for the “alias” menu. The following printf(3)-style sequences are available:

    %a alias name -
    %f flags - currently, a “d” for an alias marked for deletion +
    %f flags - currently, a “d” for an alias marked for deletion
    %n index number
    %r address which alias expands to
    %t character which indicates if the alias is tagged for inclusion -

    3.5. allow_8bit

    Type: boolean
    +

    3.5. allow_8bit

    Type: boolean
    Default: yes

    Controls whether 8-bit data is converted to 7-bit using either Quoted- Printable or Base64 encoding when sending mail. -

    3.6. allow_ansi

    Type: boolean
    +

    3.6. allow_ansi

    Type: boolean
    Default: no

    Controls whether ANSI color codes in messages (and color tags in rich text messages) are to be interpreted. @@ -4590,34 +4217,34 @@ [-- PGP output follows ...

    and give it the same color as your attachment color (see also -$crypt_timestamp). -

    3.7. arrow_cursor

    Type: boolean
    +$crypt_timestamp). +

    3.7. arrow_cursor

    Type: boolean
    Default: no

    -When set, an arrow (“->”) will be used to indicate the current entry +When set, an arrow (“->”) will be used to indicate the current entry in menus instead of highlighting the whole line. On slow network or modem links this will make response faster because there is less that has to be redrawn on the screen when moving to the next or previous entries in the menu. -

    3.8. ascii_chars

    Type: boolean
    +

    3.8. ascii_chars

    Type: boolean
    Default: no

    If set, Mutt will use plain ASCII characters when displaying thread and attachment trees, instead of the default ACS characters. -

    3.9. askbcc

    Type: boolean
    +

    3.9. askbcc

    Type: boolean
    Default: no

    If set, Mutt will prompt you for blind-carbon-copy (Bcc) recipients before editing an outgoing message. -

    3.10. askcc

    Type: boolean
    +

    3.10. askcc

    Type: boolean
    Default: no

    If set, Mutt will prompt you for carbon-copy (Cc) recipients before editing the body of an outgoing message. -

    3.11. assumed_charset

    Type: string
    +

    3.11. assumed_charset

    Type: string
    Default: (empty)

    This variable is a colon-separated list of character encoding schemes for messages without character encoding indication. Header field values and message body content without character encoding indication would be assumed that they are written in one of this list. By default, all the header fields and message body without any charset -indication are assumed to be in “us-ascii”. +indication are assumed to be in “us-ascii”.

    For example, Japanese users might prefer this: @@ -4625,74 +4252,74 @@ set assumed_charset="iso-2022-jp:euc-jp:shift_jis:utf-8"

    However, only the first content is valid for the message body. -

    3.12. attach_charset

    Type: string
    +

    3.12. attach_charset

    Type: string
    Default: (empty)

    This variable is a colon-separated list of character encoding schemes for text file attachments. Mutt uses this setting to guess which encoding files being attached are encoded in to convert them to -a proper character set given in $send_charset. +a proper character set given in $send_charset.

    -If unset, the value of $charset will be used instead. +If unset, the value of $charset will be used instead. For example, the following configuration would work for Japanese text handling: 

     set attach_charset="iso-2022-jp:euc-jp:shift_jis:utf-8"

    -Note: for Japanese users, “iso-2022-*” must be put at the head +Note: for Japanese users, “iso-2022-*” must be put at the head of the value as shown above if included. -

    3.13. attach_format

    Type: string
    -Default: “%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] ”

    -This variable describes the format of the “attachment” menu. The +

    3.13. attach_format

    Type: string
    +Default: “%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] ”

    +This variable describes the format of the “attachment” menu. The following printf(3)-style sequences are understood:

    %C charset -
    %c requires charset conversion (“n” or “c”) +
    %c requires charset conversion (“n” or “c”)
    %D deleted flag
    %d description
    %e MIME content-transfer-encoding
    %f filename -
    %I disposition (“I” for inline, “A” for attachment) +
    %I disposition (“I” for inline, “A” for attachment)
    %m major MIME type
    %M MIME subtype
    %n attachment number -
    %Q “Q”, if MIME part qualifies for attachment counting +
    %Q “Q”, if MIME part qualifies for attachment counting
    %s size
    %t tagged flag
    %T graphic tree characters
    %u unlink (=to delete) flag
    %X number of qualifying MIME parts in this part and its children -(please see the “attachments” section for possible speed effects) -
    %>X right justify the rest of the string and pad with character “X” -
    %|X pad to the end of the line with character “X” -
    %*X soft-fill with character “X” as pad +(please see the “attachments” section for possible speed effects) +
    %>X right justify the rest of the string and pad with character “X” +
    %|X pad to the end of the line with character “X” +
    %*X soft-fill with character “X” as pad

    -For an explanation of “soft-fill”, see the $index_format documentation. -

    3.14. attach_sep

    Type: string
    -Default: “\n”

    +For an explanation of “soft-fill”, see the $index_format documentation. +

    3.14. attach_sep

    Type: string
    +Default: “\n”

    The separator to add between attachments when operating (saving, printing, piping, etc) on a list of tagged attachments. -

    3.15. attach_split

    Type: boolean
    +

    3.15. attach_split

    Type: boolean
    Default: yes

    If this variable is unset, when operating (saving, printing, piping, etc) on a list of tagged attachments, Mutt will concatenate the attachments and will operate on them as a single attachment. The -$attach_sep separator is added after each attachment. When set, +$attach_sep separator is added after each attachment. When set, Mutt will operate on the attachments one by one. -

    3.16. attribution

    Type: string
    -Default: “On %d, %n wrote:”

    +

    3.16. attribution

    Type: string
    +Default: “On %d, %n wrote:”

    This is the string that will precede a message which has been included in a reply. For a full listing of defined printf(3)-like sequences see -the section on $index_format. -

    3.17. auto_tag

    Type: boolean
    +the section on $index_format. +

    3.17. auto_tag

    Type: boolean
    Default: no

    When set, functions in the index menu which affect a message will be applied to all tagged messages (if there are any). When -unset, you must first use the <tag-prefix> function (bound to “;” +unset, you must first use the <tag-prefix> function (bound to “;” by default) to make the next function apply to all tagged messages. -

    3.18. autoedit

    Type: boolean
    +

    3.18. autoedit

    Type: boolean
    Default: no

    -When set along with $edit_headers, Mutt will skip the initial +When set along with $edit_headers, Mutt will skip the initial send-menu (prompting for subject and recipients) and allow you to immediately begin editing the body of your message. The send-menu may still be accessed once you have finished @@ -4702,34 +4329,34 @@ on the recipients when composing a new (non-reply) message, as the initial list of recipients is empty.

    -Also see $fast_reply. -

    3.19. beep

    Type: boolean
    +Also see $fast_reply. +

    3.19. beep

    Type: boolean
    Default: yes

    When this variable is set, mutt will beep when an error occurs. -

    3.20. beep_new

    Type: boolean
    +

    3.20. beep_new

    Type: boolean
    Default: no

    When this variable is set, mutt will beep whenever it prints a message notifying you of new mail. This is independent of the setting of the -$beep variable. -

    3.21. bounce

    Type: quadoption
    +$beep variable. +

    3.21. bounce

    Type: quadoption
    Default: ask-yes

    Controls whether you will be asked to confirm bouncing messages. If set to yes you don't get asked if you want to bounce a message. Setting this variable to no is not generally useful, and thus not recommended, because you are unable to bounce messages. -

    3.22. bounce_delivered

    Type: boolean
    +

    3.22. bounce_delivered

    Type: boolean
    Default: yes

    When this variable is set, mutt will include Delivered-To headers when bouncing messages. Postfix users may wish to unset this variable. -

    3.23. braille_friendly

    Type: boolean
    +

    3.23. braille_friendly

    Type: boolean
    Default: no

    When this variable is set, mutt will place the cursor at the beginning -of the current line in menus, even when the $arrow_cursor variable +of the current line in menus, even when the $arrow_cursor variable is unset, making it easier for blind persons using Braille displays to follow these menus. The option is unset by default because many visual terminals don't permit making the cursor invisible. -

    3.24. certificate_file

    Type: path
    -Default: “~/.mutt_certificates”

    +

    3.24. certificate_file

    Type: path
    +Default: “˜/.mutt_certificates”

    This variable specifies the file where the certificates you trust are saved. When an unknown certificate is encountered, you are asked if you accept it or not. If you accept it, the certificate can also @@ -4744,17 +4371,17 @@ 

     set certificate_file=~/.mutt/certificates
-

    3.25. charset

    Type: string
    +

    3.25. charset

    Type: string
    Default: (empty)

    Character set your terminal uses to display and enter textual data. -It is also the fallback for $send_charset. +It is also the fallback for $send_charset.

    Upon startup Mutt tries to derive this value from environment variables such as $LC_CTYPE or $LANG.

    -Note: It should only be set in case Mutt isn't able to determine the +Note: It should only be set in case Mutt isn't abled to determine the character set used correctly. -

    3.26. check_mbox_size

    Type: boolean
    +

    3.26. check_mbox_size

    Type: boolean
    Default: no

    When this variable is set, mutt will use file size attribute instead of access time when checking for new mail in mbox and mmdf folders. @@ -4762,12 +4389,12 @@ This variable is unset by default and should only be enabled when new mail detection for these folder types is unreliable or doesn't work.

    -Note that enabling this variable should happen before any “mailboxes” +Note that enabling this variable should happen before any “mailboxes” directives occur in configuration files regarding mbox or mmdf folders because mutt needs to determine the initial new mail status of such a mailbox by performing a fast mailbox scan when it is defined. Afterwards the new mail status is tracked by file size changes. -

    3.27. check_new

    Type: boolean
    +

    3.27. check_new

    Type: boolean
    Default: yes

    Note: this option only affects maildir and MH style mailboxes. @@ -4778,14 +4405,14 @@ checking each file to see if it has already been looked at. If this variable is unset, no check for new mail is performed while the mailbox is open. -

    3.28. collapse_unread

    Type: boolean
    +

    3.28. collapse_unread

    Type: boolean
    Default: yes

    When unset, Mutt will not collapse a thread if it contains any unread messages. -

    3.29. compose_format

    Type: string
    -Default: “-- Mutt: Compose  [Approx. msg size: %l   Atts: %a]%>-”

    -Controls the format of the status line displayed in the “compose” -menu. This string is similar to $status_format, but has its own +

    3.29. compose_format

    Type: string
    +Default: “-- Mutt: Compose  [Approx. msg size: %l   Atts: %a]%>-”

    +Controls the format of the status line displayed in the “compose” +menu. This string is similar to $status_format, but has its own set of printf(3)-like sequences:

    %a total number of attachments @@ -4793,78 +4420,78 @@
    %l approximate size (in bytes) of the current message
    %v Mutt version string

    -See the text describing the $status_format option for more -information on how to set $compose_format. -

    3.30. config_charset

    Type: string
    +See the text describing the $status_format option for more +information on how to set $compose_format. +

    3.30. config_charset

    Type: string
    Default: (empty)

    When defined, Mutt will recode commands in rc files from this -encoding to the current character set as specified by $charset -and aliases written to $alias_file from the current character set. +encoding to the current character set as specified by $charset +and aliases written to $alias_file from the current character set.

    -Please note that if setting $charset it must be done before -setting $config_charset. +Please note that if setting $charset it must be done before +setting $config_charset.

    Recoding should be avoided as it may render unconvertable characters as question marks which can lead to undesired side effects (for example in regular expressions). -

    3.31. confirmappend

    Type: boolean
    +

    3.31. confirmappend

    Type: boolean
    Default: yes

    When set, Mutt will prompt for confirmation when appending messages to an existing mailbox. -

    3.32. confirmcreate

    Type: boolean
    +

    3.32. confirmcreate

    Type: boolean
    Default: yes

    When set, Mutt will prompt for confirmation when saving messages to a mailbox which does not yet exist before creating it. -

    3.33. connect_timeout

    Type: number
    +

    3.33. connect_timeout

    Type: number
    Default: 30

    Causes Mutt to timeout a network connection (for IMAP, POP or SMTP) after this many seconds if the connection is not able to be established. A negative value causes Mutt to wait indefinitely for the connection attempt to succeed. -

    3.34. content_type

    Type: string
    -Default: “text/plain”

    +

    3.34. content_type

    Type: string
    +Default: “text/plain”

    Sets the default Content-Type for the body of newly composed messages. -

    3.35. copy

    Type: quadoption
    +

    3.35. copy

    Type: quadoption
    Default: yes

    This variable controls whether or not copies of your outgoing messages -will be saved for later references. Also see $record, -$save_name, $force_name and “fcc-hook”. -

    3.36. crypt_autoencrypt

    Type: boolean
    +will be saved for later references. Also see $record, +$save_name, $force_name and “fcc-hook”. +

    3.36. crypt_autoencrypt

    Type: boolean
    Default: no

    Setting this variable will cause Mutt to always attempt to PGP encrypt outgoing messages. This is probably only useful in -connection to the “send-hook” command. It can be overridden +connection to the “send-hook” command. It can be overridden by use of the pgp menu, when encryption is not required or -signing is requested as well. If $smime_is_default is set, +signing is requested as well. If $smime_is_default is set, then OpenSSL is used instead to create S/MIME messages and settings can be overridden by use of the smime menu instead. (Crypto only) -

    3.37. crypt_autopgp

    Type: boolean
    +

    3.37. crypt_autopgp

    Type: boolean
    Default: yes

    This variable controls whether or not mutt may automatically enable -PGP encryption/signing for messages. See also $crypt_autoencrypt, -$crypt_replyencrypt, -$crypt_autosign, $crypt_replysign and $smime_is_default. -

    3.38. crypt_autosign

    Type: boolean
    +PGP encryption/signing for messages. See also $crypt_autoencrypt, +$crypt_replyencrypt, +$crypt_autosign, $crypt_replysign and $smime_is_default. +

    3.38. crypt_autosign

    Type: boolean
    Default: no

    Setting this variable will cause Mutt to always attempt to cryptographically sign outgoing messages. This can be overridden by use of the pgp menu, when signing is not required or -encryption is requested as well. If $smime_is_default is set, +encryption is requested as well. If $smime_is_default is set, then OpenSSL is used instead to create S/MIME messages and settings can be overridden by use of the smime menu instead of the pgp menu. (Crypto only) -

    3.39. crypt_autosmime

    Type: boolean
    +

    3.39. crypt_autosmime

    Type: boolean
    Default: yes

    This variable controls whether or not mutt may automatically enable -S/MIME encryption/signing for messages. See also $crypt_autoencrypt, -$crypt_replyencrypt, -$crypt_autosign, $crypt_replysign and $smime_is_default. -

    3.40. crypt_replyencrypt

    Type: boolean
    +S/MIME encryption/signing for messages. See also $crypt_autoencrypt, +$crypt_replyencrypt, +$crypt_autosign, $crypt_replysign and $smime_is_default. +

    3.40. crypt_replyencrypt

    Type: boolean
    Default: yes

    If set, automatically PGP or OpenSSL encrypt replies to messages which are encrypted. (Crypto only) -

    3.41. crypt_replysign

    Type: boolean
    +

    3.41. crypt_replysign

    Type: boolean
    Default: no

    If set, automatically PGP or OpenSSL sign replies to messages which are signed. @@ -4872,56 +4499,56 @@ Note: this does not work on messages that are encrypted and signed! (Crypto only) -

    3.42. crypt_replysignencrypted

    Type: boolean
    +

    3.42. crypt_replysignencrypted

    Type: boolean
    Default: no

    If set, automatically PGP or OpenSSL sign replies to messages which are encrypted. This makes sense in combination with -$crypt_replyencrypt, because it allows you to sign all +$crypt_replyencrypt, because it allows you to sign all messages which are automatically encrypted. This works around -the problem noted in $crypt_replysign, that mutt is not able +the problem noted in $crypt_replysign, that mutt is not able to find out whether an encrypted message is also signed. (Crypto only) -

    3.43. crypt_timestamp

    Type: boolean
    +

    3.43. crypt_timestamp

    Type: boolean
    Default: yes

    If set, mutt will include a time stamp in the lines surrounding PGP or S/MIME output, so spoofing such lines is more difficult. If you are using colors to mark these lines, and rely on these, you may unset this setting. (Crypto only) -

    3.44. crypt_use_gpgme

    Type: boolean
    +

    3.44. crypt_use_gpgme

    Type: boolean
    Default: no

    This variable controls the use of the GPGME-enabled crypto backends. If it is set and Mutt was built with gpgme support, the gpgme code for S/MIME and PGP will be used instead of the classic code. Note that you need to set this option in .muttrc; it won't have any effect when used interactively. -

    3.45. crypt_use_pka

    Type: boolean
    +

    3.45. crypt_use_pka

    Type: boolean
    Default: no

    Controls whether mutt uses PKA (see http://www.g10code.de/docs/pka-intro.de.pdf) during signature verification (only supported by the GPGME backend). -

    3.46. crypt_verify_sig

    Type: quadoption
    +

    3.46. crypt_verify_sig

    Type: quadoption
    Default: yes

    -If “yes”, always attempt to verify PGP or S/MIME signatures. -If “ask-*”, ask whether or not to verify the signature. -If “no”, never attempt to verify cryptographic signatures. +If “yes”, always attempt to verify PGP or S/MIME signatures. +If “ask-*”, ask whether or not to verify the signature. +If \Fi“no”, never attempt to verify cryptographic signatures. (Crypto only) -

    3.47. date_format

    Type: string
    -Default: “!%a, %b %d, %Y at %I:%M:%S%p %Z”

    -This variable controls the format of the date printed by the “%d” -sequence in $index_format. This is passed to the strftime(3) +

    3.47. date_format

    Type: string
    +Default: “!%a, %b %d, %Y at %I:%M:%S%p %Z”

    +This variable controls the format of the date printed by the “%d” +sequence in $index_format. This is passed to the strftime(3) function to process the date, see the man page for the proper syntax.

    -Unless the first character in the string is a bang (“!”), the month +Unless the first character in the string is a bang (“!”), the month and week day names are expanded according to the locale specified in -the variable $locale. If the first character in the string is a +the variable $locale. If the first character in the string is a bang, the bang is discarded, and the month and week day names in the rest of the string are expanded in the C locale (that is in US English). -

    3.48. default_hook

    Type: string
    -Default: “~f %s !~P | (~P ~C %s)”

    -This variable controls how “message-hook”, “reply-hook”, “send-hook”, -“send2-hook”, “save-hook”, and “fcc-hook” will +

    3.48. default_hook

    Type: string
    +Default: “˜f %s !˜P | (˜P ˜C %s)”

    +This variable controls how “message-hook”, “reply-hook”, “send-hook”, +“send2-hook”, “save-hook”, and “fcc-hook” will be interpreted if they are specified with only a simple regexp, instead of a matching pattern. The hooks are expanded when they are declared, so a hook will be interpreted according to the value of this @@ -4930,33 +4557,33 @@ The default value matches if the message is either from a user matching the regular expression given, or if it is from you (if the from address matches -“alternates”) and is to or cc'ed to a user matching the given +“alternates”) and is to or cc'ed to a user matching the given regular expression. -

    3.49. delete

    Type: quadoption
    +

    3.49. delete

    Type: quadoption
    Default: ask-yes

    Controls whether or not messages are really deleted when closing or synchronizing a mailbox. If set to yes, messages marked for deleting will automatically be purged without prompting. If set to no, messages marked for deletion will be kept in the mailbox. -

    3.50. delete_untag

    Type: boolean
    +

    3.50. delete_untag

    Type: boolean
    Default: yes

    If this option is set, mutt will untag messages when marking them for deletion. This applies when you either explicitly delete a message, or when you save it to another folder. -

    3.51. digest_collapse

    Type: boolean
    +

    3.51. digest_collapse

    Type: boolean
    Default: yes

    If this option is set, mutt's received-attachments menu will not show the subparts of -individual messages in a multipart/digest. To see these subparts, press “v” on that menu. -

    3.52. display_filter

    Type: path
    +individual messages in a multipart/digest. To see these subparts, press “v” on that menu. +

    3.52. display_filter

    Type: path
    Default: (empty)

    When set, specifies a command used to filter messages. When a message -is viewed it is passed as standard input to $display_filter, and the +is viewed it is passed as standard input to $display_filter, and the filtered message is read from the standard output. -

    3.53. dotlock_program

    Type: path
    -Default: “/usr/local/bin/mutt_dotlock”

    +

    3.53. dotlock_program

    Type: path
    +Default: “/usr/local/bin/mutt_dotlock”

    Contains the path of the mutt_dotlock(8) binary to be used by mutt. -

    3.54. dsn_notify

    Type: string
    +

    3.54. dsn_notify

    Type: string
    Default: (empty)

    This variable sets the request for when notification is returned. The string consists of a comma separated list (no spaces!) of one or more @@ -4970,12 +4597,12 @@ 

     set dsn_notify="failure,delay"

    -Note: when using $sendmail for delivery, you should not enable +Note: when using $sendmail for delivery, you should not enable this unless you are either using Sendmail 8.8.x or greater or a MTA providing a sendmail(1)-compatible interface supporting the -N option -for DSN. For SMTP delivery, DSN support is auto-detected so that it +for DSN. For SMTP delivery, DSN support is autodetected so that it depends on the server whether DSN will be used or not. -

    3.55. dsn_return

    Type: string
    +

    3.55. dsn_return

    Type: string
    Default: (empty)

    This variable controls how much of your message is returned in DSN messages. It may be set to either hdrs to return just the @@ -4986,103 +4613,102 @@ 

     set dsn_return=hdrs

    -Note: when using $sendmail for delivery, you should not enable +Note: when using $sendmail for delivery, you should not enable this unless you are either using Sendmail 8.8.x or greater or a MTA providing a sendmail(1)-compatible interface supporting the -R option -for DSN. For SMTP delivery, DSN support is auto-detected so that it +for DSN. For SMTP delivery, DSN support is autodetected so that it depends on the server whether DSN will be used or not. -

    3.56. duplicate_threads

    Type: boolean
    +

    3.56. duplicate_threads

    Type: boolean
    Default: yes

    -This variable controls whether mutt, when $sort is set to threads, threads +This variable controls whether mutt, when $sort is set to threads, threads messages with the same Message-Id together. If it is set, it will indicate that it thinks they are duplicates of each other with an equals sign in the thread tree. -

    3.57. edit_headers

    Type: boolean
    +

    3.57. edit_headers

    Type: boolean
    Default: no

    This option allows you to edit the header of your outgoing messages along with the body of your message.

    Note that changes made to the References: and Date: headers are ignored for interoperability reasons. -

    3.58. editor

    Type: path
    +

    3.58. editor

    Type: path
    Default: (empty)

    This variable specifies which editor is used by mutt. It defaults to the value of the $VISUAL, or $EDITOR, environment -variable, or to the string “vi” if neither of those are set. -

    3.59. encode_from

    Type: boolean
    +variable, or to the string “vi” if neither of those are set. +

    3.59. encode_from

    Type: boolean
    Default: no

    When set, mutt will quoted-printable encode messages when -they contain the string “From ” (note the trailing space) in the beginning of a line. +they contain the string “From ” (note the trailing space) in the beginning of a line. This is useful to avoid the tampering certain mail delivery and transport agents tend to do with messages (in order to prevent tools from misinterpreting the line as a mbox message separator). -

    3.60. entropy_file

    Type: path
    +

    3.60. entropy_file

    Type: path
    Default: (empty)

    The file which includes random data that is used to initialize SSL library functions. -

    3.61. envelope_from_address

    Type: e-mail address
    +

    3.61. envelope_from_address

    Type: e-mail address
    Default: (empty)

    Manually sets the envelope sender for outgoing messages. -This value is ignored if $use_envelope_from is unset. -

    3.62. escape

    Type: string
    -Default: “~”

    -Escape character to use for functions in the built-in editor. -

    3.63. fast_reply

    Type: boolean
    +This value is ignored if $use_envelope_from is unset. +

    3.62. escape

    Type: string
    +Default: “˜”

    +Escape character to use for functions in the builtin editor. +

    3.63. fast_reply

    Type: boolean
    Default: no

    When set, the initial prompt for recipients and subject are skipped when replying to messages, and the initial prompt for subject is skipped when forwarding messages.

    -Note: this variable has no effect when the $autoedit +Note: this variable has no effect when the $autoedit variable is set. -

    3.64. fcc_attach

    Type: quadoption
    +

    3.64. fcc_attach

    Type: quadoption
    Default: yes

    This variable controls whether or not attachments on outgoing messages are saved along with the main body of your message. -

    3.65. fcc_clear

    Type: boolean
    +

    3.65. fcc_clear

    Type: boolean
    Default: no

    When this variable is set, FCCs will be stored unencrypted and unsigned, even when the actual message is encrypted and/or signed. (PGP only) -

    3.66. folder

    Type: path
    -Default: “~/Mail”

    -Specifies the default location of your mailboxes. A “+” or “=” at the +

    3.66. folder

    Type: path
    +Default: “˜/Mail”

    +Specifies the default location of your mailboxes. A “+” or “=” at the beginning of a pathname will be expanded to the value of this variable. Note that if you change this variable (from the default) value you need to make sure that the assignment occurs before -you use “+” or “=” for any other variables since expansion takes place -when handling the “mailboxes” command. -

    3.67. folder_format

    Type: string
    -Default: “%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f”

    +you use “+” or “=” for any other variables since expansion takes place +when handling the “mailboxes” command. +

    3.67. folder_format

    Type: string
    +Default: “%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f”

    This variable allows you to customize the file browser display to your -personal taste. This string is similar to $index_format, but has +personal taste. This string is similar to $index_format, but has its own set of printf(3)-like sequences:

    %C current file number
    %d date/time folder was last modified -
    %D date/time folder was last modified using $date_format. -
    %f filename (“/” is appended to directory names, -“@” to symbolic links and “*” to executable +
    %f filename (“/” is appended to directory names, +“@” to symbolic links and “*” to executable files)
    %F file permissions
    %g group name (or numeric gid, if missing)
    %l number of hard links
    %N N if folder has new mail, blank otherwise
    %s size in bytes -
    %t “*” if the file is tagged, blank otherwise +
    %t “*” if the file is tagged, blank otherwise
    %u owner name (or numeric uid, if missing) -
    %>X right justify the rest of the string and pad with character “X” -
    %|X pad to the end of the line with character “X” -
    %*X soft-fill with character “X” as pad +
    %>X right justify the rest of the string and pad with character “X” +
    %|X pad to the end of the line with character “X” +
    %*X soft-fill with character “X” as pad

    -For an explanation of “soft-fill”, see the $index_format documentation. -

    3.68. followup_to

    Type: boolean
    +For an explanation of “soft-fill”, see the $index_format documentation. +

    3.68. followup_to

    Type: boolean
    Default: yes

    -Controls whether or not the “Mail-Followup-To:” header field is +Controls whether or not the “Mail-Followup-To:” header field is generated when sending mail. When set, Mutt will generate this field when you are replying to a known mailing list, specified with -the “subscribe” or “lists” commands. +the “subscribe” or “lists” commands.

    This field has two purposes. First, preventing you from receiving duplicate copies of replies to messages which you send @@ -5096,72 +4722,72 @@ group reply to your message sent to a subscribed list will be sent to both the list and your address, resulting in two copies of the same email for you. -

    3.69. force_name

    Type: boolean
    +

    3.69. force_name

    Type: boolean
    Default: no

    -This variable is similar to $save_name, except that Mutt will +This variable is similar to $save_name, except that Mutt will store a copy of your outgoing message by the username of the address you are sending to even if that mailbox does not exist.

    -Also see the $record variable. -

    3.70. forward_decode

    Type: boolean
    +Also see the $record variable. +

    3.70. forward_decode

    Type: boolean
    Default: yes

    Controls the decoding of complex MIME messages into text/plain when forwarding a message. The message header is also RFC2047 decoded. -This variable is only used, if $mime_forward is unset, -otherwise $mime_forward_decode is used instead. -

    3.71. forward_decrypt

    Type: boolean
    +This variable is only used, if $mime_forward is unset, +otherwise $mime_forward_decode is used instead. +

    3.71. forward_decrypt

    Type: boolean
    Default: yes

    Controls the handling of encrypted messages when forwarding a message. When set, the outer layer of encryption is stripped off. This -variable is only used if $mime_forward is set and -$mime_forward_decode is unset. +variable is only used if $mime_forward is set and +$mime_forward_decode is unset. (PGP only) -

    3.72. forward_edit

    Type: quadoption
    +

    3.72. forward_edit

    Type: quadoption
    Default: yes

    This quadoption controls whether or not the user is automatically placed in the editor when forwarding messages. For those who always want -to forward with no modification, use a setting of “no”. -

    3.73. forward_format

    Type: string
    -Default: “[%a: %s]”

    +to forward with no modification, use a setting of “no”. +

    3.73. forward_format

    Type: string
    +Default: “[%a: %s]”

    This variable controls the default subject when forwarding a message. -It uses the same format sequences as the $index_format variable. -

    3.74. forward_quote

    Type: boolean
    +It uses the same format sequences as the $index_format variable. +

    3.74. forward_quote

    Type: boolean
    Default: no

    When set, forwarded messages included in the main body of the -message (when $mime_forward is unset) will be quoted using -$indent_string. -

    3.75. from

    Type: e-mail address
    +message (when $mime_forward is unset) will be quoted using +$indent_string. +

    3.75. from

    Type: e-mail address
    Default: (empty)

    When set, this variable contains a default from address. It -can be overridden using “my_hdr” (including from a “send-hook”) and -$reverse_name. This variable is ignored if $use_from is unset. +can be overridden using “my_hdr” (including from a “send-hook”) and +$reverse_name. This variable is ignored if $use_from is unset.

    This setting defaults to the contents of the environment variable $EMAIL. -

    3.76. gecos_mask

    Type: regular expression
    -Default: “^[^,]*”

    +

    3.76. gecos_mask

    Type: regular expression
    +Default: “^[^,]*”

    A regular expression used by mutt to parse the GECOS field of a password entry when expanding the alias. The default value -will return the string up to the first “,” encountered. -If the GECOS field contains a string like “lastname, firstname” then you -should set it to “.*”. +will return the string up to the first “,” encountered. +If the GECOS field contains a string like “lastname, firstname” then you +should set it to “.*”.

    This can be useful if you see the following behavior: you address an e-mail -to user ID “stevef” whose full name is “Steve Franklin”. If mutt expands -“stevef” to “"Franklin" stevef@foo.bar” then you should set the $gecos_mask to +to user ID “stevef” whose full name is “Steve Franklin”. If mutt expands +“stevef” to “"Franklin" stevef@foo.bar” then you should set the $gecos_mask to a regular expression that will match the whole name so mutt will expand -“Franklin” to “Franklin, Steve”. -

    3.77. hdrs

    Type: boolean
    +“Franklin” to “Franklin, Steve”. +

    3.77. hdrs

    Type: boolean
    Default: yes

    -When unset, the header fields normally added by the “my_hdr” +When unset, the header fields normally added by the “my_hdr” command are not created. This variable must be unset before composing a new message or replying in order to take effect. If set, the user defined header fields are added to every new message. -

    3.78. header

    Type: boolean
    +

    3.78. header

    Type: boolean
    Default: no

    When set, this variable causes Mutt to include the header of the message you are replying to into the edit buffer. -The $weed setting applies. -

    3.79. header_cache

    Type: path
    +The $weed setting applies. +

    3.79. header_cache

    Type: path
    Default: (empty)

    This variable points to the header cache database. If pointing to a directory Mutt will contain a header cache @@ -5170,22 +4796,22 @@ caching will be used.

    Header caching can greatly improve speed when opening POP, IMAP -MH or Maildir folders, see “caching” for details. -

    3.80. header_cache_compress

    Type: boolean
    +MH or Maildir folders, see “caching” for details. +

    3.80. header_cache_compress

    Type: boolean
    Default: yes

    When mutt is compiled with qdbm or tokyocabinet as header cache backend, this option determines whether the database will be compressed. Compression results in database files roughly being one fifth -of the usual diskspace, but the decompression can result in a +of the usual diskspace, but the uncompression can result in a slower opening of cached folder(s) which in general is still much faster than opening non header cached folders. -

    3.81. header_cache_pagesize

    Type: string
    -Default: “16384”

    +

    3.81. header_cache_pagesize

    Type: string
    +Default: “16384”

    When mutt is compiled with either gdbm or bdb4 as the header cache backend, this option changes the database page size. Too large or too small values can waste space, memory, or CPU time. The default should be more or less optimal for most use cases. -

    3.82. help

    Type: boolean
    +

    3.82. help

    Type: boolean
    Default: yes

    When set, help lines describing the bindings for the major functions provided by each menu are displayed on the first line of the screen. @@ -5195,95 +4821,95 @@ the help line may not be updated if a binding is changed while Mutt is running. Since this variable is primarily aimed at new users, neither of these should present a major problem. -

    3.83. hidden_host

    Type: boolean
    +

    3.83. hidden_host

    Type: boolean
    Default: no

    -When set, mutt will skip the host name part of $hostname variable +When set, mutt will skip the host name part of $hostname variable when adding the domain part to addresses. This variable does not affect the generation of Message-IDs, and it will not lead to the cut-off of first-level domains. -

    3.84. hide_limited

    Type: boolean
    +

    3.84. hide_limited

    Type: boolean
    Default: no

    When set, mutt will not show the presence of messages that are hidden by limiting, in the thread tree. -

    3.85. hide_missing

    Type: boolean
    +

    3.85. hide_missing

    Type: boolean
    Default: yes

    When set, mutt will not show the presence of missing messages in the thread tree. -

    3.86. hide_thread_subject

    Type: boolean
    +

    3.86. hide_thread_subject

    Type: boolean
    Default: yes

    When set, mutt will not show the subject of messages in the thread tree that have the same subject as their parent or closest previously displayed sibling. -

    3.87. hide_top_limited

    Type: boolean
    +

    3.87. hide_top_limited

    Type: boolean
    Default: no

    When set, mutt will not show the presence of messages that are hidden by limiting, at the top of threads in the thread tree. Note that when -$hide_limited is set, this option will have no effect. -

    3.88. hide_top_missing

    Type: boolean
    +$hide_limited is set, this option will have no effect. +

    3.88. hide_top_missing

    Type: boolean
    Default: yes

    When set, mutt will not show the presence of missing messages at the -top of threads in the thread tree. Note that when $hide_missing is +top of threads in the thread tree. Note that when $hide_missing is set, this option will have no effect. -

    3.89. history

    Type: number
    +

    3.89. history

    Type: number
    Default: 10

    This variable controls the size (in number of strings remembered) of the string history buffer per category. The buffer is cleared each time the variable is set. -

    3.90. history_file

    Type: path
    -Default: “~/.mutthistory”

    +

    3.90. history_file

    Type: path
    +Default: “˜/.mutthistory”

    The file in which Mutt will save its history. -

    3.91. honor_disposition

    Type: boolean
    +

    3.91. honor_disposition

    Type: boolean
    Default: no

    When set, Mutt will not display attachments with a -disposition of “attachment” inline even if it could +disposition of “attachment” inline even if it could render the part to plain text. These MIME parts can only be viewed from the attachment menu.

    If unset, Mutt will render all MIME parts it can properly transform to plain text. -

    3.92. honor_followup_to

    Type: quadoption
    +

    3.92. honor_followup_to

    Type: quadoption
    Default: yes

    This variable controls whether or not a Mail-Followup-To header is honored when group-replying to a message. -

    3.93. hostname

    Type: string
    +

    3.93. hostname

    Type: string
    Default: (empty)

    Specifies the fully-qualified hostname of the system mutt is running on containing the host's name and the DNS domain it belongs to. It is used -as the domain part (after “@”) for local email addresses as well as +as the domain part (after “@”) for local email addresses as well as Message-Id headers.

    Its value is determined at startup as follows: If the node's name as returned by the uname(3) function contains the hostname and the -domain, these are used to construct $hostname. If there is no -domain part returned, Mutt will look for a “domain” or “search” +domain, these are used to construct $hostname. If there is no +domain part returned, Mutt will look for a “domain” or “search” line in /etc/resolv.conf to determine the domain. Optionally, Mutt can be compiled with a fixed domain name in which case a detected one is not used.

    -Also see $use_domain and $hidden_host. -

    3.94. ignore_linear_white_space

    Type: boolean
    +Also see $use_domain and $hidden_host. +

    3.94. ignore_linear_white_space

    Type: boolean
    Default: no

    This option replaces linear-white-space between encoded-word and text to a single space to prevent the display of MIME-encoded -“Subject:” field from being divided into multiple lines. -

    3.95. ignore_list_reply_to

    Type: boolean
    +“Subject:” field from being divided into multiple lines. +

    3.95. ignore_list_reply_to

    Type: boolean
    Default: no

    -Affects the behavior of the <reply> function when replying to -messages from mailing lists (as defined by the “subscribe” or -“lists” commands). When set, if the “Reply-To:” field is -set to the same value as the “To:” field, Mutt assumes that the -“Reply-To:” field was set by the mailing list to automate responses +Affects the behaviour of the <reply> function when replying to +messages from mailing lists (as defined by the “subscribe” or +“lists” commands). When set, if the “Reply-To:” field is +set to the same value as the “To:” field, Mutt assumes that the +“Reply-To:” field was set by the mailing list to automate responses to the list, and will ignore this field. To direct a response to the mailing list when this option is set, use the <list-reply> function; <group-reply> will reply to both the sender and the list. -

    3.96. imap_authenticators

    Type: string
    +

    3.96. imap_authenticators

    Type: string
    Default: (empty)

    This is a colon-delimited list of authentication methods mutt may attempt to use to log in to an IMAP server, in the order mutt should -try them. Authentication methods are either “login” or the right -side of an IMAP “AUTH=xxx” capability string, e.g. “digest-md5”, “gssapi” -or “cram-md5”. This option is case-insensitive. If it's +try them. Authentication methods are either “login” or the right +side of an IMAP “AUTH=xxx” capability string, eg “digest-md5”, “gssapi” +or “cram-md5”. This option is case-insensitive. If it's unset (the default) mutt will try all available methods, in order from most-secure to least-secure.

    @@ -5295,37 +4921,37 @@ Note: Mutt will only fall back to other authentication methods if the previous methods are unavailable. If a method is available but authentication fails, mutt will not connect to the IMAP server. -

    3.97. imap_check_subscribed

    Type: boolean
    +

    3.97. imap_check_subscribed

    Type: boolean
    Default: no

    When set, mutt will fetch the set of subscribed folders from your server on connection, and add them to the set of mailboxes -it polls for new mail just as if you had issued individual “mailboxes” +it polls for new mail just as if you had issued individual “mailboxes” commands. -

    3.98. imap_delim_chars

    Type: string
    -Default: “/.”

    +

    3.98. imap_delim_chars

    Type: string
    +Default: “/.”

    This contains the list of characters which you would like to treat as folder separators for displaying IMAP paths. In particular it -helps in using the “=” shortcut for your folder variable. -

    3.99. imap_headers

    Type: string
    +helps in using the “=” shortcut for your folder variable. +

    3.99. imap_headers

    Type: string
    Default: (empty)

    Mutt requests these header fields in addition to the default headers -(“Date:”, “From:”, “Subject:”, “To:”, “Cc:”, “Message-Id:”, -“References:”, “Content-Type:”, “Content-Description:”, “In-Reply-To:”, -“Reply-To:”, “Lines:”, “List-Post:”, “X-Label:”) from IMAP +(“Date:”, “From:”, “Subject:”, “To:”, “Cc:”, “Message-Id:”, +“References:”, “Content-Type:”, “Content-Description:”, “In-Reply-To:”, +“Reply-To:”, “Lines:”, “List-Post:”, “X-Label:”) from IMAP servers before displaying the index menu. You may want to add more headers for spam detection.

    Note: This is a space separated list, items should be uppercase -and not contain the colon, e.g. “X-BOGOSITY X-SPAM-STATUS” for the -“X-Bogosity:” and “X-Spam-Status:” header fields. -

    3.100. imap_idle

    Type: boolean
    +and not contain the colon, e.g. “X-BOGOSITY X-SPAM-STATUS” for the +“X-Bogosity:” and “X-Spam-Status:” header fields. +

    3.100. imap_idle

    Type: boolean
    Default: no

    When set, mutt will attempt to use the IMAP IDLE extension to check for new mail in the current mailbox. Some servers (dovecot was the inspiration for this option) react badly to mutt's implementation. If your connection seems to freeze up periodically, try unsetting this. -

    3.101. imap_keepalive

    Type: number
    +

    3.101. imap_keepalive

    Type: number
    Default: 900

    This variable specifies the maximum amount of time in seconds that mutt will wait before polling open IMAP connections, to prevent the server @@ -5334,17 +4960,17 @@ a server is allowed to do this, but in practice the RFC does get violated every now and then. Reduce this number if you find yourself getting disconnected from your IMAP server due to inactivity. -

    3.102. imap_list_subscribed

    Type: boolean
    +

    3.102. imap_list_subscribed

    Type: boolean
    Default: no

    This variable configures whether IMAP folder browsing will look for only subscribed folders or all folders. This can be toggled in the IMAP browser with the <toggle-subscribed> function. -

    3.103. imap_login

    Type: string
    +

    3.103. imap_login

    Type: string
    Default: (empty)

    Your login name on the IMAP server.

    -This variable defaults to the value of $imap_user. -

    3.104. imap_pass

    Type: string
    +This variable defaults to the value of $imap_user. +

    3.104. imap_pass

    Type: string
    Default: (empty)

    Specifies the password for your IMAP account. If unset, Mutt will prompt you for your password when you invoke the <imap-fetch-mail> function @@ -5353,20 +4979,20 @@ Warning: you should only use this option when you are on a fairly secure machine, because the superuser can read your muttrc even if you are the only one who can read the file. -

    3.105. imap_passive

    Type: boolean
    +

    3.105. imap_passive

    Type: boolean
    Default: yes

    When set, mutt will not open new IMAP connections to check for new mail. Mutt will only check for new mail over existing IMAP connections. This is useful if you don't want to be prompted to user/password pairs on mutt invocation, or if opening the connection is slow. -

    3.106. imap_peek

    Type: boolean
    +

    3.106. imap_peek

    Type: boolean
    Default: yes

    When set, mutt will avoid implicitly marking your mail as read whenever you fetch a message from the server. This is generally a good thing, but can make closing an IMAP folder somewhat slower. This option exists to appease speed freaks. -

    3.107. imap_pipeline_depth

    Type: number
    +

    3.107. imap_pipeline_depth

    Type: number
    Default: 15

    Controls the number of IMAP commands that may be queued up before they are sent to the server. A deeper pipeline reduces the amount of time @@ -5375,51 +5001,51 @@ so if you have problems you might want to try setting this variable to 0.

    Note: Changes to this variable have no effect on open connections. -

    3.108. imap_servernoise

    Type: boolean
    +

    3.108. imap_servernoise

    Type: boolean
    Default: yes

    When set, mutt will display warning messages from the IMAP server as error messages. Since these messages are often harmless, or generated due to configuration problems on the server which are out of the users' hands, you may wish to suppress them at some point. -

    3.109. imap_user

    Type: string
    +

    3.109. imap_user

    Type: string
    Default: (empty)

    The name of the user whose mail you intend to access on the IMAP server.

    This variable defaults to your user name on the local machine. -

    3.110. implicit_autoview

    Type: boolean
    +

    3.110. implicit_autoview

    Type: boolean
    Default: no

    -If set to “yes”, mutt will look for a mailcap entry with the -“copiousoutput” flag set for every MIME attachment it doesn't have +If set to “yes”, mutt will look for a mailcap entry with the +“copiousoutput” flag set for every MIME attachment it doesn't have an internal viewer defined for. If such an entry is found, mutt will use the viewer defined in that entry to convert the body part to text form. -

    3.111. include

    Type: quadoption
    +

    3.111. include

    Type: quadoption
    Default: ask-yes

    Controls whether or not a copy of the message(s) you are replying to is included in your reply. -

    3.112. include_onlyfirst

    Type: boolean
    +

    3.112. include_onlyfirst

    Type: boolean
    Default: no

    Controls whether or not Mutt includes only the first attachment of the message you are replying. -

    3.113. indent_string

    Type: string
    -Default: “> ”

    +

    3.113. indent_string

    Type: string
    +Default: “> ”

    Specifies the string to prepend to each line of text quoted in a message to which you are replying. You are strongly encouraged not to change this value, as it tends to agitate the more fanatical netizens.

    -The value of this option is ignored if $text_flowed is set, too because +The value of this option is ignored if $text_flowed is set, too because the quoting mechanism is strictly defined for format=flowed.

    This option is a format string, please see the description of -$index_format for supported printf(3)-style sequences. -

    3.114. index_format

    Type: string
    -Default: “%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s”

    +$index_format for supported printf(3)-style sequences. +

    3.114. index_format

    Type: string
    +Default: “%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s”

    This variable allows you to customize the message index display to your personal taste.

    -“Format strings” are similar to the strings used in the C +“Format strings” are similar to the strings used in the C function printf(3) to format output (see the man page for more details). The following sequences are defined in Mutt: @@ -5430,9 +5056,9 @@

%c number of characters (bytes) in the message
%C current message number
%d date and time of the message in the format specified by -$date_format converted to sender's time zone +$date_format converted to sender's time zone
%D date and time of the message in the format specified by -$date_format converted to the local time zone +$date_format converted to the local time zone
%e current message number in thread
%E number of messages in current thread
%f sender (address + real name), either From: or Return-Path: @@ -5441,8 +5067,8 @@
%i message-id of the current message
%l number of lines in the message (does not work with maildir, mh, and possibly IMAP folders) -
%L If an address in the “To:” or “Cc:” header field matches an address -defined by the users “subscribe” command, this displays +
%L If an address in the “To:” or “Cc:” header field matches an address +defined by the users “subscribe” command, this displays "To <list-name>", otherwise the same as %F.
%m total number of message in the mailbox
%M number of hidden messages if the thread is collapsed. @@ -5451,37 +5077,37 @@
%O original save folder where mutt would formerly have stashed the message: list name or recipient name if not sent to a list -
%P progress indicator for the built-in pager (how much of the file has been displayed) +
%P progress indicator for the builtin pager (how much of the file has been displayed)
%s subject of the message -
%S status of the message (“N”/“D”/“d”/“!”/“r”/*) -
%t “To:” field (recipients) -
%T the appropriate character from the $to_chars string +
%S status of the message (“N”/“D”/“d”/“!”/“r”/*) +
%t “To:” field (recipients) +
%T the appropriate character from the $to_chars string
%u user (login) name of the author
%v first name of the author, or the recipient if the message is from you
%X number of attachments -(please see the “attachments” section for possible speed effects) -
%y “X-Label:” field, if present -
%Y “X-Label:” field, if present, and (1) not at part of a thread tree, -(2) at the top of a thread, or (3) “X-Label:” is different from -preceding message's “X-Label:”. +(please see the “attachments” section for possible speed effects) +
%y “X-Label:” field, if present +
%Y “X-Label:” field, if present, and (1) not at part of a thread tree, +(2) at the top of a thread, or (3) “X-Label:” is different from +preceding message's “X-Label:”.
%Z message status flags
%{fmt} the date and time of the message is converted to sender's -time zone, and “fmt” is expanded by the library function +time zone, and “fmt” is expanded by the library function strftime(3); a leading bang disables locales
%[fmt] the date and time of the message is converted to the local -time zone, and “fmt” is expanded by the library function +time zone, and “fmt” is expanded by the library function strftime(3); a leading bang disables locales
%(fmt) the local date and time when the message was received. -“fmt” is expanded by the library function strftime(3); +“fmt” is expanded by the library function strftime(3); a leading bang disables locales -
%<fmt> the current local time. “fmt” is expanded by the library +
%<fmt> the current local time. “fmt” is expanded by the library function strftime(3); a leading bang disables locales. -
%>X right justify the rest of the string and pad with character “X” -
%|X pad to the end of the line with character “X” -
%*X soft-fill with character “X” as pad +
%>X right justify the rest of the string and pad with character “X” +
%|X pad to the end of the line with character “X” +
%*X soft-fill with character “X” as pad

-“Soft-fill” deserves some explanation: Normal right-justification -will print everything to the left of the “%>”, displaying padding and +“Soft-fill” deserves some explanation: Normal right-justification +will print everything to the left of the “%>”, displaying padding and whatever lies to the right only if there's room. By contrast, soft-fill gives priority to the right-hand side, guaranteeing space to display it and showing padding only if there's still room. If @@ -5489,37 +5115,28 @@ rightward text.

Note that these expandos are supported in -“save-hook”, “fcc-hook” and “fcc-save-hook”, too. -

3.115. ispell

Type: path
-Default: “ispell”

+“save-hook”, “fcc-hook” and “fcc-save-hook”, too. +

3.115. ispell

Type: path
+Default: “ispell”

How to invoke ispell (GNU's spell-checking software). -

3.116. keep_flagged

Type: boolean
+

3.116. keep_flagged

Type: boolean
Default: no

If set, read messages marked as flagged will not be moved -from your spool mailbox to your $mbox mailbox, or as a result of -a “mbox-hook” command. -

3.117. locale

Type: string
-Default: “C”

+from your spool mailbox to your $mbox mailbox, or as a result of +a “mbox-hook” command. +

3.117. locale

Type: string
+Default: “C”

The locale used by strftime(3) to format dates. Legal values are the strings your system accepts for the locale environment variable $LC_TIME. -

3.118. mail_check

Type: number
+

3.118. mail_check

Type: number
Default: 5

This variable configures how often (in seconds) mutt should look for -new mail. Also see the $timeout variable. -

3.119. mail_check_recent

Type: boolean
-Default: yes

-When set, Mutt will only notify you about new mail that has been received -since the last time you opened the mailbox. When unset, Mutt will notify you -if any new mail exists in the mailbox, regardless of whether you have visited it -recently. -

-When $mark_old is set, Mutt does not consider the mailbox to contain new -mail if only old messages exist. -

3.120. mailcap_path

Type: string
+new mail. Also see the $timeout variable. +

3.119. mailcap_path

Type: string
Default: (empty)

This variable specifies which files to consult when attempting to display MIME bodies not directly supported by Mutt. -

3.121. mailcap_sanitize

Type: boolean
+

3.120. mailcap_sanitize

Type: boolean
Default: yes

If set, mutt will restrict possible characters in mailcap % expandos to a well-defined set of safe characters. This is the safe setting, @@ -5527,69 +5144,69 @@

DON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE DOING! -

3.122. maildir_header_cache_verify

Type: boolean
+

3.121. maildir_header_cache_verify

Type: boolean
Default: yes

Check for Maildir unaware programs other than mutt having modified maildir files when the header cache is in use. This incurs one stat(2) per message every time the folder is opened (which can be very slow for NFS folders). -

3.123. maildir_trash

Type: boolean
+

3.122. maildir_trash

Type: boolean
Default: no

If set, messages marked as deleted will be saved with the maildir trashed flag instead of unlinked. Note: this only applies to maildir-style mailboxes. Setting it will have no effect on other mailbox types. -

3.124. mark_old

Type: boolean
+

3.123. mark_old

Type: boolean
Default: yes

Controls whether or not mutt marks new unread messages as old if you exit a mailbox without reading them. With this option set, the next time you start mutt, the messages -will show up with an “O” next to them in the index menu, +will show up with an “O” next to them in the index menu, indicating that they are old. -

3.125. markers

Type: boolean
+

3.124. markers

Type: boolean
Default: yes

Controls the display of wrapped lines in the internal pager. If set, a -“+” marker is displayed at the beginning of wrapped lines. +“+” marker is displayed at the beginning of wrapped lines.

-Also see the $smart_wrap variable. -

3.126. mask

Type: regular expression
-Default: “!^\.[^.]”

+Also see the $smart_wrap variable. +

3.125. mask

Type: regular expression
+Default: “!^\.[^.]”

A regular expression used in the file browser, optionally preceded by -the not operator “!”. Only files whose names match this mask +the not operator “!”. Only files whose names match this mask will be shown. The match is always case-sensitive. -

3.127. mbox

Type: path
-Default: “~/mbox”

-This specifies the folder into which read mail in your $spoolfile +

3.126. mbox

Type: path
+Default: “˜/mbox”

+This specifies the folder into which read mail in your $spoolfile folder will be appended.

-Also see the $move variable. -

3.128. mbox_type

Type: folder magic
+Also see the $move variable. +

3.127. mbox_type

Type: folder magic
Default: mbox

The default mailbox type used when creating new folders. May be any of -“mbox”, “MMDF”, “MH” and “Maildir”. This is overridden by the +“mbox”, “MMDF”, “MH” and “Maildir”. This is overriden by the -m command-line option. -

3.129. menu_context

Type: number
+

3.128. menu_context

Type: number
Default: 0

This variable controls the number of lines of context that are given -when scrolling through menus. (Similar to $pager_context.) -

3.130. menu_move_off

Type: boolean
+when scrolling through menus. (Similar to $pager_context.) +

3.129. menu_move_off

Type: boolean
Default: yes

When unset, the bottom entry of menus will never scroll up past the bottom of the screen, unless there are less entries than lines. When set, the bottom entry may move off the bottom. -

3.131. menu_scroll

Type: boolean
+

3.130. menu_scroll

Type: boolean
Default: no

When set, menus will be scrolled up or down one line when you attempt to move across a screen boundary. If unset, the screen is cleared and the next or previous page of the menu is displayed (useful for slow links to avoid many redraws). -

3.132. message_cache_clean

Type: boolean
+

3.131. message_cache_clean

Type: boolean
Default: no

If set, mutt will clean out obsolete entries from the message cache when the mailbox is synchronized. You probably only want to set it every once in a while, since it can be a little slow (especially for large folders). -

3.133. message_cachedir

Type: path
+

3.132. message_cachedir

Type: path
Default: (empty)

Set this to a directory and mutt will cache copies of messages from your IMAP and POP servers here. You are free to remove entries at any @@ -5599,65 +5216,65 @@ remote message only once and can perform regular expression searches as fast as for local folders.

-Also see the $message_cache_clean variable. -

3.134. message_format

Type: string
-Default: “%s”

-This is the string displayed in the “attachment” menu for +Also see the $message_cache_clean variable. +

3.133. message_format

Type: string
+Default: “%s”

+This is the string displayed in the “attachment” menu for attachments of type message/rfc822. For a full listing of defined -printf(3)-like sequences see the section on $index_format. -

3.135. meta_key

Type: boolean
+printf(3)-like sequences see the section on $index_format. +

3.134. meta_key

Type: boolean
Default: no

If set, forces Mutt to interpret keystrokes with the high bit (bit 8) set as if the user had pressed the Esc key and whatever key remains after having the high bit removed. For example, if the key pressed has an ASCII value of 0xf8, then this is treated as if the user had -pressed Esc then “x”. This is because the result of removing the +pressed Esc then “x”. This is because the result of removing the high bit from 0xf8 is 0x78, which is the ASCII character -“x”. -

3.136. metoo

Type: boolean
+“x”. +

3.135. metoo

Type: boolean
Default: no

-If unset, Mutt will remove your address (see the “alternates” +If unset, Mutt will remove your address (see the “alternates” command) from the list of recipients when replying to a message. -

3.137. mh_purge

Type: boolean
+

3.136. mh_purge

Type: boolean
Default: no

-When unset, mutt will mimic mh's behavior and rename deleted messages +When unset, mutt will mimic mh's behaviour and rename deleted messages to ,<old file name> in mh folders instead of really deleting them. This leaves the message on disk but makes programs reading the folder ignore it. If the variable is set, the message files will simply be deleted.

-This option is similar to $maildir_trash for Maildir folders. -

3.138. mh_seq_flagged

Type: string
-Default: “flagged”

+This option is similar to $maildir_trash for Maildir folders. +

3.137. mh_seq_flagged

Type: string
+Default: “flagged”

The name of the MH sequence used for flagged messages. -

3.139. mh_seq_replied

Type: string
-Default: “replied”

+

3.138. mh_seq_replied

Type: string
+Default: “replied”

The name of the MH sequence used to tag replied messages. -

3.140. mh_seq_unseen

Type: string
-Default: “unseen”

+

3.139. mh_seq_unseen

Type: string
+Default: “unseen”

The name of the MH sequence used for unseen messages. -

3.141. mime_forward

Type: quadoption
+

3.140. mime_forward

Type: quadoption
Default: no

When set, the message you are forwarding will be attached as a separate message/rfc822 MIME part instead of included in the main body of the message. This is useful for forwarding MIME messages so the receiver can properly view the message as it was delivered to you. If you like to switch between MIME and not MIME from mail to mail, set this -variable to “ask-no” or “ask-yes”. +variable to “ask-no” or “ask-yes”.

-Also see $forward_decode and $mime_forward_decode. -

3.142. mime_forward_decode

Type: boolean
+Also see $forward_decode and $mime_forward_decode. +

3.141. mime_forward_decode

Type: boolean
Default: no

Controls the decoding of complex MIME messages into text/plain when -forwarding a message while $mime_forward is set. Otherwise -$forward_decode is used instead. -

3.143. mime_forward_rest

Type: quadoption
+forwarding a message while $mime_forward is set. Otherwise +$forward_decode is used instead. +

3.142. mime_forward_rest

Type: quadoption
Default: yes

When forwarding multiple attachments of a MIME message from the attachment menu, attachments which cannot be decoded in a reasonable manner will be attached to the newly composed message if this option is set. -

3.144. mix_entry_format

Type: string
-Default: “%4n %c %-16s %a”

+

3.143. mix_entry_format

Type: string
+Default: “%4n %c %-16s %a”

This variable describes the format of a remailer line on the mixmaster chain selection screen. The following printf(3)-like sequences are supported: @@ -5666,32 +5283,32 @@ %c Remailer capabilities. %s The remailer's short name. %a The remailer's e-mail address. -

3.145. mixmaster

Type: path
-Default: “mixmaster”

+

3.144. mixmaster

Type: path
+Default: “mixmaster”

This variable contains the path to the Mixmaster binary on your system. It is used with various sets of parameters to gather the list of known remailers, and to finally send a message through the mixmaster chain. -

3.146. move

Type: quadoption
+

3.145. move

Type: quadoption
Default: no

Controls whether or not Mutt will move read messages -from your spool mailbox to your $mbox mailbox, or as a result of -a “mbox-hook” command. -

3.147. narrow_tree

Type: boolean
+from your spool mailbox to your $mbox mailbox, or as a result of +a “mbox-hook” command. +

3.146. narrow_tree

Type: boolean
Default: no

This variable, when set, makes the thread tree narrower, allowing deeper threads to fit on the screen. -

3.148. net_inc

Type: number
+

3.147. net_inc

Type: number
Default: 10

Operations that expect to transfer a large amount of data over the -network will update their progress every $net_inc kilobytes. +network will update their progress every $net_inc kilobytes. If set to 0, no progress messages will be displayed.

-See also $read_inc, $write_inc and $net_inc. -

3.149. pager

Type: path
-Default: “builtin”

+See also $read_inc, $write_inc and $net_inc. +

3.148. pager

Type: path
+Default: “builtin”

This variable specifies which pager you would like to use to view -messages. The value “builtin” means to use the built-in pager, otherwise this +messages. The value “builtin” means to use the builtin pager, otherwise this variable should specify the pathname of the external pager you would like to use.

@@ -5699,7 +5316,7 @@ keystrokes are necessary because you can't call mutt functions directly from the pager, and screen resizes cause lines longer than the screen width to be badly formatted in the help menu. -

3.150. pager_context

Type: number
+

3.149. pager_context

Type: number
Default: 0

This variable controls the number of lines of context that are given when displaying the next or previous page in the internal pager. By @@ -5709,13 +5326,13 @@ This variable also specifies the amount of context given for search results. If positive, this many lines will be given before a match, if 0, the match will be top-aligned. -

3.151. pager_format

Type: string
-Default: “-%Z- %C/%m: %-20.20n   %s%*  -- (%P)”

-This variable controls the format of the one-line message “status” +

3.150. pager_format

Type: string
+Default: “-%Z- %C/%m: %-20.20n   %s%*  -- (%P)”

+This variable controls the format of the one-line message “status” displayed before each message in either the internal or an external -pager. The valid sequences are listed in the $index_format +pager. The valid sequences are listed in the $index_format section. -

3.152. pager_index_lines

Type: number
+

3.151. pager_index_lines

Type: number
Default: 0

Determines the number of lines of a mini-index which is shown when in the pager. The current message, unless near the top or bottom of the @@ -5726,14 +5343,14 @@ for the status bar from the index, so a setting of 6 will only show 5 lines of the actual index. A value of 0 results in no index being shown. If the number of messages in the current folder -is less than $pager_index_lines, then the index will only use as +is less than $pager_index_lines, then the index will only use as many lines as it needs. -

3.153. pager_stop

Type: boolean
+

3.152. pager_stop

Type: boolean
Default: no

When set, the internal-pager will not move to the next message when you are at the end of a message and invoke the <next-page> function. -

3.154. pgp_auto_decode

Type: boolean
+

3.153. pgp_auto_decode

Type: boolean
Default: no

If set, mutt will automatically attempt to decrypt traditional PGP messages whenever the user performs an operation which ordinarily would @@ -5741,7 +5358,7 @@ if the user displays a pgp-traditional message which has not been manually checked with the <check-traditional-pgp> function, mutt will automatically check the message for traditional pgp. -

3.155. pgp_autoinline

Type: boolean
+

3.154. pgp_autoinline

Type: boolean
Default: no

This option controls whether Mutt generates old-style inline (traditional) PGP encrypted or signed messages under certain @@ -5753,27 +5370,27 @@ configured to ask before sending PGP/MIME messages when inline (traditional) would not work.

-Also see the $pgp_mime_auto variable. +Also see the $pgp_mime_auto variable.

Also note that using the old-style PGP message format is strongly deprecated. (PGP only) -

3.156. pgp_check_exit

Type: boolean
+

3.155. pgp_check_exit

Type: boolean
Default: yes

If set, mutt will check the exit code of the PGP subprocess when signing or encrypting. A non-zero exit code means that the subprocess failed. (PGP only) -

3.157. pgp_clearsign_command

Type: string
+

3.156. pgp_clearsign_command

Type: string
Default: (empty)

-This format is used to create an old-style “clearsigned” PGP +This format is used to create an old-style “clearsigned” PGP message. Note that the use of this format is strongly deprecated.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.158. pgp_decode_command

Type: string
+

3.157. pgp_decode_command

Type: string
Default: (empty)

This format strings specifies a command which is used to decode application/pgp attachments. @@ -5785,7 +5402,7 @@ %f Expands to the name of a file containing a message. %s Expands to the name of a file containing the signature part of a multipart/signed attachment when verifying it. -%a The value of $pgp_sign_as. +%a The value of $pgp_sign_as. %r One or more key IDs.

For examples on how to configure these formats for the various versions @@ -5793,31 +5410,31 @@ the samples/ subdirectory which has been installed on your system alongside the documentation. (PGP only) -

3.159. pgp_decrypt_command

Type: string
+

3.158. pgp_decrypt_command

Type: string
Default: (empty)

This command is used to decrypt a PGP encrypted message.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.160. pgp_encrypt_only_command

Type: string
+

3.159. pgp_encrypt_only_command

Type: string
Default: (empty)

This command is used to encrypt a body part without signing it.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.161. pgp_encrypt_sign_command

Type: string
+

3.160. pgp_encrypt_sign_command

Type: string
Default: (empty)

This command is used to both sign and encrypt a body part.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.162. pgp_entry_format

Type: string
-Default: “%4n %t%f %4l/0x%k %-4a %2c %u”

+

3.161. pgp_entry_format

Type: string
+Default: “%4n %t%f %4l/0x%k %-4a %2c %u”

This variable allows you to customize the PGP key selection menu to -your personal taste. This string is similar to $index_format, but +your personal taste. This string is similar to $index_format, but has its own set of printf(3)-like sequences:

%n number @@ -5831,42 +5448,42 @@
%[<s>] date of the key where <s> is an strftime(3) expression

(PGP only) -

3.163. pgp_export_command

Type: string
+

3.162. pgp_export_command

Type: string
Default: (empty)

This command is used to export a public key from the user's key ring.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.164. pgp_getkeys_command

Type: string
+

3.163. pgp_getkeys_command

Type: string
Default: (empty)

This command is invoked whenever mutt will need public key information. -Of the sequences supported by $pgp_decode_command, %r is the only +Of the sequences supported by $pgp_decode_command, %r is the only printf(3)-like sequence used with this format. (PGP only) -

3.165. pgp_good_sign

Type: regular expression
+

3.164. pgp_good_sign

Type: regular expression
Default: (empty)

If you assign a text to this variable, then a PGP signature is only -considered verified if the output from $pgp_verify_command contains +considered verified if the output from $pgp_verify_command contains the text. Use this variable if the exit code from the command is 0 even for bad signatures. (PGP only) -

3.166. pgp_ignore_subkeys

Type: boolean
+

3.165. pgp_ignore_subkeys

Type: boolean
Default: yes

Setting this variable will cause Mutt to ignore OpenPGP subkeys. Instead, the principal key will inherit the subkeys' capabilities. Unset this if you want to play interesting key selection games. (PGP only) -

3.167. pgp_import_command

Type: string
+

3.166. pgp_import_command

Type: string
Default: (empty)

This command is used to import a key from a message into the user's public key ring.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.168. pgp_list_pubring_command

Type: string
+

3.167. pgp_list_pubring_command

Type: string
Default: (empty)

This command is used to list the public key ring's contents. The output format must be analogous to the one used by @@ -5877,10 +5494,10 @@ This format is also generated by the pgpring utility which comes with mutt.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.169. pgp_list_secring_command

Type: string
+

3.168. pgp_list_secring_command

Type: string
Default: (empty)

This command is used to list the secret key ring's contents. The output format must be analogous to the one used by: @@ -5891,14 +5508,14 @@ This format is also generated by the pgpring utility which comes with mutt.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.170. pgp_long_ids

Type: boolean
+

3.169. pgp_long_ids

Type: boolean
Default: no

If set, use 64 bit PGP key IDs, if unset use the normal 32 bit key IDs. (PGP only) -

3.171. pgp_mime_auto

Type: quadoption
+

3.170. pgp_mime_auto

Type: quadoption
Default: ask-yes

This option controls whether Mutt will prompt you for automatically sending a (signed/encrypted) message using @@ -5907,7 +5524,7 @@ Also note that using the old-style PGP message format is strongly deprecated. (PGP only) -

3.172. pgp_replyinline

Type: boolean
+

3.171. pgp_replyinline

Type: boolean
Default: no

Setting this variable will cause Mutt to always attempt to create an inline (traditional) message when replying to a @@ -5922,12 +5539,12 @@ configured to ask before sending PGP/MIME messages when inline (traditional) would not work.

-Also see the $pgp_mime_auto variable. +Also see the $pgp_mime_auto variable.

Also note that using the old-style PGP message format is strongly deprecated. (PGP only) -

3.173. pgp_retainable_sigs

Type: boolean
+

3.172. pgp_retainable_sigs

Type: boolean
Default: no

If set, signed and encrypted messages will consist of nested multipart/signed and multipart/encrypted body parts. @@ -5936,27 +5553,27 @@ lists, where the outer layer (multipart/encrypted) can be easily removed, while the inner multipart/signed part is retained. (PGP only) -

3.174. pgp_show_unusable

Type: boolean
+

3.173. pgp_show_unusable

Type: boolean
Default: yes

If set, mutt will display non-usable keys on the PGP key selection menu. This includes keys which have been revoked, have expired, or -have been marked as “disabled” by the user. +have been marked as “disabled” by the user. (PGP only) -

3.175. pgp_sign_as

Type: string
+

3.174. pgp_sign_as

Type: string
Default: (empty)

If you have more than one key pair, this option allows you to specify which of your private keys to use. It is recommended that you use the keyid form to specify your key (e.g. 0x00112233). (PGP only) -

3.176. pgp_sign_command

Type: string
+

3.175. pgp_sign_command

Type: string
Default: (empty)

This command is used to create the detached PGP signature for a multipart/signed PGP/MIME body part.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.177. pgp_sort_keys

Type: sort order
+

3.176. pgp_sort_keys

Type: sort order
Default: address

Specifies how the entries in the pgp menu are sorted. The following are legal values: @@ -5967,69 +5584,69 @@ trust sort by the trust of the key

If you prefer reverse order of the above values, prefix it with -“reverse-”. +“reverse-”. (PGP only) -

3.178. pgp_strict_enc

Type: boolean
+

3.177. pgp_strict_enc

Type: boolean
Default: yes

If set, Mutt will automatically encode PGP/MIME signed messages as quoted-printable. Please note that unsetting this variable may lead to problems with non-verifyable PGP signatures, so only change this if you know what you are doing. (PGP only) -

3.179. pgp_timeout

Type: number
+

3.178. pgp_timeout

Type: number
Default: 300

The number of seconds after which a cached passphrase will expire if not used. (PGP only) -

3.180. pgp_use_gpg_agent

Type: boolean
+

3.179. pgp_use_gpg_agent

Type: boolean
Default: no

If set, mutt will use a possibly-running gpg-agent(1) process. (PGP only) -

3.181. pgp_verify_command

Type: string
+

3.180. pgp_verify_command

Type: string
Default: (empty)

This command is used to verify PGP signatures.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.182. pgp_verify_key_command

Type: string
+

3.181. pgp_verify_key_command

Type: string
Default: (empty)

This command is used to verify key information from the key selection menu.

-This is a format string, see the $pgp_decode_command command for +This is a format string, see the $pgp_decode_command command for possible printf(3)-like sequences. (PGP only) -

3.183. pipe_decode

Type: boolean
+

3.182. pipe_decode

Type: boolean
Default: no

Used in connection with the <pipe-message> command. When unset, Mutt will pipe the messages without any preprocessing. When set, Mutt will weed headers and will attempt to decode the messages first. -

3.184. pipe_sep

Type: string
-Default: “\n”

+

3.183. pipe_sep

Type: string
+Default: “\n”

The separator to add between messages when piping a list of tagged messages to an external Unix command. -

3.185. pipe_split

Type: boolean
+

3.184. pipe_split

Type: boolean
Default: no

Used in connection with the <pipe-message> function following <tag-prefix>. If this variable is unset, when piping a list of tagged messages Mutt will concatenate the messages and will pipe them all concatenated. When set, Mutt will pipe the messages one by one. In both cases the messages are piped in the current sorted order, -and the $pipe_sep separator is added after each message. -

3.186. pop_auth_try_all

Type: boolean
+and the $pipe_sep separator is added after each message. +

3.185. pop_auth_try_all

Type: boolean
Default: yes

If set, Mutt will try all available authentication methods. When unset, Mutt will only fall back to other authentication methods if the previous methods are unavailable. If a method is available but authentication fails, Mutt will not connect to the POP server. -

3.187. pop_authenticators

Type: string
+

3.186. pop_authenticators

Type: string
Default: (empty)

This is a colon-delimited list of authentication methods mutt may attempt to use to log in to an POP server, in the order mutt should -try them. Authentication methods are either “user”, “apop” or any -SASL mechanism, e.g. “digest-md5”, “gssapi” or “cram-md5”. +try them. Authentication methods are either “user”, “apop” or any +SASL mechanism, eg “digest-md5”, “gssapi” or “cram-md5”. This option is case-insensitive. If this option is unset (the default) mutt will try all available methods, in order from most-secure to least-secure. @@ -6038,30 +5655,30 @@ 

 set pop_authenticators="digest-md5:apop:user"
-

3.188. pop_checkinterval

Type: number
+

3.187. pop_checkinterval

Type: number
Default: 60

This variable configures how often (in seconds) mutt should look for new mail in the currently selected mailbox if it is a POP mailbox. -

3.189. pop_delete

Type: quadoption
+

3.188. pop_delete

Type: quadoption
Default: ask-no

If set, Mutt will delete successfully downloaded messages from the POP server when using the <fetch-mail> function. When unset, Mutt will download messages but also leave them on the POP server. -

3.190. pop_host

Type: string
+

3.189. pop_host

Type: string
Default: (empty)

The name of your POP server for the <fetch-mail> function. You -can also specify an alternative port, username and password, i.e.: +can also specify an alternative port, username and password, ie: 

 [pop[s]://][username[:password]@]popserver[:port]

-where “[...]” denotes an optional part. -

3.191. pop_last

Type: boolean
+where “[...]” denotes an optional part. +

3.190. pop_last

Type: boolean
Default: no

-If this variable is set, mutt will try to use the “LAST” POP command +If this variable is set, mutt will try to use the “LAST” POP command for retrieving only unread messages from the POP server when using the <fetch-mail> function. -

3.192. pop_pass

Type: string
+

3.191. pop_pass

Type: string
Default: (empty)

Specifies the password for your POP account. If unset, Mutt will prompt you for your password when you open a POP mailbox. @@ -6069,33 +5686,33 @@ Warning: you should only use this option when you are on a fairly secure machine, because the superuser can read your muttrc even if you are the only one who can read the file. -

3.193. pop_reconnect

Type: quadoption
+

3.192. pop_reconnect

Type: quadoption
Default: ask-yes

Controls whether or not Mutt will try to reconnect to the POP server if the connection is lost. -

3.194. pop_user

Type: string
+

3.193. pop_user

Type: string
Default: (empty)

Your login name on the POP server.

This variable defaults to your user name on the local machine. -

3.195. post_indent_string

Type: string
+

3.194. post_indent_string

Type: string
Default: (empty)

-Similar to the $attribution variable, Mutt will append this +Similar to the $attribution variable, Mutt will append this string after the inclusion of a message which is being replied to. -

3.196. postpone

Type: quadoption
+

3.195. postpone

Type: quadoption
Default: ask-yes

-Controls whether or not messages are saved in the $postponed +Controls whether or not messages are saved in the $postponed mailbox when you elect not to send immediately.

-Also see the $recall variable. -

3.197. postponed

Type: path
-Default: “~/postponed”

-Mutt allows you to indefinitely “postpone sending a message” which +Also see the $recall variable. +

3.196. postponed

Type: path
+Default: “˜/postponed”

+Mutt allows you to indefinitely “postpone sending a message” which you are editing. When you choose to postpone a message, Mutt saves it in the mailbox specified by this variable.

-Also see the $postpone variable. -

3.198. preconnect

Type: string
+Also see the $postpone variable. +

3.197. preconnect

Type: string
Default: (empty)

If set, a shell command to be executed if mutt fails to establish a connection to the server. This is useful for setting up secure @@ -6106,91 +5723,88 @@ set preconnect="ssh -f -q -L 1234:mailhost.net:143 mailhost.net \ sleep 20 < /dev/null > /dev/null"

-Mailbox “foo” on “mailhost.net” can now be reached -as “{localhost:1234}foo”. +Mailbox “foo” on “mailhost.net” can now be reached +as “{localhost:1234}foo”.

Note: For this example to work, you must be able to log in to the remote machine without having to enter a password. -

3.199. print

Type: quadoption
+

3.198. print

Type: quadoption
Default: ask-no

Controls whether or not Mutt really prints messages. -This is set to “ask-no” by default, because some people -accidentally hit “p” often. -

3.200. print_command

Type: path
-Default: “lpr”

+This is set to “ask-no” by default, because some people +accidentally hit “p” often. +

3.199. print_command

Type: path
+Default: “lpr”

This specifies the command pipe that should be used to print messages. -

3.201. print_decode

Type: boolean
+

3.200. print_decode

Type: boolean
Default: yes

Used in connection with the <print-message> command. If this option is set, the message is decoded before it is passed to the -external command specified by $print_command. If this option +external command specified by $print_command. If this option is unset, no processing will be applied to the message when printing it. The latter setting may be useful if you are using some advanced printer filter which is able to properly format e-mail messages for printing. -

3.202. print_split

Type: boolean
+

3.201. print_split

Type: boolean
Default: no

Used in connection with the <print-message> command. If this option -is set, the command specified by $print_command is executed once for +is set, the command specified by $print_command is executed once for each message which is to be printed. If this option is unset, -the command specified by $print_command is executed only once, and +the command specified by $print_command is executed only once, and all the messages are concatenated, with a form feed as the message separator.

Those who use the enscript(1) program's mail-printing mode will most likely want to set this option. -

3.203. prompt_after

Type: boolean
+

3.202. prompt_after

Type: boolean
Default: yes

-If you use an external $pager, setting this variable will +If you use an external $pager, setting this variable will cause Mutt to prompt you for a command when the pager exits rather than returning to the index menu. If unset, Mutt will return to the index menu when the external pager exits. -

3.204. query_command

Type: path
+

3.203. query_command

Type: path
Default: (empty)

-This specifies the command Mutt will use to make external address -queries. The string may contain a “%s”, which will be substituted -with the query string the user types. Mutt will add quotes around the -string substituted for “%s” automatically according to shell quoting -rules, so you should avoid adding your own. If no “%s” is found in -the string, Mutt will append the user's query to the end of the string. -See “query” for more information. -

3.205. query_format

Type: string
-Default: “%4c %t %-25.25a %-25.25n %?e?(%e)?”

-This variable describes the format of the “query” menu. The +This specifies the command that mutt will use to make external address +queries. The string should contain a “%s”, which will be substituted +with the query string the user types. See “query” for more +information. +

3.204. query_format

Type: string
+Default: “%4c %t %-25.25a %-25.25n %?e?(%e)?”

+This variable describes the format of the “query” menu. The following printf(3)-style sequences are understood:

%a destination address
%c current entry number
%e extra information *
%n destination name -
%t “*” if current entry is tagged, a space otherwise -
%>X right justify the rest of the string and pad with “X” -
%|X pad to the end of the line with “X” -
%*X soft-fill with character “X” as pad +
%t “*” if current entry is tagged, a space otherwise +
%>X right justify the rest of the string and pad with “X” +
%|X pad to the end of the line with “X” +
%*X soft-fill with character “X” as pad

-For an explanation of “soft-fill”, see the $index_format documentation. +For an explanation of “soft-fill”, see the $index_format documentation.

-* = can be optionally printed if nonzero, see the $status_format documentation. -

3.206. quit

Type: quadoption
+* = can be optionally printed if nonzero, see the $status_format documentation. +

3.205. quit

Type: quadoption
Default: yes

-This variable controls whether “quit” and “exit” actually quit +This variable controls whether “quit” and “exit” actually quit from mutt. If this option is set, they do quit, if it is unset, they have no effect, and if it is set to ask-yes or ask-no, you are prompted for confirmation when you try to quit. -

3.207. quote_regexp

Type: regular expression
-Default: “^([ \t]*[|>:}#])+”

+

3.206. quote_regexp

Type: regular expression
+Default: “^([ \t]*[|>:}#])+”

A regular expression used in the internal pager to determine quoted sections of text in the body of a message. Quoted text may be filtered out using the <toggle-quoted> command, or colored according to the -“color quoted” family of directives. +“color quoted” family of directives.

-Higher levels of quoting may be colored differently (“color quoted1”, -“color quoted2”, etc.). The quoting level is determined by removing +Higher levels of quoting may be colored differently (“color quoted1”, +“color quoted2”, etc.). The quoting level is determined by removing the last character from the matched text and recursively reapplying the regular expression until it fails to produce a match.

-Match detection may be overridden by the $smileys regular expression. -

3.208. read_inc

Type: number
+Match detection may be overridden by the $smileys regular expression. +

3.207. read_inc

Type: number
Default: 10

If set to a value greater than 0, Mutt will display which message it is currently on when reading a mailbox or when performing search actions @@ -6202,20 +5816,20 @@ When set to 0, only a single message will appear before the reading the mailbox.

-Also see the $write_inc, $net_inc and $time_inc variables and the -“tuning” section of the manual for performance considerations. -

3.209. read_only

Type: boolean
+Also see the $write_inc, $net_inc and $time_inc variables and the +“tuning” section of the manual for performance considerations. +

3.208. read_only

Type: boolean
Default: no

If set, all folders are opened in read-only mode. -

3.210. realname

Type: string
+

3.209. realname

Type: string
Default: (empty)

-This variable specifies what “real” or “personal” name should be used +This variable specifies what “real” or “personal” name should be used when sending messages.

By default, this is the GECOS field from /etc/passwd. Note that this variable will not be used when the user has set a real name -in the $from variable. -

3.211. recall

Type: quadoption
+in the $from variable. +

3.210. recall

Type: quadoption
Default: ask-yes

Controls whether or not Mutt recalls postponed messages when composing a new message. @@ -6223,29 +5837,29 @@ Setting this variable to is not generally useful, and thus not recommended.

-Also see $postponed variable. -

3.212. record

Type: path
-Default: “~/sent”

+Also see $postponed variable. +

3.211. record

Type: path
+Default: “˜/sent”

This specifies the file into which your outgoing messages should be appended. (This is meant as the primary method for saving a copy of -your messages, but another way to do this is using the “my_hdr” -command to create a “Bcc:” field with your email address in it.) +your messages, but another way to do this is using the “my_hdr” +command to create a “Bcc:” field with your email address in it.)

-The value of $record is overridden by the $force_name and -$save_name variables, and the “fcc-hook” command. -

3.213. reply_regexp

Type: regular expression
-Default: “^(re([\[0-9\]+])*|aw):[ \t]*”

+The value of $record is overridden by the $force_name and +$save_name variables, and the “fcc-hook” command. +

3.212. reply_regexp

Type: regular expression
+Default: “^(re([\[0-9\]+])*|aw):[ \t]*”

A regular expression used to recognize reply messages when threading and replying. The default value corresponds to the English "Re:" and the German "Aw:". -

3.214. reply_self

Type: boolean
+

3.213. reply_self

Type: boolean
Default: no

If unset and you are replying to a message sent by you, Mutt will assume that you want to reply to the recipients of that message rather than to yourself.

-Also see the “alternates” command. -

3.215. reply_to

Type: quadoption
+Also see the “alternates” command. +

3.214. reply_to

Type: quadoption
Default: ask-yes

If set, when replying to a message, Mutt will use the address listed in the Reply-to: header as the recipient of the reply. If unset, @@ -6253,14 +5867,14 @@ option is useful for reading a mailing list that sets the Reply-To: header field to the list address and you want to send a private message to the author of a message. -

3.216. resolve

Type: boolean
+

3.215. resolve

Type: boolean
Default: yes

When set, the cursor will be automatically advanced to the next (possibly undeleted) message whenever a command that modifies the current message is executed. -

3.217. reverse_alias

Type: boolean
+

3.216. reverse_alias

Type: boolean
Default: no

-This variable controls whether or not Mutt will display the “personal” +This variable controls whether or not Mutt will display the “personal” name from your aliases in the index menu if it finds an alias that matches the message's sender. For example, if you have the following alias: @@ -6273,28 +5887,28 @@ 

 From: abd30425@somewhere.net

-It would be displayed in the index menu as “Joe User” instead of -“abd30425@somewhere.net.” This is useful when the person's e-mail +It would be displayed in the index menu as “Joe User” instead of +“abd30425@somewhere.net.” This is useful when the person's e-mail address is not human friendly. -

3.218. reverse_name

Type: boolean
+

3.217. reverse_name

Type: boolean
Default: no

It may sometimes arrive that you receive mail to a certain machine, move the messages to another machine, and reply to some the messages from there. If this variable is set, the default From: line of the reply messages is built using the address where you received the messages you are replying to if that address matches your -“alternates”. If the variable is unset, or the address that would be -used doesn't match your “alternates”, the From: line will use +“alternates”. If the variable is unset, or the address that would be +used doesn't match your “alternates”, the From: line will use your address on the current machine.

-Also see the “alternates” command. -

3.219. reverse_realname

Type: boolean
+Also see the “alternates” command. +

3.218. reverse_realname

Type: boolean
Default: yes

-This variable fine-tunes the behavior of the $reverse_name feature. +This variable fine-tunes the behaviour of the $reverse_name feature. When it is set, mutt will use the address from incoming messages as-is, possibly including eventual real names. When it is unset, mutt will -override any such real names with the setting of the $realname variable. -

3.220. rfc2047_parameters

Type: boolean
+override any such real names with the setting of the $realname variable. +

3.219. rfc2047_parameters

Type: boolean
Default: no

When this variable is set, Mutt will decode RFC2047-encoded MIME parameters. You want to set this variable when mutt suggests you @@ -6313,79 +5927,79 @@ Also note that setting this parameter will not have the effect that mutt generates this kind of encoding. Instead, mutt will unconditionally use the encoding specified in RFC2231. -

3.221. save_address

Type: boolean
+

3.220. save_address

Type: boolean
Default: no

If set, mutt will take the sender's full address when choosing a -default folder for saving a mail. If $save_name or $force_name +default folder for saving a mail. If $save_name or $force_name is set too, the selection of the Fcc folder will be changed as well. -

3.222. save_empty

Type: boolean
+

3.221. save_empty

Type: boolean
Default: yes

When unset, mailboxes which contain no saved messages will be removed -when closed (the exception is $spoolfile which is never removed). +when closed (the exception is $spoolfile which is never removed). If set, mailboxes are never removed.

Note: This only applies to mbox and MMDF folders, Mutt does not delete MH and Maildir directories. -

3.223. save_history

Type: number
+

3.222. save_history

Type: number
Default: 0

This variable controls the size of the history (per category) saved in the -$history_file file. -

3.224. save_name

Type: boolean
+$history_file file. +

3.223. save_name

Type: boolean
Default: no

This variable controls how copies of outgoing messages are saved. When set, a check is made to see if a mailbox specified by the recipient address exists (this is done by searching for a mailbox in -the $folder directory with the username part of the +the $folder directory with the username part of the recipient address). If the mailbox exists, the outgoing message will be saved to that mailbox, otherwise the message is saved to the -$record mailbox. +$record mailbox.

-Also see the $force_name variable. -

3.225. score

Type: boolean
+Also see the $force_name variable. +

3.224. score

Type: boolean
Default: yes

When this variable is unset, scoring is turned off. This can be useful to selectively disable scoring for certain folders when the -$score_threshold_delete variable and related are used. -

3.226. score_threshold_delete

Type: number
+$score_threshold_delete variable and related are used. +

3.225. score_threshold_delete

Type: number
Default: -1

Messages which have been assigned a score equal to or lower than the value of this variable are automatically marked for deletion by mutt. Since mutt scores are always greater than or equal to zero, the default setting of this variable will never mark a message for deletion. -

3.227. score_threshold_flag

Type: number
+

3.226. score_threshold_flag

Type: number
Default: 9999

Messages which have been assigned a score greater than or equal to this variable's value are automatically marked "flagged". -

3.228. score_threshold_read

Type: number
+

3.227. score_threshold_read

Type: number
Default: -1

Messages which have been assigned a score equal to or lower than the value of this variable are automatically marked as read by mutt. Since mutt scores are always greater than or equal to zero, the default setting of this variable will never mark a message read. -

3.229. search_context

Type: number
+

3.228. search_context

Type: number
Default: 0

For the pager, this variable specifies the number of lines shown before search results. By default, search results will be top-aligned. -

3.230. send_charset

Type: string
-Default: “us-ascii:iso-8859-1:utf-8”

+

3.229. send_charset

Type: string
+Default: “us-ascii:iso-8859-1:utf-8”

A colon-delimited list of character sets for outgoing messages. Mutt will use the first character set into which the text can be converted exactly. -If your $charset is not “iso-8859-1” and recipients may not -understand “UTF-8”, it is advisable to include in the list an +If your $charset is not “iso-8859-1” and recipients may not +understand “UTF-8”, it is advisable to include in the list an appropriate widely used standard character set (such as -“iso-8859-2”, “koi8-r” or “iso-2022-jp”) either instead of or after -“iso-8859-1”. +“iso-8859-2”, “koi8-r” or “iso-2022-jp”) either instead of or after +“iso-8859-1”.

In case the text cannot be converted into one of these exactly, -mutt uses $charset as a fallback. -

3.231. sendmail

Type: path
-Default: “/usr/sbin/sendmail -oem -oi”

+mutt uses $charset as a fallback. +

3.230. sendmail

Type: path
+Default: “/usr/sbin/sendmail -oem -oi”

Specifies the program and arguments used to deliver mail sent by Mutt. Mutt expects that the specified program interprets additional arguments as recipient addresses. -

3.232. sendmail_wait

Type: number
+

3.231. sendmail_wait

Type: number
Default: 0

-Specifies the number of seconds to wait for the $sendmail process +Specifies the number of seconds to wait for the $sendmail process to finish before giving up and putting delivery in the background.

Mutt interprets the value of this variable as follows: @@ -6397,70 +6011,70 @@ Note that if you specify a value other than 0, the output of the child process will be put in a temporary file. If there is some error, you will be informed as to where to find the output. -

3.233. shell

Type: path
+

3.232. shell

Type: path
Default: (empty)

Command to use when spawning a subshell. By default, the user's login shell from /etc/passwd is used. -

3.234. sig_dashes

Type: boolean
+

3.233. sig_dashes

Type: boolean
Default: yes

-If set, a line containing “-- ” (note the trailing space) will be inserted before your -$signature. It is strongly recommended that you not unset +If set, a line containing “-- ” (note the trailing space) will be inserted before your +$signature. It is strongly recommended that you not unset this variable unless your signature contains just your name. The -reason for this is because many software packages use “-- \n” to +reason for this is because many software packages use “-- \n” to detect your signature. For example, Mutt has the ability to highlight -the signature in a different color in the built-in pager. -

3.235. sig_on_top

Type: boolean
+the signature in a different color in the builtin pager. +

3.234. sig_on_top

Type: boolean
Default: no

If set, the signature will be included before any quoted or forwarded text. It is strongly recommended that you do not set this variable unless you really know what you are doing, and are prepared to take some heat from netiquette guardians. -

3.236. signature

Type: path
-Default: “~/.signature”

+

3.235. signature

Type: path
+Default: “˜/.signature”

Specifies the filename of your signature, which is appended to all -outgoing messages. If the filename ends with a pipe (“|”), it is +outgoing messages. If the filename ends with a pipe (“|”), it is assumed that filename is a shell command and input should be read from its standard output. -

3.237. simple_search

Type: string
-Default: “~f %s | ~s %s”

+

3.236. simple_search

Type: string
+Default: “˜f %s | ˜s %s”

Specifies how Mutt should expand a simple search into a real search -pattern. A simple search is one that does not contain any of the “~” pattern -operators. See “patterns” for more information on search patterns. +pattern. A simple search is one that does not contain any of the “˜” pattern +operators. See “patterns” for more information on search patterns.

-For example, if you simply type “joe” at a search or limit prompt, Mutt +For example, if you simply type “joe” at a search or limit prompt, Mutt will automatically expand it to the value specified by this variable by -replacing “%s” with the supplied string. -For the default value, “joe” would be expanded to: “~f joe | ~s joe”. -

3.238. sleep_time

Type: number
+replacing “%s” with the supplied string. +For the default value, “joe” would be expanded to: “˜f joe | ˜s joe”. +

3.237. sleep_time

Type: number
Default: 1

Specifies time, in seconds, to pause while displaying certain informational messages, while moving from folder to folder and after expunging messages from the current folder. The default is to pause one second, so a value of zero for this option suppresses the pause. -

3.239. smart_wrap

Type: boolean
+

3.238. smart_wrap

Type: boolean
Default: yes

Controls the display of lines longer than the screen width in the internal pager. If set, long lines are wrapped at a word boundary. If unset, lines are simply wrapped at the screen edge. Also see the -$markers variable. -

3.240. smileys

Type: regular expression
-Default: “(>From )|(:[-^]?[][)(><}{|/DP])”

+$markers variable. +

3.239. smileys

Type: regular expression
+Default: “(>From )|(:[-^]?[][)(><}{|/DP])”

The pager uses this variable to catch some common false -positives of $quote_regexp, most notably smileys and not consider -a line quoted text if it also matches $smileys. This mostly +positives of $quote_regexp, most notably smileys and not consider +a line quoted text if it also matches $smileys. This mostly happens at the beginning of a line. -

3.241. smime_ask_cert_label

Type: boolean
+

3.240. smime_ask_cert_label

Type: boolean
Default: yes

This flag controls whether you want to be asked to enter a label for a certificate about to be added to the database or not. It is set by default. (S/MIME only) -

3.242. smime_ca_location

Type: path
+

3.241. smime_ca_location

Type: path
Default: (empty)

This variable contains the name of either a directory, or a file which contains trusted certificates for use with OpenSSL. (S/MIME only) -

3.243. smime_certificates

Type: path
+

3.242. smime_certificates

Type: path
Default: (empty)

Since for S/MIME there is no pubring/secring as with PGP, mutt has to handle storage and retrieval of keys by itself. This is very basic right @@ -6470,7 +6084,7 @@ keyid pairs, and which can be manually edited. This option points to the location of the certificates. (S/MIME only) -

3.244. smime_decrypt_command

Type: string
+

3.243. smime_decrypt_command

Type: string
Default: (empty)

This format string specifies a command which is used to decrypt application/x-pkcs7-mime attachments. @@ -6481,82 +6095,82 @@

%f Expands to the name of a file containing a message.
%s Expands to the name of a file containing the signature part of a multipart/signed attachment when verifying it. -
%k The key-pair specified with $smime_default_key +
%k The key-pair specified with $smime_default_key
%c One or more certificate IDs.
%a The algorithm used for encryption. -
%C CA location: Depending on whether $smime_ca_location +
%C CA location: Depending on whether $smime_ca_location points to a directory or file, this expands to - “-CApath $smime_ca_location” or “-CAfile $smime_ca_location”. + “-CApath $smime_ca_location” or “-CAfile $smime_ca_location”.

For examples on how to configure these formats, see the smime.rc in the samples/ subdirectory which has been installed on your system alongside the documentation. (S/MIME only) -

3.245. smime_decrypt_use_default_key

Type: boolean
+

3.244. smime_decrypt_use_default_key

Type: boolean
Default: yes

If set (default) this tells mutt to use the default key for decryption. Otherwise, if managing multiple certificate-key-pairs, mutt will try to use the mailbox-address to determine the key to use. It will ask you to supply a key, if it can't find one. (S/MIME only) -

3.246. smime_default_key

Type: string
+

3.245. smime_default_key

Type: string
Default: (empty)

This is the default key-pair to use for signing. This must be set to the keyid (the hash-value that OpenSSL generates) to work properly (S/MIME only) -

3.247. smime_encrypt_command

Type: string
+

3.246. smime_encrypt_command

Type: string
Default: (empty)

This command is used to create encrypted S/MIME messages.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.248. smime_encrypt_with

Type: string
+

3.247. smime_encrypt_with

Type: string
Default: (empty)

This sets the algorithm that should be used for encryption. -Valid choices are “des”, “des3”, “rc2-40”, “rc2-64”, “rc2-128”. -If unset, “3des” (TripleDES) is used. +Valid choices are “des”, “des3”, “rc2-40”, “rc2-64”, “rc2-128”. +If unset, “3des” (TripleDES) is used. (S/MIME only) -

3.249. smime_get_cert_command

Type: string
+

3.248. smime_get_cert_command

Type: string
Default: (empty)

This command is used to extract X509 certificates from a PKCS7 structure.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.250. smime_get_cert_email_command

Type: string
+

3.249. smime_get_cert_email_command

Type: string
Default: (empty)

This command is used to extract the mail address(es) used for storing X509 certificates, and for verification purposes (to check whether the certificate was issued for the sender's mailbox).

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.251. smime_get_signer_cert_command

Type: string
+

3.250. smime_get_signer_cert_command

Type: string
Default: (empty)

This command is used to extract only the signers X509 certificate from a S/MIME signature, so that the certificate's owner may get compared to the -email's “From:” field. +email's “From:” field.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.252. smime_import_cert_command

Type: string
+

3.251. smime_import_cert_command

Type: string
Default: (empty)

This command is used to import a certificate via smime_keys.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.253. smime_is_default

Type: boolean
+

3.252. smime_is_default

Type: boolean
Default: no

-The default behavior of mutt is to use PGP on all auto-sign/encryption +The default behaviour of mutt is to use PGP on all auto-sign/encryption operations. To override and to use OpenSSL instead this must be set. However, this has no effect while replying, since mutt will automatically select the same application that was used to sign/encrypt the original -message. (Note that this variable can be overridden by unsetting $crypt_autosmime.) +message. (Note that this variable can be overridden by unsetting $crypt_autosmime.) (S/MIME only) -

3.254. smime_keys

Type: path
+

3.253. smime_keys

Type: path
Default: (empty)

Since for S/MIME there is no pubring/secring as with PGP, mutt has to handle storage and retrieval of keys/certs by itself. This is very basic right now, @@ -6565,58 +6179,58 @@ which contains mailbox-address keyid pair, and which can be manually edited. This option points to the location of the private keys. (S/MIME only) -

3.255. smime_pk7out_command

Type: string
+

3.254. smime_pk7out_command

Type: string
Default: (empty)

This command is used to extract PKCS7 structures of S/MIME signatures, in order to extract the public X509 certificate(s).

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.256. smime_sign_command

Type: string
+

3.255. smime_sign_command

Type: string
Default: (empty)

This command is used to created S/MIME signatures of type multipart/signed, which can be read by all mail clients.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.257. smime_sign_opaque_command

Type: string
+

3.256. smime_sign_opaque_command

Type: string
Default: (empty)

This command is used to created S/MIME signatures of type application/x-pkcs7-signature, which can only be handled by mail clients supporting the S/MIME extension.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.258. smime_timeout

Type: number
+

3.257. smime_timeout

Type: number
Default: 300

The number of seconds after which a cached passphrase will expire if not used. (S/MIME only) -

3.259. smime_verify_command

Type: string
+

3.258. smime_verify_command

Type: string
Default: (empty)

This command is used to verify S/MIME signatures of type multipart/signed.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.260. smime_verify_opaque_command

Type: string
+

3.259. smime_verify_opaque_command

Type: string
Default: (empty)

This command is used to verify S/MIME signatures of type application/x-pkcs7-mime.

-This is a format string, see the $smime_decrypt_command command for +This is a format string, see the $smime_decrypt_command command for possible printf(3)-like sequences. (S/MIME only) -

3.261. smtp_authenticators

Type: string
+

3.260. smtp_authenticators

Type: string
Default: (empty)

This is a colon-delimited list of authentication methods mutt may attempt to use to log in to an SMTP server, in the order mutt should -try them. Authentication methods are any SASL mechanism, e.g. -“digest-md5”, “gssapi” or “cram-md5”. -This option is case-insensitive. If it is “unset” +try them. Authentication methods are any SASL mechanism, eg +“digest-md5”, “gssapi” or “cram-md5”. +This option is case-insensitive. If it is “unset” (the default) mutt will try all available methods, in order from most-secure to least-secure.

@@ -6624,109 +6238,109 @@ 

 set smtp_authenticators="digest-md5:cram-md5"
-

3.262. smtp_pass

Type: string
+

3.261. smtp_pass

Type: string
Default: (empty)

Specifies the password for your SMTP account. If unset, Mutt will prompt you for your password when you first send mail via SMTP. -See $smtp_url to configure mutt to send mail via SMTP. +See $smtp_url to configure mutt to send mail via SMTP.

Warning: you should only use this option when you are on a fairly secure machine, because the superuser can read your muttrc even if you are the only one who can read the file. -

3.263. smtp_url

Type: string
+

3.262. smtp_url

Type: string
Default: (empty)

Defines the SMTP smarthost where sent messages should relayed for -delivery. This should take the form of an SMTP URL, e.g.: +delivery. This should take the form of an SMTP URL, eg: 

-smtp[s]://[user[:pass]@]host[:port]
+smtp[s]://[user[:pass]@]host[:port]/

-where “[...]” denotes an optional part. -Setting this variable overrides the value of the $sendmail +where “[...]” denotes an optional part. +Setting this variable overrides the value of the $sendmail variable. -

3.264. sort

Type: sort order
+

3.263. sort

Type: sort order
Default: date

-Specifies how to sort messages in the “index” menu. Valid values +Specifies how to sort messages in the “index” menu. Valid values are: -

  • date or date-sent -

  • date-received -

  • from -

  • mailbox-order (unsorted) -

  • score -

  • size -

  • spam -

  • subject -

  • threads -

  • to +

    • date or date-sent +

    • date-received +

    • from +

    • mailbox-order (unsorted) +

    • score +

    • size +

    • spam +

    • subject +

    • threads +

    • to

    -You may optionally use the “reverse-” prefix to specify reverse sorting -order (example: “set sort=reverse-date-sent”). -

3.265. sort_alias

Type: sort order
+You may optionally use the “reverse-” prefix to specify reverse sorting +order (example: “set sort=reverse-date-sent”). +

3.264. sort_alias

Type: sort order
Default: alias

-Specifies how the entries in the “alias” menu are sorted. The +Specifies how the entries in the “alias” menu are sorted. The following are legal values: -

  • address (sort alphabetically by email address) -

  • alias (sort alphabetically by alias name) -

  • unsorted (leave in order specified in .muttrc) -

3.266. sort_aux

Type: sort order
+

  • address (sort alphabetically by email address) +

  • alias (sort alphabetically by alias name) +

  • unsorted (leave in order specified in .muttrc) +

3.265. sort_aux

Type: sort order
Default: date

When sorting by threads, this variable controls how threads are sorted in relation to other threads, and how the branches of the thread trees -are sorted. This can be set to any value that $sort can, except -“threads” (in that case, mutt will just use “date-sent”). You can also -specify the “last-” prefix in addition to the “reverse-” prefix, but “last-” -must come after “reverse-”. The “last-” prefix causes messages to be +are sorted. This can be set to any value that $sort can, except +“threads” (in that case, mutt will just use “date-sent”). You can also +specify the “last-” prefix in addition to the “reverse-” prefix, but “last-” +must come after “reverse-”. The “last-” prefix causes messages to be sorted against its siblings by which has the last descendant, using -the rest of $sort_aux as an ordering. For instance, +the rest of $sort_aux as an ordering. For instance, 

 set sort_aux=last-date-received

would mean that if a new message is received in a thread, that thread becomes the last one displayed (or the first, if -you have “set sort=reverse-threads”.) +you have “set sort=reverse-threads”.)

-Note: For reversed $sort -order $sort_aux is reversed again (which is not the right thing to do, +Note: For reversed $sort +order $sort_aux is reversed again (which is not the right thing to do, but kept to not break any existing configuration setting). -

3.267. sort_browser

Type: sort order
+

3.266. sort_browser

Type: sort order
Default: alpha

Specifies how to sort entries in the file browser. By default, the entries are sorted alphabetically. Valid values: -

  • alpha (alphabetically) -

  • date -

  • size -

  • unsorted +

    • alpha (alphabetically) +

    • date +

    • size +

    • unsorted

    -You may optionally use the “reverse-” prefix to specify reverse sorting -order (example: “set sort_browser=reverse-date”). -

3.268. sort_re

Type: boolean
+You may optionally use the “reverse-” prefix to specify reverse sorting +order (example: “set sort_browser=reverse-date”). +

3.267. sort_re

Type: boolean
Default: yes

This variable is only useful when sorting by threads with -$strict_threads unset. In that case, it changes the heuristic -mutt uses to thread messages by subject. With $sort_re set, mutt will +$strict_threads unset. In that case, it changes the heuristic +mutt uses to thread messages by subject. With $sort_re set, mutt will only attach a message as the child of another message by subject if the subject of the child message starts with a substring matching the -setting of $reply_regexp. With $sort_re unset, mutt will attach +setting of $reply_regexp. With $sort_re unset, mutt will attach the message whether or not this is the case, as long as the -non-$reply_regexp parts of both messages are identical. -

3.269. spam_separator

Type: string
-Default: “,”

+non-$reply_regexp parts of both messages are identical. +

3.268. spam_separator

Type: string
+Default: “,”

This variable controls what happens when multiple spam headers are matched: if unset, each successive header will overwrite any previous matches value for the spam label. If set, each successive match will append to the previous, using this variable's value as a separator. -

3.270. spoolfile

Type: path
+

3.269. spoolfile

Type: path
Default: (empty)

If your spool mailbox is in a non-default place where Mutt cannot find it, you can specify its location with this variable. Mutt will initially set this variable to the value of the environment variable $MAIL or $MAILDIR if either is defined. -

3.271. ssl_ca_certificates_file

Type: path
+

3.270. ssl_ca_certificates_file

Type: path
Default: (empty)

This variable specifies a file containing trusted CA certificates. Any server certificate that is signed with one of these CA @@ -6736,72 +6350,72 @@ 

 set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
-

3.272. ssl_client_cert

Type: path
+

3.271. ssl_client_cert

Type: path
Default: (empty)

The file containing a client certificate and its associated private key. -

3.273. ssl_force_tls

Type: boolean
+

3.272. ssl_force_tls

Type: boolean
Default: no

If this variable is set, Mutt will require that all connections to remote servers be encrypted. Furthermore it will attempt to negotiate TLS even if the server does not advertise the capability, since it would otherwise have to abort the connection anyway. This -option supersedes $ssl_starttls. -

3.274. ssl_min_dh_prime_bits

Type: number
+option supersedes $ssl_starttls. +

3.273. ssl_min_dh_prime_bits

Type: number
Default: 0

This variable specifies the minimum acceptable prime size (in bits) for use in any Diffie-Hellman key exchange. A value of 0 will use the default from the GNUTLS library. -

3.275. ssl_starttls

Type: quadoption
+

3.274. ssl_starttls

Type: quadoption
Default: yes

If set (the default), mutt will attempt to use STARTTLS on servers advertising the capability. When unset, mutt will not attempt to use STARTTLS regardless of the server's capabilities. -

3.276. ssl_use_sslv2

Type: boolean
+

3.275. ssl_use_sslv2

Type: boolean
Default: no

This variable specifies whether to attempt to use SSLv2 in the SSL authentication process. -

3.277. ssl_use_sslv3

Type: boolean
+

3.276. ssl_use_sslv3

Type: boolean
Default: yes

This variable specifies whether to attempt to use SSLv3 in the SSL authentication process. -

3.278. ssl_use_tlsv1

Type: boolean
+

3.277. ssl_use_tlsv1

Type: boolean
Default: yes

This variable specifies whether to attempt to use TLSv1 in the SSL authentication process. -

3.279. ssl_usesystemcerts

Type: boolean
+

3.278. ssl_usesystemcerts

Type: boolean
Default: yes

If set to yes, mutt will use CA certificates in the system-wide certificate store when checking if a server certificate is signed by a trusted CA. -

3.280. ssl_verify_dates

Type: boolean
+

3.279. ssl_verify_dates

Type: boolean
Default: yes

If set (the default), mutt will not automatically accept a server certificate that is either not yet valid or already expired. You should only unset this for particular known hosts, using the -<account-hook> function. -

3.281. ssl_verify_host

Type: boolean
+<account-hook> function. +

3.280. ssl_verify_host

Type: boolean
Default: yes

If set (the default), mutt will not automatically accept a server certificate whose host name does not match the host used in your folder URL. You should only unset this for particular known hosts, using -the <account-hook> function. -

3.282. status_chars

Type: string
-Default: “-*%A”

-Controls the characters used by the “%r” indicator in -$status_format. The first character is used when the mailbox is +the <account-hook> function. +

3.281. status_chars

Type: string
+Default: “-*%A”

+Controls the characters used by the “%r” indicator in +$status_format. The first character is used when the mailbox is unchanged. The second is used when the mailbox has been changed, and it needs to be resynchronized. The third is used if the mailbox is in read-only mode, or if the mailbox will not be written when exiting that mailbox (You can toggle whether to write changes to a mailbox -with the <toggle-write> operation, bound by default to “%”). The fourth +with the <toggle-write> operation, bound by default to “%”). The fourth is used to indicate that the current folder has been opened in attach- message mode (Certain operations like composing a new mail, replying, forwarding, etc. are not permitted in this mode). -

3.283. status_format

Type: string
-Default: “-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---”

-Controls the format of the status line displayed in the “index” -menu. This string is similar to $index_format, but has its own +

3.282. status_format

Type: string
+Default: “-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---”

+Controls the format of the status line displayed in the “index” +menu. This string is similar to $index_format, but has its own set of printf(3)-like sequences:

%b number of mailboxes with new mail * @@ -6819,18 +6433,18 @@
%p number of postponed messages *
%P percentage of the way through the index
%r modified/read-only/won't-write/attach-message indicator, -according to $status_chars -
%s current sorting mode ($sort) -
%S current aux sorting method ($sort_aux) +according to $status_chars +
%s current sorting mode ($sort) +
%S current aux sorting method ($sort_aux)
%t number of tagged messages *
%u number of unread messages *
%v Mutt version string
%V currently active limit pattern, if any * -
%>X right justify the rest of the string and pad with “X” -
%|X pad to the end of the line with “X” -
%*X soft-fill with character “X” as pad +
%>X right justify the rest of the string and pad with “X” +
%|X pad to the end of the line with “X” +
%*X soft-fill with character “X” as pad

-For an explanation of “soft-fill”, see the $index_format documentation. +For an explanation of “soft-fill”, see the $index_format documentation.

* = can be optionally printed if nonzero

@@ -6861,46 +6475,46 @@ be expanded, otherwise else_string will be expanded.

You can force the result of any printf(3)-like sequence to be lowercase -by prefixing the sequence character with an underscore (“_”) sign. +by prefixing the sequence character with an underscore (“_”) sign. For example, if you want to display the local hostname in lowercase, -you would use: “%_h”. +you would use: “%_h”.

-If you prefix the sequence character with a colon (“:”) character, mutt +If you prefix the sequence character with a colon (“:”) character, mutt will replace any dots in the expansion by underscores. This might be helpful with IMAP folders that don't like dots in folder names. -

3.284. status_on_top

Type: boolean
+

3.283. status_on_top

Type: boolean
Default: no

-Setting this variable causes the “status bar” to be displayed on -the first line of the screen rather than near the bottom. If $help +Setting this variable causes the “status bar” to be displayed on +the first line of the screen rather than near the bottom. If $help is set, too it'll be placed at the bottom. -

3.285. strict_threads

Type: boolean
+

3.284. strict_threads

Type: boolean
Default: no

-If set, threading will only make use of the “In-Reply-To” and -“References:” fields when you $sort by message threads. By +If set, threading will only make use of the “In-Reply-To” and +“References:” fields when you $sort by message threads. By default, messages with the same subject are grouped together in -“pseudo threads.”. This may not always be desirable, such as in a +“pseudo threads.”. This may not always be desirable, such as in a personal mailbox where you might have several unrelated messages with -the subjects like “hi” which will get grouped together. See also -$sort_re for a less drastic way of controlling this -behavior. -

3.286. suspend

Type: boolean
+the subjects like “hi” which will get grouped together. See also +$sort_re for a less drastic way of controlling this +behaviour. +

3.285. suspend

Type: boolean
Default: yes

When unset, mutt won't stop when the user presses the terminal's -susp key, usually “^Z”. This is useful if you run mutt -inside an xterm using a command like “xterm -e mutt”. -

3.287. text_flowed

Type: boolean
+susp key, usually “^Z”. This is useful if you run mutt +inside an xterm using a command like “xterm -e mutt”. +

3.286. text_flowed

Type: boolean
Default: no

-When set, mutt will generate “format=flowed” bodies with a content type -of “text/plain; format=flowed”. +When set, mutt will generate “format=flowed” bodies with a content type +of “text/plain; format=flowed”. This format is easier to handle for some mailing software, and generally just looks like ordinary text. To actually make use of this format's features, you'll need support in your editor.

-Note that $indent_string is ignored when this option is set. -

3.288. thorough_search

Type: boolean
-Default: yes

-Affects the ~b and ~h search operations described in -section “patterns”. If set, the headers and body/attachments of +Note that $indent_string is ignored when this option is set. +

3.287. thorough_search

Type: boolean
+Default: no

+Affects the ˜b and ˜h search operations described in +section “patterns”. If set, the headers and body/attachments of messages to be searched are decoded before searching. If unset, messages are searched as they appear in the folder.

@@ -6909,26 +6523,26 @@ character set conversions. Otherwise mutt will attempt to match against the raw message received (for example quoted-printable encoded or with encoded headers) which may lead to incorrect search results. -

3.289. thread_received

Type: boolean
+

3.288. thread_received

Type: boolean
Default: no

When set, mutt uses the date received rather than the date sent to thread messages by subject. -

3.290. tilde

Type: boolean
+

3.289. tilde

Type: boolean
Default: no

When set, the internal-pager will pad blank lines to the bottom of the -screen with a tilde (“~”). -

3.291. time_inc

Type: number
+screen with a tilde (“˜”). +

3.290. time_inc

Type: number
Default: 0

-Along with $read_inc, $write_inc, and $net_inc, this +Along with $read_inc, $write_inc, and $net_inc, this variable controls the frequency with which progress updates are -displayed. It suppresses updates less than $time_inc milliseconds +displayed. It suppresses updates less than $time_inc milliseconds apart. This can improve throughput on systems with slow terminals, or when running mutt on a remote system.

-Also see the “tuning” section of the manual for performance considerations. -

3.292. timeout

Type: number
+Also see the “tuning” section of the manual for performance considerations. +

3.291. timeout

Type: number
Default: 600

-When Mutt is waiting for user input either idling in menus or +When Mutt is waiting for user input either idleing in menus or in an interactive prompt, Mutt would block until input is present. Depending on the context, this would prevent certain operations from working, like checking for new mail or keeping @@ -6939,25 +6553,25 @@ continues to wait for input.

A value of zero or less will cause Mutt to never time out. -

3.293. tmpdir

Type: path
+

3.292. tmpdir

Type: path
Default: (empty)

This variable allows you to specify where Mutt will place its temporary files needed for displaying and composing messages. If this variable is not set, the environment variable $TMPDIR is -used. If $TMPDIR is not set then “/tmp” is used. -

3.294. to_chars

Type: string
-Default: “ +TCFL”

+used. If $TMPDIR is not set then “/tmp” is used. +

3.293. to_chars

Type: string
+Default: “ +TCFL”

Controls the character used to indicate mail addressed to you. The first character is the one used when the mail is not addressed to your address. The second is used when you are the only recipient of the message. The third is when your address -appears in the “To:” header field, but you are not the only recipient of +appears in the “To:” header field, but you are not the only recipient of the message. The fourth character is used when your -address is specified in the “Cc:” header field, but you are not the only +address is specified in the “Cc:” header field, but you are not the only recipient. The fifth character is used to indicate mail that was sent by you. The sixth character is used to indicate when a mail was sent to a mailing-list you subscribe to. -

3.295. tunnel

Type: string
+

3.294. tunnel

Type: string
Default: (empty)

Setting this variable will cause mutt to open a pipe to a command instead of a raw socket. You may be able to use this to set up @@ -6970,135 +6584,124 @@ machine without having to enter a password.

When set, Mutt uses the tunnel for all remote connections. -Please see “account-hook” in the manual for how to use different +Please see “account-hook” in the manual for how to use different tunnel commands per connection. -

3.296. uncollapse_jump

Type: boolean
+

3.295. uncollapse_jump

Type: boolean
Default: no

When set, Mutt will jump to the next unread message, if any, when the current thread is uncollapsed. -

3.297. use_8bitmime

Type: boolean
+

3.296. use_8bitmime

Type: boolean
Default: no

Warning: do not set this variable unless you are using a version of sendmail which supports the -B8BITMIME flag (such as sendmail 8.8.x) or you may not be able to send mail.

-When set, Mutt will invoke $sendmail with the -B8BITMIME +When set, Mutt will invoke $sendmail with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP negotiation. -

3.298. use_domain

Type: boolean
+

3.297. use_domain

Type: boolean
Default: yes

When set, Mutt will qualify all local addresses (ones without the -“@host” portion) with the value of $hostname. If unset, no +“@host” portion) with the value of $hostname. If unset, no addresses will be qualified. -

3.299. use_envelope_from

Type: boolean
+

3.298. use_envelope_from

Type: boolean
Default: no

When set, mutt will set the envelope sender of the message. -If $envelope_from_address is set, it will be used as the sender +If $envelope_from_address is set, it will be used as the sender address. If unset, mutt will attempt to derive the sender from the -“From:” header. +“From:” header.

Note that this information is passed to sendmail command using the -f command line switch. Therefore setting this option is not useful -if the $sendmail variable already contains -f or if the -executable pointed to by $sendmail doesn't support the -f switch. -

3.300. use_from

Type: boolean
-Default: yes

-When set, Mutt will generate the “From:” header field when -sending messages. If unset, no “From:” header field will be -generated unless the user explicitly sets one using the “my_hdr” +if the $sendmail variable already contains -f or if the +executable pointed to by $sendmail doesn't support the -f switch. +

3.299. use_from

Type: boolean
+Default: yes

+When set, Mutt will generate the “From:” header field when +sending messages. If unset, no “From:” header field will be +generated unless the user explicitly sets one using the “my_hdr” command. -

3.301. use_idn

Type: boolean
+

3.300. use_idn

Type: boolean
Default: yes

When set, Mutt will show you international domain names decoded. Note: You can use IDNs for addresses even if this is unset. This variable only affects decoding. -

3.302. use_ipv6

Type: boolean
+

3.301. use_ipv6

Type: boolean
Default: yes

When set, Mutt will look for IPv6 addresses of hosts it tries to contact. If this option is unset, Mutt will restrict itself to IPv4 addresses. Normally, the default should work. -

3.303. user_agent

Type: boolean
+

3.302. user_agent

Type: boolean
Default: yes

-When set, mutt will add a “User-Agent:” header to outgoing +When set, mutt will add a “User-Agent:” header to outgoing messages, indicating which version of mutt was used for composing them. -

3.304. visual

Type: path
+

3.303. visual

Type: path
Default: (empty)

-Specifies the visual editor to invoke when the “~v” command is -given in the built-in editor. -

3.305. wait_key

Type: boolean
+Specifies the visual editor to invoke when the “˜v” command is +given in the builtin editor. +

3.304. wait_key

Type: boolean
Default: yes

Controls whether Mutt will ask you to press a key after an external command has been invoked by these functions: <shell-escape>, <pipe-message>, <pipe-entry>, <print-message>, and <print-entry> commands.

-It is also used when viewing attachments with “auto_view”, provided +It is also used when viewing attachments with “auto_view”, provided that the corresponding mailcap entry has a needsterminal flag, and the external program is interactive.

When set, Mutt will always ask for a key. When unset, Mutt will wait for a key only if the external command returned a non-zero status. -

3.306. weed

Type: boolean
+

3.305. weed

Type: boolean
Default: yes

When set, mutt will weed headers when displaying, forwarding, printing, or replying to messages. -

3.307. wrap

Type: number
+

3.306. wrap

Type: number
Default: 0

-When set to a positive value, mutt will wrap text at $wrap characters. -When set to a negative value, mutt will wrap text so that there are $wrap -characters of empty space on the right side of the terminal. Setting it -to zero makes mutt wrap at the terminal width. -

3.308. wrap_headers

Type: number
-Default: 78

-This option specifies the number of characters to use for wrapping -an outgoing message's headers. Allowed values are between 78 and 998 -inclusive. -

-Note: This option usually shouldn't be changed. RFC5233 -recommends a line length of 78 (the default), so please only change -this setting when you know what you're doing. -

3.309. wrap_search

Type: boolean
+When set to a positive value, mutt will wrap text at $wrap characters. +When set to a negative value, mutt will wrap text so that there are $wrap +characters of empty space on the right side of the terminal. +

3.307. wrap_search

Type: boolean
Default: yes

Controls whether searches wrap around the end.

When set, searches will wrap around the first (or last) item. When unset, incremental searches will not wrap. -

3.310. wrapmargin

Type: number
+

3.308. wrapmargin

Type: number
Default: 0

-(DEPRECATED) Equivalent to setting $wrap with a negative value. -

3.311. write_bcc

Type: boolean
+(DEPRECATED) Equivalent to setting $wrap with a negative value. +

3.309. write_bcc

Type: boolean
Default: yes

-Controls whether mutt writes out the “Bcc:” header when preparing +Controls whether mutt writes out the “Bcc:” header when preparing messages to be sent. Exim users may wish to unset this. If mutt -is set to deliver directly via SMTP (see $smtp_url), this -option does nothing: mutt will never write out the “Bcc:” header +is set to deliver directly via SMTP (see $smtp_url), this +option does nothing: mutt will never write out the “Bcc:” header in this case. -

3.312. write_inc

Type: number
+

3.310. write_inc

Type: number
Default: 10

When writing a mailbox, a message will be printed every -$write_inc messages to indicate progress. If set to 0, only a +$write_inc messages to indicate progress. If set to 0, only a single message will be displayed before writing a mailbox.

-Also see the $read_inc, $net_inc and $time_inc variables and the -“tuning” section of the manual for performance considerations. -

4. Functions

+Also see the $read_inc, $net_inc and $time_inc variables and the +“tuning” section of the manual for performance considerations. +

4. Functions

The following is the list of available functions listed by the mapping in which they are available. The default key setting is given, and an explanation of what the function does. The key bindings of these -functions can be changed with the bind +functions can be changed with the bind command. -

4.1. Generic Menu

+

4.1. Generic Menu

The generic menu is not a real menu, but specifies common functions (such as movement) available in all menus except for pager and editor. Changing settings for this menu will affect the default bindings for all menus (except as noted). -

Table 9.2. Default Generic Menu Bindings

FunctionDefault keyDescription
<top-page>Hmove to the top of the page
<next-entry>jmove to the next entry
<previous-entry>kmove to the previous entry
<bottom-page>Lmove to the bottom of the page
<refresh>^Lclear and redraw the screen
<middle-page>Mmove to the middle of the page
<search-next>nsearch for next match
<exit>qexit this menu
<tag-entry>ttag the current entry
<next-page>zmove to the next page
<previous-page>Zmove to the previous page
<last-entry>*move to the last entry
<first-entry>=move to the first entry
<enter-command>:enter a muttrc command
<next-line>>scroll down one line
<previous-line><scroll up one line
<half-up>[scroll up 1/2 page
<half-down>]scroll down 1/2 page
<help>?this screen
<tag-prefix>;apply next function to tagged messages
<tag-prefix-cond> apply next function ONLY to tagged messages
<end-cond> end of conditional execution (noop)
<shell-escape>!invoke a command in a subshell
<select-entry><Return>select the current entry
<search>/search for a regular expression
<search-reverse>Esc /search backwards for a regular expression
<search-opposite> search for next match in opposite direction
<jump> jump to an index number
<current-top> move entry to top of screen
<current-middle> move entry to middle of screen
<current-bottom> move entry to bottom of screen
<what-key> display the keycode for a key press

4.2. Index Menu

Table 9.3. Default Index Menu Bindings

FunctionDefault keyDescription
<create-alias>acreate an alias from a message sender
<bounce-message>bremail a message to another user
<break-thread>#break the thread in two
<change-folder>copen a different folder
<change-folder-readonly>Esc copen a different folder in read only mode
<next-unread-mailbox> open next mailbox with new mail
<collapse-thread>Esc vcollapse/uncollapse current thread
<collapse-all>Esc Vcollapse/uncollapse all threads
<copy-message>Ccopy a message to a file/mailbox
<decode-copy>Esc Cmake decoded (text/plain) copy
<decode-save>Esc smake decoded copy (text/plain) and delete
<delete-message>ddelete the current entry
<delete-pattern>Ddelete messages matching a pattern
<delete-thread>^Ddelete all messages in thread
<delete-subthread>Esc ddelete all messages in subthread
<edit>eedit the raw message
<edit-type>^Eedit attachment content type
<forward-message>fforward a message with comments
<flag-message>Ftoggle a message's 'important' flag
<group-reply>greply to all recipients
<fetch-mail>Gretrieve mail from POP server
<imap-fetch-mail> force retrieval of mail from IMAP server
<imap-logout-all> logout from all IMAP servers
<display-toggle-weed>hdisplay message and toggle header weeding
<next-undeleted>jmove to the next undeleted message
<previous-undeleted>kmove to the previous undeleted message
<limit>lshow only messages matching a pattern
<link-threads>&link tagged message to the current one
<list-reply>Lreply to specified mailing list
<mail>mcompose a new mail message
<toggle-new>Ntoggle a message's 'new' flag
<toggle-write>%toggle whether the mailbox will be rewritten
<next-thread>^Njump to the next thread
<next-subthread>Esc njump to the next subthread
<query>Qquery external program for addresses
<quit>qsave changes to mailbox and quit
<reply>rreply to a message
<show-limit>Esc lshow currently active limit pattern
<sort-mailbox>osort messages
<sort-reverse>Osort messages in reverse order
<print-message>pprint the current entry
<previous-thread>^Pjump to previous thread
<previous-subthread>Esc pjump to previous subthread
<recall-message>Rrecall a postponed message
<read-thread>^Rmark the current thread as read
<read-subthread>Esc rmark the current subthread as read
<resend-message>Esc euse the current message as a template for a new one
<save-message>ssave message/attachment to a mailbox/file
<tag-pattern>Ttag messages matching a pattern
<tag-subthread> tag the current subthread
<tag-thread>Esc ttag the current thread
<untag-pattern>^Tuntag messages matching a pattern
<undelete-message>uundelete the current entry
<undelete-pattern>Uundelete messages matching a pattern
<undelete-subthread>Esc uundelete all messages in subthread
<undelete-thread>^Uundelete all messages in thread
<view-attachments>vshow MIME attachments
<show-version>Vshow the Mutt version number and date
<set-flag>wset a status flag on a message
<clear-flag>Wclear a status flag from a message
<display-message><Return>display a message
<buffy-list>.list mailboxes with new mail
<sync-mailbox>$save changes to mailbox
<display-address>@display full address of sender
<pipe-message>|pipe message/attachment to a shell command
<next-new> jump to the next new message
<next-new-then-unread><Tab>jump to the next new or unread message
<previous-new> jump to the previous new message
<previous-new-then-unread>Esc <Tab>jump to the previous new or unread message
<next-unread> jump to the next unread message
<previous-unread> jump to the previous unread message
<parent-message>Pjump to parent message in thread
<extract-keys>^Kextract supported public keys
<forget-passphrase>^Fwipe passphrase(s) from memory
<check-traditional-pgp>Esc Pcheck for classic PGP
<mail-key>Esc kmail a PGP public key
<decrypt-copy> make decrypted copy
<decrypt-save> make decrypted copy and delete

4.3. Pager Menu

Table 9.4. Default Pager Menu Bindings

FunctionDefault keyDescription
<break-thread>#break the thread in two
<create-alias>acreate an alias from a message sender
<bounce-message>bremail a message to another user
<change-folder>copen a different folder
<change-folder-readonly>Esc copen a different folder in read only mode
<next-unread-mailbox> open next mailbox with new mail
<copy-message>Ccopy a message to a file/mailbox
<decode-copy>Esc Cmake decoded (text/plain) copy
<delete-message>ddelete the current entry
<delete-thread>^Ddelete all messages in thread
<delete-subthread>Esc ddelete all messages in subthread
<set-flag>wset a status flag on a message
<clear-flag>Wclear a status flag from a message
<edit>eedit the raw message
<edit-type>^Eedit attachment content type
<forward-message>fforward a message with comments
<flag-message>Ftoggle a message's 'important' flag
<group-reply>greply to all recipients
<imap-fetch-mail> force retrieval of mail from IMAP server
<imap-logout-all> logout from all IMAP servers
<display-toggle-weed>hdisplay message and toggle header weeding
<next-undeleted>jmove to the next undeleted message
<next-entry>Jmove to the next entry
<previous-undeleted>kmove to the previous undeleted message
<previous-entry>Kmove to the previous entry
<link-threads>&link tagged message to the current one
<list-reply>Lreply to specified mailing list
<redraw-screen>^Lclear and redraw the screen
<mail>mcompose a new mail message
<mark-as-new>Ntoggle a message's 'new' flag
<search-next>nsearch for next match
<next-thread>^Njump to the next thread
<next-subthread>Esc njump to the next subthread
<sort-mailbox>osort messages
<sort-reverse>Osort messages in reverse order
<print-message>pprint the current entry
<previous-thread>^Pjump to previous thread
<previous-subthread>Esc pjump to previous subthread
<quit>Qsave changes to mailbox and quit
<exit>qexit this menu
<reply>rreply to a message
<recall-message>Rrecall a postponed message
<read-thread>^Rmark the current thread as read
<read-subthread>Esc rmark the current subthread as read
<resend-message>Esc euse the current message as a template for a new one
<save-message>ssave message/attachment to a mailbox/file
<skip-quoted>Sskip beyond quoted text
<decode-save>Esc smake decoded copy (text/plain) and delete
<tag-message>ttag the current entry
<toggle-quoted>Ttoggle display of quoted text
<undelete-message>uundelete the current entry
<undelete-subthread>Esc uundelete all messages in subthread
<undelete-thread>^Uundelete all messages in thread
<view-attachments>vshow MIME attachments
<show-version>Vshow the Mutt version number and date
<search-toggle>\\toggle search pattern coloring
<display-address>@display full address of sender
<next-new> jump to the next new message
<pipe-message>|pipe message/attachment to a shell command
<help>?this screen
<next-page><Space>move to the next page
<previous-page>-move to the previous page
<top>^jump to the top of the message
<sync-mailbox>$save changes to mailbox
<shell-escape>!invoke a command in a subshell
<enter-command>:enter a muttrc command
<buffy-list>.list mailboxes with new mail
<search>/search for a regular expression
<search-reverse>Esc /search backwards for a regular expression
<search-opposite> search for next match in opposite direction
<next-line><Return>scroll down one line
<jump> jump to an index number
<next-unread> jump to the next unread message
<previous-new> jump to the previous new message
<previous-unread> jump to the previous unread message
<half-up> scroll up 1/2 page
<half-down> scroll down 1/2 page
<previous-line> scroll up one line
<bottom> jump to the bottom of the message
<parent-message>Pjump to parent message in thread
<check-traditional-pgp>Esc Pcheck for classic PGP
<mail-key>Esc kmail a PGP public key
<extract-keys>^Kextract supported public keys
<forget-passphrase>^Fwipe passphrase(s) from memory
<decrypt-copy> make decrypted copy
<decrypt-save> make decrypted copy and delete
<what-key> display the keycode for a key press

4.4. Alias Menu

Table 9.5. Default Alias Menu Bindings

FunctionDefault keyDescription
<delete-entry>ddelete the current entry
<undelete-entry>uundelete the current entry

4.5. Query Menu

Table 9.6. Default Query Menu Bindings

FunctionDefault keyDescription
<create-alias>acreate an alias from a message sender
<mail>mcompose a new mail message
<query>Qquery external program for addresses
<query-append>Aappend new query results to current results

4.6. Attachment Menu

Table 9.7. Default Attachment Menu Bindings

FunctionDefault keyDescription
<bounce-message>bremail a message to another user
<display-toggle-weed>hdisplay message and toggle header weeding
<edit-type>^Eedit attachment content type
<print-entry>pprint the current entry
<save-entry>ssave message/attachment to a mailbox/file
<pipe-entry>|pipe message/attachment to a shell command
<view-mailcap>mforce viewing of attachment using mailcap
<reply>rreply to a message
<resend-message>Esc euse the current message as a template for a new one
<group-reply>greply to all recipients
<list-reply>Lreply to specified mailing list
<forward-message>fforward a message with comments
<view-text>Tview attachment as text
<view-attach><Return>view attachment using mailcap entry if necessary
<delete-entry>ddelete the current entry
<undelete-entry>uundelete the current entry
<collapse-parts>vToggle display of subparts
<check-traditional-pgp>Esc Pcheck for classic PGP
<extract-keys>^Kextract supported public keys
<forget-passphrase>^Fwipe passphrase(s) from memory

4.7. Compose Menu

Table 9.8. Default Compose Menu Bindings

FunctionDefault keyDescription
<attach-file>aattach file(s) to this message
<attach-message>Aattach message(s) to this message
<edit-bcc>bedit the BCC list
<edit-cc>cedit the CC list
<copy-file>Csave message/attachment to a mailbox/file
<detach-file>Ddelete the current entry
<toggle-disposition>^Dtoggle disposition between inline/attachment
<edit-description>dedit attachment description
<edit-message>eedit the message
<edit-headers>Eedit the message with headers
<edit-file>^X eedit the file to be attached
<edit-encoding>^Eedit attachment transfer-encoding
<edit-from>Esc fedit the from field
<edit-fcc>fenter a file to save a copy of this message in
<filter-entry>Ffilter attachment through a shell command
<get-attachment>Gget a temporary copy of an attachment
<display-toggle-weed>hdisplay message and toggle header weeding
<ispell>irun ispell on the message
<print-entry>lprint the current entry
<edit-mime>medit attachment using mailcap entry
<new-mime>ncompose new attachment using mailcap entry
<postpone-message>Psave this message to send later
<edit-reply-to>redit the Reply-To field
<rename-file>Rrename/move an attached file
<edit-subject>sedit the subject of this message
<edit-to>tedit the TO list
<edit-type>^Tedit attachment content type
<write-fcc>wwrite the message to a folder
<toggle-unlink>utoggle whether to delete file after sending it
<toggle-recode> toggle recoding of this attachment
<update-encoding>Uupdate an attachment's encoding info
<view-attach><Return>view attachment using mailcap entry if necessary
<send-message>ysend the message
<pipe-entry>|pipe message/attachment to a shell command
<attach-key>Esc kattach a PGP public key
<pgp-menu>pshow PGP options
<forget-passphrase>^Fwipe passphrase(s) from memory
<smime-menu>Sshow S/MIME options
<mix>Msend the message through a mixmaster remailer chain

4.8. Postpone Menu

Table 9.9. Default Postpone Menu Bindings

FunctionDefault keyDescription
<delete-entry>ddelete the current entry
<undelete-entry>uundelete the current entry

4.9. Browser Menu

Table 9.10. Default Browser Menu Bindings

FunctionDefault keyDescription
<change-dir>cchange directories
<display-filename>@display the currently selected file's name
<enter-mask>menter a file mask
<sort>osort messages
<sort-reverse>Osort messages in reverse order
<select-new>Nselect a new file in this directory
<check-new> check mailboxes for new mail
<toggle-mailboxes><Tab>toggle whether to browse mailboxes or all files
<view-file><Space>view file
<buffy-list>.list mailboxes with new mail
<create-mailbox>Ccreate a new mailbox (IMAP only)
<delete-mailbox>ddelete the current mailbox (IMAP only)
<rename-mailbox>rrename the current mailbox (IMAP only)
<subscribe>ssubscribe to current mailbox (IMAP only)
<unsubscribe>uunsubscribe from current mailbox (IMAP only)
<toggle-subscribed>Ttoggle view all/subscribed mailboxes (IMAP only)

4.10. Pgp Menu

Table 9.11. Default Pgp Menu Bindings

FunctionDefault keyDescription
<verify-key>cverify a PGP public key
<view-name>%view the key's user id

4.11. Smime Menu

Table 9.12. Default Smime Menu Bindings

FunctionDefault keyDescription
<verify-key>cverify a PGP public key
<view-name>%view the key's user id

4.12. Mixmaster Menu

Table 9.13. Default Mixmaster Menu Bindings

FunctionDefault keyDescription
<accept><Return>Accept the chain constructed
<append>aAppend a remailer to the chain
<insert>iInsert a remailer into the chain
<delete>dDelete a remailer from the chain
<chain-prev><Left>Select the previous element of the chain
<chain-next><Right>Select the next element of the chain

4.13. Editor Menu

Table 9.14. Default Editor Menu Bindings

FunctionDefault keyDescription
<bol>^Ajump to the beginning of the line
<backward-char>^Bmove the cursor one character to the left
<backward-word>Esc bmove the cursor to the beginning of the word
<capitalize-word>Esc ccapitalize the word
<downcase-word>Esc lconvert the word to lower case
<upcase-word>Esc uconvert the word to upper case
<delete-char>^Ddelete the char under the cursor
<eol>^Ejump to the end of the line
<forward-char>^Fmove the cursor one character to the right
<forward-word>Esc fmove the cursor to the end of the word
<backspace><Backspace>delete the char in front of the cursor
<kill-eol>^Kdelete chars from cursor to end of line
<kill-eow>Esc ddelete chars from the cursor to the end of the word
<kill-line>^Udelete all chars on the line
<quote-char>^Vquote the next typed key
<kill-word>^Wdelete the word in front of the cursor
<complete><Tab>complete filename or alias
<complete-query>^Tcomplete address with query
<buffy-cycle><Space>cycle among incoming mailboxes
<history-up> scroll up through the history list
<history-down> scroll down through the history list
<transpose-chars> transpose character under cursor with previous

Chapter 10. Miscellany

Table of Contents

1. Acknowledgements
2. About This Document

1. Acknowledgements

-Kari Hurtta co-developed the original -MIME parsing code back in the ELM-ME days. +

Table 9.2. Default generic Function Bindings

FunctionDefault keyDescription
<top-page>Hmove to the top of the page
<next-entry>jmove to the next entry
<previous-entry>kmove to the previous entry
<bottom-page>Lmove to the bottom of the page
<refresh>^Lclear and redraw the screen
<middle-page>Mmove to the middle of the page
<search-next>nsearch for next match
<exit>qexit this menu
<tag-entry>ttag the current entry
<next-page>zmove to the next page
<previous-page>Zmove to the previous page
<last-entry>*move to the last entry
<first-entry>=move to the first entry
<enter-command>:enter a muttrc command
<next-line>>scroll down one line
<previous-line><scroll up one line
<half-up>[scroll up 1/2 page
<half-down>]scroll down 1/2 page
<help>?this screen
<tag-prefix>;apply next function to tagged messages
<tag-prefix-cond> apply next function ONLY to tagged messages
<end-cond> end of conditional execution (noop)
<shell-escape>!invoke a command in a subshell
<select-entry><Return>select the current entry
<search>/search for a regular expression
<search-reverse>Esc /search backwards for a regular expression
<search-opposite> search for next match in opposite direction
<jump> jump to an index number
<current-top> move entry to top of screen
<current-middle> move entry to middle of screen
<current-bottom> move entry to bottom of screen
<what-key> display the keycode for a key press

4.2. Index Menu

Table 9.3. Default index Function Bindings

FunctionDefault keyDescription
<create-alias>acreate an alias from a message sender
<bounce-message>bremail a message to another user
<break-thread>#break the thread in two
<change-folder>copen a different folder
<change-folder-readonly>Esc copen a different folder in read only mode
<next-unread-mailbox> open next mailbox with new mail
<collapse-thread>Esc vcollapse/uncollapse current thread
<collapse-all>Esc Vcollapse/uncollapse all threads
<copy-message>Ccopy a message to a file/mailbox
<decode-copy>Esc Cmake decoded (text/plain) copy
<decode-save>Esc smake decoded copy (text/plain) and delete
<delete-message>ddelete the current entry
<delete-pattern>Ddelete messages matching a pattern
<delete-thread>^Ddelete all messages in thread
<delete-subthread>Esc ddelete all messages in subthread
<edit>eedit the raw message
<edit-type>^Eedit attachment content type
<forward-message>fforward a message with comments
<flag-message>Ftoggle a message's 'important' flag
<group-reply>greply to all recipients
<fetch-mail>Gretrieve mail from POP server
<imap-fetch-mail> force retrieval of mail from IMAP server
<display-toggle-weed>hdisplay message and toggle header weeding
<next-undeleted>jmove to the next undeleted message
<previous-undeleted>kmove to the previous undeleted message
<limit>lshow only messages matching a pattern
<link-threads>&link tagged message to the current one
<list-reply>Lreply to specified mailing list
<mail>mcompose a new mail message
<toggle-new>Ntoggle a message's 'new' flag
<toggle-write>%toggle whether the mailbox will be rewritten
<next-thread>^Njump to the next thread
<next-subthread>Esc njump to the next subthread
<query>Qquery external program for addresses
<quit>qsave changes to mailbox and quit
<reply>rreply to a message
<show-limit>Esc lshow currently active limit pattern
<sort-mailbox>osort messages
<sort-reverse>Osort messages in reverse order
<print-message>pprint the current entry
<previous-thread>^Pjump to previous thread
<previous-subthread>Esc pjump to previous subthread
<recall-message>Rrecall a postponed message
<read-thread>^Rmark the current thread as read
<read-subthread>Esc rmark the current subthread as read
<resend-message>Esc euse the current message as a template for a new one
<save-message>ssave message/attachment to a mailbox/file
<tag-pattern>Ttag messages matching a pattern
<tag-subthread> tag the current subthread
<tag-thread>Esc ttag the current thread
<untag-pattern>^Tuntag messages matching a pattern
<undelete-message>uundelete the current entry
<undelete-pattern>Uundelete messages matching a pattern
<undelete-subthread>Esc uundelete all messages in subthread
<undelete-thread>^Uundelete all messages in thread
<view-attachments>vshow MIME attachments
<show-version>Vshow the Mutt version number and date
<set-flag>wset a status flag on a message
<clear-flag>Wclear a status flag from a message
<display-message><Return>display a message
<buffy-list>.list mailboxes with new mail
<sync-mailbox>$save changes to mailbox
<display-address>@display full address of sender
<pipe-message>|pipe message/attachment to a shell command
<next-new> jump to the next new message
<next-new-then-unread><Tab>jump to the next new or unread message
<previous-new> jump to the previous new message
<previous-new-then-unread>Esc <Tab>jump to the previous new or unread message
<next-unread> jump to the next unread message
<previous-unread> jump to the previous unread message
<parent-message>Pjump to parent message in thread
<extract-keys>^Kextract supported public keys
<forget-passphrase>^Fwipe passphrase(s) from memory
<check-traditional-pgp>Esc Pcheck for classic PGP
<mail-key>Esc kmail a PGP public key
<decrypt-copy> make decrypted copy
<decrypt-save> make decrypted copy and delete

4.3. Pager Menu

Table 9.4. Default pager Function Bindings

FunctionDefault keyDescription
<break-thread>#break the thread in two
<create-alias>acreate an alias from a message sender
<bounce-message>bremail a message to another user
<change-folder>copen a different folder
<change-folder-readonly>Esc copen a different folder in read only mode
<next-unread-mailbox> open next mailbox with new mail
<copy-message>Ccopy a message to a file/mailbox
<decode-copy>Esc Cmake decoded (text/plain) copy
<delete-message>ddelete the current entry
<delete-thread>^Ddelete all messages in thread
<delete-subthread>Esc ddelete all messages in subthread
<set-flag>wset a status flag on a message
<clear-flag>Wclear a status flag from a message
<edit>eedit the raw message
<edit-type>^Eedit attachment content type
<forward-message>fforward a message with comments
<flag-message>Ftoggle a message's 'important' flag
<group-reply>greply to all recipients
<imap-fetch-mail> force retrieval of mail from IMAP server
<display-toggle-weed>hdisplay message and toggle header weeding
<next-undeleted>jmove to the next undeleted message
<next-entry>Jmove to the next entry
<previous-undeleted>kmove to the previous undeleted message
<previous-entry>Kmove to the previous entry
<link-threads>&link tagged message to the current one
<list-reply>Lreply to specified mailing list
<redraw-screen>^Lclear and redraw the screen
<mail>mcompose a new mail message
<mark-as-new>Ntoggle a message's 'new' flag
<search-next>nsearch for next match
<next-thread>^Njump to the next thread
<next-subthread>Esc njump to the next subthread
<print-message>pprint the current entry
<previous-thread>^Pjump to previous thread
<previous-subthread>Esc pjump to previous subthread
<quit>Qsave changes to mailbox and quit
<exit>qexit this menu
<reply>rreply to a message
<recall-message>Rrecall a postponed message
<read-thread>^Rmark the current thread as read
<read-subthread>Esc rmark the current subthread as read
<resend-message>Esc euse the current message as a template for a new one
<save-message>ssave message/attachment to a mailbox/file
<skip-quoted>Sskip beyond quoted text
<decode-save>Esc smake decoded copy (text/plain) and delete
<tag-message>ttag the current entry
<toggle-quoted>Ttoggle display of quoted text
<undelete-message>uundelete the current entry
<undelete-subthread>Esc uundelete all messages in subthread
<undelete-thread>^Uundelete all messages in thread
<view-attachments>vshow MIME attachments
<show-version>Vshow the Mutt version number and date
<search-toggle>\\toggle search pattern coloring
<display-address>@display full address of sender
<next-new> jump to the next new message
<pipe-message>|pipe message/attachment to a shell command
<help>?this screen
<next-page><Space>move to the next page
<previous-page>-move to the previous page
<top>^jump to the top of the message
<sync-mailbox>$save changes to mailbox
<shell-escape>!invoke a command in a subshell
<enter-command>:enter a muttrc command
<buffy-list>.list mailboxes with new mail
<search>/search for a regular expression
<search-reverse>Esc /search backwards for a regular expression
<search-opposite> search for next match in opposite direction
<next-line><Return>scroll down one line
<jump> jump to an index number
<next-unread> jump to the next unread message
<previous-new> jump to the previous new message
<previous-unread> jump to the previous unread message
<half-up> scroll up 1/2 page
<half-down> scroll down 1/2 page
<previous-line> scroll up one line
<bottom> jump to the bottom of the message
<parent-message>Pjump to parent message in thread
<check-traditional-pgp>Esc Pcheck for classic PGP
<mail-key>Esc kmail a PGP public key
<extract-keys>^Kextract supported public keys
<forget-passphrase>^Fwipe passphrase(s) from memory
<decrypt-copy> make decrypted copy
<decrypt-save> make decrypted copy and delete
<what-key> display the keycode for a key press

4.4. Alias Menu

Table 9.5. Default alias Function Bindings

FunctionDefault keyDescription
<delete-entry>ddelete the current entry
<undelete-entry>uundelete the current entry

4.5. Query Menu

Table 9.6. Default query Function Bindings

FunctionDefault keyDescription
<create-alias>acreate an alias from a message sender
<mail>mcompose a new mail message
<query>Qquery external program for addresses
<query-append>Aappend new query results to current results

4.6. Attach Menu

Table 9.7. Default attach Function Bindings

FunctionDefault keyDescription
<bounce-message>bremail a message to another user
<display-toggle-weed>hdisplay message and toggle header weeding
<edit-type>^Eedit attachment content type
<print-entry>pprint the current entry
<save-entry>ssave message/attachment to a mailbox/file
<pipe-entry>|pipe message/attachment to a shell command
<view-mailcap>mforce viewing of attachment using mailcap
<reply>rreply to a message
<resend-message>Esc euse the current message as a template for a new one
<group-reply>greply to all recipients
<list-reply>Lreply to specified mailing list
<forward-message>fforward a message with comments
<view-text>Tview attachment as text
<view-attach><Return>view attachment using mailcap entry if necessary
<delete-entry>ddelete the current entry
<undelete-entry>uundelete the current entry
<collapse-parts>vToggle display of subparts
<check-traditional-pgp>Esc Pcheck for classic PGP
<extract-keys>^Kextract supported public keys
<forget-passphrase>^Fwipe passphrase(s) from memory

4.7. Compose Menu

Table 9.8. Default compose Function Bindings

FunctionDefault keyDescription
<attach-file>aattach file(s) to this message
<attach-message>Aattach message(s) to this message
<edit-bcc>bedit the BCC list
<edit-cc>cedit the CC list
<copy-file>Csave message/attachment to a mailbox/file
<detach-file>Ddelete the current entry
<toggle-disposition>^Dtoggle disposition between inline/attachment
<edit-description>dedit attachment description
<edit-message>eedit the message
<edit-headers>Eedit the message with headers
<edit-file>^X eedit the file to be attached
<edit-encoding>^Eedit attachment transfer-encoding
<edit-from>Esc fedit the from field
<edit-fcc>fenter a file to save a copy of this message in
<filter-entry>Ffilter attachment through a shell command
<get-attachment>Gget a temporary copy of an attachment
<display-toggle-weed>hdisplay message and toggle header weeding
<ispell>irun ispell on the message
<print-entry>lprint the current entry
<edit-mime>medit attachment using mailcap entry
<new-mime>ncompose new attachment using mailcap entry
<postpone-message>Psave this message to send later
<edit-reply-to>redit the Reply-To field
<rename-file>Rrename/move an attached file
<edit-subject>sedit the subject of this message
<edit-to>tedit the TO list
<edit-type>^Tedit attachment content type
<write-fcc>wwrite the message to a folder
<toggle-unlink>utoggle whether to delete file after sending it
<toggle-recode> toggle recoding of this attachment
<update-encoding>Uupdate an attachment's encoding info
<view-attach><Return>view attachment using mailcap entry if necessary
<send-message>ysend the message
<pipe-entry>|pipe message/attachment to a shell command
<attach-key>Esc kattach a PGP public key
<pgp-menu>pshow PGP options
<forget-passphrase>^Fwipe passphrase(s) from memory
<smime-menu>Sshow S/MIME options
<mix>Msend the message through a mixmaster remailer chain

4.8. Postpone Menu

Table 9.9. Default postpone Function Bindings

FunctionDefault keyDescription
<delete-entry>ddelete the current entry
<undelete-entry>uundelete the current entry

4.9. Browser Menu

Table 9.10. Default browser Function Bindings

FunctionDefault keyDescription
<change-dir>cchange directories
<display-filename>@display the currently selected file's name
<enter-mask>menter a file mask
<sort>osort messages
<sort-reverse>Osort messages in reverse order
<select-new>Nselect a new file in this directory
<check-new> check mailboxes for new mail
<toggle-mailboxes><Tab>toggle whether to browse mailboxes or all files
<view-file><Space>view file
<buffy-list>.list mailboxes with new mail
<create-mailbox>Ccreate a new mailbox (IMAP only)
<delete-mailbox>ddelete the current mailbox (IMAP only)
<rename-mailbox>rrename the current mailbox (IMAP only)
<subscribe>ssubscribe to current mailbox (IMAP only)
<unsubscribe>uunsubscribe from current mailbox (IMAP only)
<toggle-subscribed>Ttoggle view all/subscribed mailboxes (IMAP only)

4.10. Pgp Menu

Table 9.11. Default pgp Function Bindings

FunctionDefault keyDescription
<verify-key>cverify a PGP public key
<view-name>%view the key's user id

4.11. Smime Menu

Table 9.12. Default smime Function Bindings

FunctionDefault keyDescription
<verify-key>cverify a PGP public key
<view-name>%view the key's user id

4.12. Mix Menu

Table 9.13. Default mix Function Bindings

FunctionDefault keyDescription
<accept><Return>Accept the chain constructed
<append>aAppend a remailer to the chain
<insert>iInsert a remailer into the chain
<delete>dDelete a remailer from the chain
<chain-prev><Left>Select the previous element of the chain
<chain-next><Right>Select the next element of the chain

4.13. Editor Menu

Table 9.14. Default editor Function Bindings

FunctionDefault keyDescription
<bol>^Ajump to the beginning of the line
<backward-char>^Bmove the cursor one character to the left
<backward-word>Esc bmove the cursor to the beginning of the word
<capitalize-word>Esc ccapitalize the word
<downcase-word>Esc lconvert the word to lower case
<upcase-word>Esc uconvert the word to upper case
<delete-char>^Ddelete the char under the cursor
<eol>^Ejump to the end of the line
<forward-char>^Fmove the cursor one character to the right
<forward-word>Esc fmove the cursor to the end of the word
<backspace><Backspace>delete the char in front of the cursor
<kill-eol>^Kdelete chars from cursor to end of line
<kill-eow>Esc ddelete chars from the cursor to the end of the word
<kill-line>^Udelete all chars on the line
<quote-char>^Vquote the next typed key
<kill-word>^Wdelete the word in front of the cursor
<complete><Tab>complete filename or alias
<complete-query>^Tcomplete address with query
<buffy-cycle><Space>cycle among incoming mailboxes
<history-up> scroll up through the history list
<history-down> scroll down through the history list
<transpose-chars> transpose character under cursor with previous

Chapter 10. Miscellany

Table of Contents

1. Acknowledgements
2. About This Document

1. Acknowledgements

+Kari Hurtta +co-developed the original MIME parsing code back in the ELM-ME days.

The following people have been very helpful to the development of Mutt: -

2. About This Document

-This document was written in DocBook, and then rendered -using the Gnome XSLT -toolkit. +

2. About This Document

+This document was written in DocBook, +and then rendered using the Gnome XSLT toolkit.

diff -Nru mutt-1.5.21/doc/manual.txt mutt-1.5.20/doc/manual.txt --- mutt-1.5.21/doc/manual.txt 2010-09-15 17:10:36.000000000 +0000 +++ mutt-1.5.20/doc/manual.txt 2009-06-14 18:54:56.000000000 +0000 @@ -4,7 +4,7 @@ -version 1.5.21 (2010-09-15) +version 1.5.20 (2009-06-14) Abstract @@ -21,7 +21,7 @@ 3. Getting Mutt 4. Mutt Online Resources 5. Contributing to Mutt - 6. Typographical Conventions + 6. Typograhical Conventions 7. Copyright 2. Getting Started @@ -73,9 +73,8 @@ 9. Using Color and Mono Video Attributes 10. Message Header Display - 10.1. Header Display - 10.2. Selecting Headers - 10.3. Ordering Displayed Headers + 10.1. Selecting Headers + 10.2. Ordering Displayed Headers 11. Alternative Addresses 12. Mailing Lists @@ -97,7 +96,6 @@ 26.1. Variable Types 26.2. Commands 26.3. User-Defined Variables - 26.4. Type Conversions 27. Reading Initialization Commands From Another File 28. Removing Hooks @@ -110,46 +108,40 @@ 4. Advanced Usage - 1. Character Set Handling - 2. Regular Expressions - 3. Patterns: Searching, Limiting and Tagging + 1. Regular Expressions + 2. Patterns: Searching, Limiting and Tagging - 3.1. Pattern Modifier - 3.2. Simple Searches - 3.3. Nesting and Boolean Operators - 3.4. Searching by Date - - 4. Using Tags - 5. Using Hooks - - 5.1. Message Matching in Hooks - - 6. External Address Queries - 7. Mailbox Formats - 8. Mailbox Shortcuts - 9. Handling Mailing Lists - 10. New Mail Detection - - 10.1. How New Mail Detection Works - 10.2. Polling For New Mail - - 11. Editing Threads - - 11.1. Linking Threads - 11.2. Breaking Threads - - 12. Delivery Status Notification (DSN) Support - 13. Start a WWW Browser on URLs - 14. Miscellany + 2.1. Pattern Modifier + 2.2. Simple Searches + 2.3. Nesting and Boolean Operators + 2.4. Searching by Date + + 3. Using Tags + 4. Using Hooks + + 4.1. Message Matching in Hooks + + 5. External Address Queries + 6. Mailbox Formats + 7. Mailbox Shortcuts + 8. Handling Mailing Lists + 9. Handling multiple folders + 10. Editing Threads + + 10.1. Linking Threads + 10.2. Breaking Threads + + 11. Delivery Status Notification (DSN) Support + 12. Start a WWW Browser on URLs + 13. Miscellany 5. Mutt's MIME Support 1. Using MIME in Mutt - 1.1. MIME Overview - 1.2. Viewing MIME Messages in the Pager - 1.3. The Attachment Menu - 1.4. The Compose Menu + 1.1. Viewing MIME Messages in the Pager + 1.2. The Attachment Menu + 1.3. The Compose Menu 2. MIME Type Configuration with mime.types 3. MIME Viewer Configuration with Mailcap @@ -184,8 +176,7 @@ 7.1. Header Caching 7.2. Body Caching - 7.3. Cache Directories - 7.4. Maintenance + 7.3. Maintenance 8. Exact Address Generation 9. Sending Anonymous Messages via Mixmaster @@ -331,200 +322,198 @@ 3.116. keep_flagged 3.117. locale 3.118. mail_check - 3.119. mail_check_recent - 3.120. mailcap_path - 3.121. mailcap_sanitize - 3.122. maildir_header_cache_verify - 3.123. maildir_trash - 3.124. mark_old - 3.125. markers - 3.126. mask - 3.127. mbox - 3.128. mbox_type - 3.129. menu_context - 3.130. menu_move_off - 3.131. menu_scroll - 3.132. message_cache_clean - 3.133. message_cachedir - 3.134. message_format - 3.135. meta_key - 3.136. metoo - 3.137. mh_purge - 3.138. mh_seq_flagged - 3.139. mh_seq_replied - 3.140. mh_seq_unseen - 3.141. mime_forward - 3.142. mime_forward_decode - 3.143. mime_forward_rest - 3.144. mix_entry_format - 3.145. mixmaster - 3.146. move - 3.147. narrow_tree - 3.148. net_inc - 3.149. pager - 3.150. pager_context - 3.151. pager_format - 3.152. pager_index_lines - 3.153. pager_stop - 3.154. pgp_auto_decode - 3.155. pgp_autoinline - 3.156. pgp_check_exit - 3.157. pgp_clearsign_command - 3.158. pgp_decode_command - 3.159. pgp_decrypt_command - 3.160. pgp_encrypt_only_command - 3.161. pgp_encrypt_sign_command - 3.162. pgp_entry_format - 3.163. pgp_export_command - 3.164. pgp_getkeys_command - 3.165. pgp_good_sign - 3.166. pgp_ignore_subkeys - 3.167. pgp_import_command - 3.168. pgp_list_pubring_command - 3.169. pgp_list_secring_command - 3.170. pgp_long_ids - 3.171. pgp_mime_auto - 3.172. pgp_replyinline - 3.173. pgp_retainable_sigs - 3.174. pgp_show_unusable - 3.175. pgp_sign_as - 3.176. pgp_sign_command - 3.177. pgp_sort_keys - 3.178. pgp_strict_enc - 3.179. pgp_timeout - 3.180. pgp_use_gpg_agent - 3.181. pgp_verify_command - 3.182. pgp_verify_key_command - 3.183. pipe_decode - 3.184. pipe_sep - 3.185. pipe_split - 3.186. pop_auth_try_all - 3.187. pop_authenticators - 3.188. pop_checkinterval - 3.189. pop_delete - 3.190. pop_host - 3.191. pop_last - 3.192. pop_pass - 3.193. pop_reconnect - 3.194. pop_user - 3.195. post_indent_string - 3.196. postpone - 3.197. postponed - 3.198. preconnect - 3.199. print - 3.200. print_command - 3.201. print_decode - 3.202. print_split - 3.203. prompt_after - 3.204. query_command - 3.205. query_format - 3.206. quit - 3.207. quote_regexp - 3.208. read_inc - 3.209. read_only - 3.210. realname - 3.211. recall - 3.212. record - 3.213. reply_regexp - 3.214. reply_self - 3.215. reply_to - 3.216. resolve - 3.217. reverse_alias - 3.218. reverse_name - 3.219. reverse_realname - 3.220. rfc2047_parameters - 3.221. save_address - 3.222. save_empty - 3.223. save_history - 3.224. save_name - 3.225. score - 3.226. score_threshold_delete - 3.227. score_threshold_flag - 3.228. score_threshold_read - 3.229. search_context - 3.230. send_charset - 3.231. sendmail - 3.232. sendmail_wait - 3.233. shell - 3.234. sig_dashes - 3.235. sig_on_top - 3.236. signature - 3.237. simple_search - 3.238. sleep_time - 3.239. smart_wrap - 3.240. smileys - 3.241. smime_ask_cert_label - 3.242. smime_ca_location - 3.243. smime_certificates - 3.244. smime_decrypt_command - 3.245. smime_decrypt_use_default_key - 3.246. smime_default_key - 3.247. smime_encrypt_command - 3.248. smime_encrypt_with - 3.249. smime_get_cert_command - 3.250. smime_get_cert_email_command - 3.251. smime_get_signer_cert_command - 3.252. smime_import_cert_command - 3.253. smime_is_default - 3.254. smime_keys - 3.255. smime_pk7out_command - 3.256. smime_sign_command - 3.257. smime_sign_opaque_command - 3.258. smime_timeout - 3.259. smime_verify_command - 3.260. smime_verify_opaque_command - 3.261. smtp_authenticators - 3.262. smtp_pass - 3.263. smtp_url - 3.264. sort - 3.265. sort_alias - 3.266. sort_aux - 3.267. sort_browser - 3.268. sort_re - 3.269. spam_separator - 3.270. spoolfile - 3.271. ssl_ca_certificates_file - 3.272. ssl_client_cert - 3.273. ssl_force_tls - 3.274. ssl_min_dh_prime_bits - 3.275. ssl_starttls - 3.276. ssl_use_sslv2 - 3.277. ssl_use_sslv3 - 3.278. ssl_use_tlsv1 - 3.279. ssl_usesystemcerts - 3.280. ssl_verify_dates - 3.281. ssl_verify_host - 3.282. status_chars - 3.283. status_format - 3.284. status_on_top - 3.285. strict_threads - 3.286. suspend - 3.287. text_flowed - 3.288. thorough_search - 3.289. thread_received - 3.290. tilde - 3.291. time_inc - 3.292. timeout - 3.293. tmpdir - 3.294. to_chars - 3.295. tunnel - 3.296. uncollapse_jump - 3.297. use_8bitmime - 3.298. use_domain - 3.299. use_envelope_from - 3.300. use_from - 3.301. use_idn - 3.302. use_ipv6 - 3.303. user_agent - 3.304. visual - 3.305. wait_key - 3.306. weed - 3.307. wrap - 3.308. wrap_headers - 3.309. wrap_search - 3.310. wrapmargin - 3.311. write_bcc - 3.312. write_inc + 3.119. mailcap_path + 3.120. mailcap_sanitize + 3.121. maildir_header_cache_verify + 3.122. maildir_trash + 3.123. mark_old + 3.124. markers + 3.125. mask + 3.126. mbox + 3.127. mbox_type + 3.128. menu_context + 3.129. menu_move_off + 3.130. menu_scroll + 3.131. message_cache_clean + 3.132. message_cachedir + 3.133. message_format + 3.134. meta_key + 3.135. metoo + 3.136. mh_purge + 3.137. mh_seq_flagged + 3.138. mh_seq_replied + 3.139. mh_seq_unseen + 3.140. mime_forward + 3.141. mime_forward_decode + 3.142. mime_forward_rest + 3.143. mix_entry_format + 3.144. mixmaster + 3.145. move + 3.146. narrow_tree + 3.147. net_inc + 3.148. pager + 3.149. pager_context + 3.150. pager_format + 3.151. pager_index_lines + 3.152. pager_stop + 3.153. pgp_auto_decode + 3.154. pgp_autoinline + 3.155. pgp_check_exit + 3.156. pgp_clearsign_command + 3.157. pgp_decode_command + 3.158. pgp_decrypt_command + 3.159. pgp_encrypt_only_command + 3.160. pgp_encrypt_sign_command + 3.161. pgp_entry_format + 3.162. pgp_export_command + 3.163. pgp_getkeys_command + 3.164. pgp_good_sign + 3.165. pgp_ignore_subkeys + 3.166. pgp_import_command + 3.167. pgp_list_pubring_command + 3.168. pgp_list_secring_command + 3.169. pgp_long_ids + 3.170. pgp_mime_auto + 3.171. pgp_replyinline + 3.172. pgp_retainable_sigs + 3.173. pgp_show_unusable + 3.174. pgp_sign_as + 3.175. pgp_sign_command + 3.176. pgp_sort_keys + 3.177. pgp_strict_enc + 3.178. pgp_timeout + 3.179. pgp_use_gpg_agent + 3.180. pgp_verify_command + 3.181. pgp_verify_key_command + 3.182. pipe_decode + 3.183. pipe_sep + 3.184. pipe_split + 3.185. pop_auth_try_all + 3.186. pop_authenticators + 3.187. pop_checkinterval + 3.188. pop_delete + 3.189. pop_host + 3.190. pop_last + 3.191. pop_pass + 3.192. pop_reconnect + 3.193. pop_user + 3.194. post_indent_string + 3.195. postpone + 3.196. postponed + 3.197. preconnect + 3.198. print + 3.199. print_command + 3.200. print_decode + 3.201. print_split + 3.202. prompt_after + 3.203. query_command + 3.204. query_format + 3.205. quit + 3.206. quote_regexp + 3.207. read_inc + 3.208. read_only + 3.209. realname + 3.210. recall + 3.211. record + 3.212. reply_regexp + 3.213. reply_self + 3.214. reply_to + 3.215. resolve + 3.216. reverse_alias + 3.217. reverse_name + 3.218. reverse_realname + 3.219. rfc2047_parameters + 3.220. save_address + 3.221. save_empty + 3.222. save_history + 3.223. save_name + 3.224. score + 3.225. score_threshold_delete + 3.226. score_threshold_flag + 3.227. score_threshold_read + 3.228. search_context + 3.229. send_charset + 3.230. sendmail + 3.231. sendmail_wait + 3.232. shell + 3.233. sig_dashes + 3.234. sig_on_top + 3.235. signature + 3.236. simple_search + 3.237. sleep_time + 3.238. smart_wrap + 3.239. smileys + 3.240. smime_ask_cert_label + 3.241. smime_ca_location + 3.242. smime_certificates + 3.243. smime_decrypt_command + 3.244. smime_decrypt_use_default_key + 3.245. smime_default_key + 3.246. smime_encrypt_command + 3.247. smime_encrypt_with + 3.248. smime_get_cert_command + 3.249. smime_get_cert_email_command + 3.250. smime_get_signer_cert_command + 3.251. smime_import_cert_command + 3.252. smime_is_default + 3.253. smime_keys + 3.254. smime_pk7out_command + 3.255. smime_sign_command + 3.256. smime_sign_opaque_command + 3.257. smime_timeout + 3.258. smime_verify_command + 3.259. smime_verify_opaque_command + 3.260. smtp_authenticators + 3.261. smtp_pass + 3.262. smtp_url + 3.263. sort + 3.264. sort_alias + 3.265. sort_aux + 3.266. sort_browser + 3.267. sort_re + 3.268. spam_separator + 3.269. spoolfile + 3.270. ssl_ca_certificates_file + 3.271. ssl_client_cert + 3.272. ssl_force_tls + 3.273. ssl_min_dh_prime_bits + 3.274. ssl_starttls + 3.275. ssl_use_sslv2 + 3.276. ssl_use_sslv3 + 3.277. ssl_use_tlsv1 + 3.278. ssl_usesystemcerts + 3.279. ssl_verify_dates + 3.280. ssl_verify_host + 3.281. status_chars + 3.282. status_format + 3.283. status_on_top + 3.284. strict_threads + 3.285. suspend + 3.286. text_flowed + 3.287. thorough_search + 3.288. thread_received + 3.289. tilde + 3.290. time_inc + 3.291. timeout + 3.292. tmpdir + 3.293. to_chars + 3.294. tunnel + 3.295. uncollapse_jump + 3.296. use_8bitmime + 3.297. use_domain + 3.298. use_envelope_from + 3.299. use_from + 3.300. use_idn + 3.301. use_ipv6 + 3.302. user_agent + 3.303. visual + 3.304. wait_key + 3.305. weed + 3.306. wrap + 3.307. wrap_search + 3.308. wrapmargin + 3.309. write_bcc + 3.310. write_inc 4. Functions @@ -533,13 +522,13 @@ 4.3. Pager Menu 4.4. Alias Menu 4.5. Query Menu - 4.6. Attachment Menu + 4.6. Attach Menu 4.7. Compose Menu 4.8. Postpone Menu 4.9. Browser Menu 4.10. Pgp Menu 4.11. Smime Menu - 4.12. Mixmaster Menu + 4.12. Mix Menu 4.13. Editor Menu 10. Miscellany @@ -570,28 +559,26 @@ 4.4. Pattern modifiers 4.5. Simple search keywords 4.6. Date units -4.7. Mailbox shortcuts -5.1. Supported MIME types 9.1. Command line options -9.2. Default Generic Menu Bindings -9.3. Default Index Menu Bindings -9.4. Default Pager Menu Bindings -9.5. Default Alias Menu Bindings -9.6. Default Query Menu Bindings -9.7. Default Attachment Menu Bindings -9.8. Default Compose Menu Bindings -9.9. Default Postpone Menu Bindings -9.10. Default Browser Menu Bindings -9.11. Default Pgp Menu Bindings -9.12. Default Smime Menu Bindings -9.13. Default Mixmaster Menu Bindings -9.14. Default Editor Menu Bindings +9.2. Default generic Function Bindings +9.3. Default index Function Bindings +9.4. Default pager Function Bindings +9.5. Default alias Function Bindings +9.6. Default query Function Bindings +9.7. Default attach Function Bindings +9.8. Default compose Function Bindings +9.9. Default postpone Function Bindings +9.10. Default browser Function Bindings +9.11. Default pgp Function Bindings +9.12. Default smime Function Bindings +9.13. Default mix Function Bindings +9.14. Default editor Function Bindings List of Examples 3.1. Multiple configuration commands per line 3.2. Commenting configuration files -3.3. Escaping quotes in configuration files +3.3. Escaping quotes in congfiguration files 3.4. Splitting long configuration commands over several lines 3.5. Using external command's output in configuration files 3.6. Using environment variables in configuration files @@ -606,13 +593,11 @@ 3.15. Using user-defined variables for config file readability 3.16. Using user-defined variables for backing up other config option values 3.17. Deferring user-defined variable expansion to runtime -3.18. Type conversions using variables -3.19. Using external filters in format strings +3.18. Using external filters in format strings 4.1. Matching all addresses in address lists 4.2. Using boolean operators in patterns -4.3. Specifying a ?default? hook -5.1. mime.types -5.2. Attachment counting +4.3. Specifying a default hook +5.1. Attachment counting 6.1. URLs 6.2. Managing multiple accounts @@ -625,7 +610,7 @@ 3. Getting Mutt 4. Mutt Online Resources 5. Contributing to Mutt -6. Typographical Conventions +6. Typograhical Conventions 7. Copyright Mutt is a small but very powerful text-based MIME mail client. Mutt is highly @@ -642,11 +627,13 @@ To subscribe to one of the following mailing lists, send a message with the word subscribe in the body to list-name-request@mutt.org. - * ? low traffic list for announcements + * -- low traffic list for announcements - * ? help, bug reports and feature requests + * -- help, bug reports and feature requests - * ? development mailing list + * -- development mailing list + +Note All messages posted to mutt-announce are automatically forwarded to mutt-users, so you do not need to be subscribed to both lists. @@ -691,7 +678,7 @@ For contributing code patches for new features and bug fixes, please refer to the developer pages at http://dev.mutt.org/ for more details. -6. Typographical Conventions +6. Typograhical Conventions This section lists typographical conventions followed throughout this manual. See table Table 1.1, ?Typographical conventions for special terms? for @@ -828,7 +815,7 @@ Mutt supports a ?hook? concept which allows the user to execute arbitrary configuration commands and functions in certain situations such as entering a folder, starting a new message or replying to an existing one. These hooks can -be used to highly customize Mutt's behavior including managing multiple +be used to highly customize Mutt's behaviour including managing multiple identities, customizing the display for a folder or even implementing auto-archiving based on a per-folder basis and much more. @@ -847,7 +834,7 @@ email, email that has been forwarded or replied to, tagged email, ...), the date when email was sent, its sender, the email size, and the subject. Additionally, the index also shows thread hierarchies: when you reply to an -email, and the other person replies back, you can see the other person's email +email, and the other person replies back, you can see the other's person email in a "sub-tree" below. This is especially useful for personal email between a group of people or when you've subscribed to mailing lists. @@ -950,7 +937,7 @@ |----------------------+---------------+----------------------| |J or | |scroll down one line | |----------------------+---------------+----------------------| -| ||scroll up one line | +| ||sroll up one line | |----------------------+---------------+----------------------| |K, or | |move to the next page | |----------------------+---------------+----------------------| @@ -1172,10 +1159,6 @@ |! |message is flagged | |----+-------------------------------------------------------------| |* |message is tagged | -|----+-------------------------------------------------------------| -|n |thread contains new messages (only if collapsed) | -|----+-------------------------------------------------------------| -|o |thread contains old messages (only if collapsed) | +------------------------------------------------------------------+ @@ -1186,9 +1169,9 @@ |----+-------------------------------------------------| |+ |message is to you and you only | |----+-------------------------------------------------| -|T |message is to you, but also to or CC'ed to others| +|T |message is to you, but also to or cc'ed to others| |----+-------------------------------------------------| -|C |message is CC'ed to you | +|C |message is cc'ed to you | |----+-------------------------------------------------| |F |message is from you | |----+-------------------------------------------------| @@ -1198,8 +1181,8 @@ 5.2. The Pager -By default, Mutt uses its built-in pager to display the contents of messages -(an external pager such as less(1) can be configured, see $pager variable). The +By default, Mutt uses its builtin pager to display the contents of messages (an +external pager such as less(1) can be configured, see $pager variable). The pager is very similar to the Unix program less(1) though not nearly as featureful. @@ -1652,11 +1635,6 @@ for example to create a new message to a mailing list without having to enter the mailing list's address. -If you intend to start a new thread by replying, please make really sure you -remove the In-Reply-To: header in your editor. Otherwise, though you'll produce -a technically valid reply, some netiquette guardians will be annoyed by this -so-called ?thread hijacking?. - 6.3. Sending Cryptographically Signed/Encrypted Messages If you have told Mutt to PGP or S/MIME encrypt a message, it will guide you @@ -1734,7 +1712,7 @@ add the trailing spaces. After editing the initial message text and before entering the compose menu, -Mutt properly space-stuffs the message. Space-stuffing is required by RfC3676 +Mutt properly space-stuffes the message. Space-stuffing is required by RfC3676 defining format=flowed and means to prepend a space to: * all lines starting with a space @@ -1828,9 +1806,8 @@ 9. Using Color and Mono Video Attributes 10. Message Header Display - 10.1. Header Display - 10.2. Selecting Headers - 10.3. Ordering Displayed Headers + 10.1. Selecting Headers + 10.2. Ordering Displayed Headers 11. Alternative Addresses 12. Mailing Lists @@ -1852,7 +1829,6 @@ 26.1. Variable Types 26.2. Commands 26.3. User-Defined Variables - 26.4. Type Conversions 27. Reading Initialization Commands From Another File 28. Removing Hooks @@ -1919,7 +1895,7 @@ example, if want to put quotes ?"? inside of a string, you can use ?\? to force the next character to be a literal instead of interpreted character. -Example 3.3. Escaping quotes in configuration files +Example 3.3. Escaping quotes in congfiguration files set realname="Michael \"MuttDude\" Elkins" @@ -1998,45 +1974,21 @@ group [ -group name ...] { -rx expr ... | -addr expr ... } ungroup [ -group name ...] { * | -rx expr ... | -addr expr ... } -Mutt supports grouping addresses logically into named groups. An address or -address pattern can appear in several groups at the same time. These groups can -be used in patterns (for searching, limiting and tagging) and in hooks by using -group patterns. This can be useful to classify mail and take certain actions -depending on in what groups the message is. For example, the mutt user's -mailing list would fit into the categories ?mailing list? and ?mutt-related?. -Using send-hook, the sender can be set to a dedicated one for writing mailing -list messages, and the signature could be set to a mutt-related one for writing -to a mutt list ? for other lists, the list sender setting still applies but a -different signature can be selected. Or, given a group only containing -recipients known to accept encrypted mail, ?auto-encryption? can be achieved -easily. - -The group command is used to directly add either addresses or regular -expressions to the specified group or groups. The different categories of -arguments to the group command can be in any order. The flags -rx and -addr -specify what the following strings (that cannot begin with a hyphen) should be -interpreted as: either a regular expression or an email address, respectively. +group is used to directly add either addresses or regular expressions to the +specified group or groups. The different categories of arguments to the group +command can be in any order. The flags -rx and -addr specify what the following +strings (that cannot begin with a hyphen) should be interpreted as: either a +regular expression or an email address, respectively. These address groups can also be created implicitly by the alias, lists, -subscribe and alternates commands by specifying the optional -group option. For -example, - -alternates -group me address1 address2 -alternates -group me -group work address3 +subscribe and alternates commands by specifying the optional -group option. -would create a group named ?me? which contains all your addresses and a group -named ?work? which contains only your work address address3. Besides many other -possibilities, this could be used to automatically mark your own messages in a -mailing list folder as read or use a special signature for work-related -messages. +Once defined, these address groups can be used in patterns to search for and +limit the display to messages matching a group. -The ungroup command is used to remove addresses or regular expressions from the -specified group or groups. The syntax is similar to the group command, however -the special character * can be used to empty a group of all of its contents. As -soon as a group gets empty because all addresses and regular expressions have -been removed, it'll internally be removed, too (i.e. there cannot be an empty -group). When removing regular expressions from a group, the pattern must be -specified exactly as given to the group command or -group argument. +ungroup is used to remove addresses or regular expressions from the specified +group or groups. The syntax is similar to the group command, however the +special character * can be used to empty a group of all of its contents. 4. Defining/Using Aliases @@ -2068,7 +2020,7 @@ can have all aliases defined in your .muttrc. On the other hand, the function can use only one file, the one -pointed to by the $alias_file variable (which is ~/.muttrc by default). This +pointed to by the $alias_file variable (which is ?/.muttrc by default). This file is not special either, in the sense that Mutt will happily append aliases to any file, but in order for the new aliases to take effect you need to explicitly source this file too. @@ -2133,8 +2085,7 @@ editor - The editor is used to allow the user to enter a single line of text, such - as the To or Subject prompts in the compose menu. + The editor is the line-based editor the user enters text data. index @@ -2234,14 +2185,12 @@ +---------------------------------+ -key does not need to be enclosed in quotes unless it contains a space (? ?) or +key does not need to be enclosed in quotes unless it contains a space (???) or semi-colon (?;?). function specifies which action to take when key is pressed. For a complete -list of functions, see the reference. Note that the bind expects function to be -specified without angle brackets. - -The special function unbinds the specified key sequence. +list of functions, see the reference. The special function unbinds the +specified key sequence. 6. Defining Aliases for Character Sets @@ -2349,14 +2298,14 @@ only specify one or the other). header and body match regexp in the header/body of a message, index matches -pattern (see Section 3, ?Patterns: Searching, Limiting and Tagging?) in the +pattern (see Section 2, ?Patterns: Searching, Limiting and Tagging?) in the message index. object can be one of: * attachment - * bold (highlighting bold patterns in the body of messages) + * bold (hiliting bold patterns in the body of messages) * error (error messages printed by Mutt) @@ -2374,17 +2323,17 @@ * quoted1, quoted2, ..., quotedN (higher levels of quoting) - * search (highlighting of words in the pager) + * search (hiliting of words in the pager) * signature * status (mode lines used to display info about the mailbox or message) - * tilde (the ?~? used to pad blank lines in the pager) + * tilde (the ??? used to pad blank lines in the pager) * tree (thread tree drawn in the message index and attachment menu) - * underline (highlighting underlined patterns in the body of messages) + * underline (hiliting underlined patterns in the body of messages) foreground and background can be one of the following: @@ -2432,7 +2381,7 @@ in the color command for it to be removed. The pattern ?*? is a special token which means to clear the color list of all entries. -Mutt also recognizes the keywords color0, color1, ..., colorN-1 (N being the +Mutt also recognizes the keywords color0, color1, ?, colorN-1 (N being the number of colors supported by your terminal). This is useful when you remap the colors for your display (for example by changing the color associated with color2 for your xterm), since color names may then lose their normal meaning. @@ -2459,14 +2408,7 @@ 10. Message Header Display -10.1. Header Display - -When displaying a message in the pager, Mutt folds long header lines at $wrap -columns. Though there're precise rules about where to break and how, Mutt -always folds headers using a tab for readability. (Note that the sending side -is not affected by this, Mutt tries to implement standards compliant folding.) - -10.2. Selecting Headers +10.1. Selecting Headers Usage: @@ -2496,7 +2438,7 @@ unignore posted-to: -10.3. Ordering Displayed Headers +10.2. Ordering Displayed Headers Usage: @@ -2564,9 +2506,9 @@ Usage: lists [ -group name ...] regexp [ regexp ...] -unlists { * | regexp ... } +unlists [ -group name ...] { * | regexp ... } subscribe [ -group name ...] regexp [ regexp ...] -unsubscribe { * | regexp ... } +unsubscribe [ -group name ...] { * | regexp ... } Mutt has a few nice features for handling mailing lists. In order to take advantage of them, you must specify which addresses belong to mailing lists, @@ -2585,7 +2527,7 @@ by all mail user agents. Adding it is not bullet-proof against receiving personal CCs of list messages. Also note that the generation of the Mail-Followup-To header is controlled by the $followup_to configuration -variable since it's common practice on some mailing lists to send Cc upon +variable since it's common practice on some mailing lists to send Cc upons replies (which is more a group- than a list-reply). More precisely, Mutt maintains lists of patterns for the addresses of known and @@ -2599,7 +2541,8 @@ subscribe [0-9]*.*@bugs.debian.org -as it's often sufficient to just give a portion of the list's e-mail address. +as it's often, it's sufficient to just give a portion of the list's e-mail +address. Specify as much of the address as you need to to remove ambiguity. For example, if you've subscribed to the Mutt mailing list, you will receive mail addressed @@ -2611,7 +2554,7 @@ subscribe ^mutt-users@mutt\\.org$ to match only mail from the actual list. The -group flag adds all of the subsequent regular expressions to the named -address group in addition to adding to the specified address list. +group. The ?unlists? command is used to remove a token from the list of known and subscribed mailing-lists. Use ?unlists *? to remove all tokens. @@ -2650,8 +2593,8 @@ respectively. Mutt provides a number of advanced features for handling (possibly many) -folders and new mail within them, please refer to Section 10, ?New Mail -Detection? for details (including in what situations and how often Mutt checks +folders and new mail within them, please refer to Section 9, ?Handling multiple +folders? for details (including in what situations and how often Mutt checks for new mail). The ?unmailboxes? command is used to remove a token from the list of folders @@ -2662,10 +2605,23 @@ The folders in the mailboxes command are resolved when the command is executed, so if these names contain shortcut characters (such as ?=? and ?!?), any variable definition that affects these characters (like $folder and $spoolfile) -should be set before the mailboxes command. If none of these shortcuts are -used, a local path should be absolute as otherwise Mutt tries to find it -relative to the directory from where Mutt was started which may not always be -desired. +should be set before the mailboxes command. If none of these shorcuts are used, +a local path should be absolute as otherwise Mutt tries to find it relative to +the directory from where Mutt was started which may not always be desired. + +For Mbox and Mmdf folders, new mail is detected by comparing access and/or +modification times of files: Mutt assumes a folder has new mail if it wasn't +accessed after it was last modified. Utilities like biff or frm or any other +program which accesses the mailbox might cause Mutt to never detect new mail +for that mailbox if they do not properly reset the access time. Other possible +causes of Mutt not detecting new mail in these folders are backup tools +(updating access times) or filesystems mounted without access time update +support. + +In cases where new mail detection for Mbox or Mmdf folders appears to be +unreliable, the $check_mbox_size option can be used to make Mutt track and +consult file sizes for new mail detection instead which won't work for +size-neutral changes. 15. User-Defined Headers @@ -2803,7 +2759,7 @@ send-hook's are only executed once after getting the initial list of recipients. Adding a recipient after replying or editing the message will not -cause any send-hook to be executed, similarly if $autoedit is set (as then the +cause any send-hook to be executed, similarily if $autoedit is set (as then the initial list of recipients is empty). Also note that my_hdr commands which modify recipient headers, or the message's subject, don't have any effect on the current message when executed from a send-hook. @@ -2861,21 +2817,6 @@ folder-hook . 'push ' -For using functions like shown in the example, it's important to use angle -brackets (??) to make Mutt recognize the input as a function name. -Otherwise it will simulate individual just keystrokes, i.e. ?push collapse-all? -would be interpreted as if you had typed ?c?, followed by ?o?, followed by ?l?, -..., which is not desired and may lead to very unexpected behavior. - -Keystrokes can be used, too, but are less portable because of potentially -changed key bindings. With default bindings, this is equivalent to the above -example: - -folder-hook . 'push \eV' - -because it simulates that Esc+V was pressed (which is the default binding of -). - 23. Executing Functions Usage: @@ -2883,7 +2824,7 @@ exec function [ function ...] This command can be used to execute any function. Functions are listed in the -function reference. ?exec function? is equivalent to ?push ?. +function reference. ?execfunction? is equivalent to ?push ?. 24. Message Scoring @@ -2895,7 +2836,7 @@ The score commands adds value to a message's score if pattern matches it. pattern is a string in the format described in the patterns section (note: For efficiency reasons, patterns which scan information not available in the index, -such as ~b, ~B or ~h, may not be used). value is a positive or negative +such as ?b, ?B or ?h, may not be used). value is a positive or negative integer. A message's final score is the sum total of all matching score entries. However, you may optionally prefix value with an equal sign (?=?) to cause evaluation to stop at a particular entry if there is a match. Negative @@ -2963,7 +2904,7 @@ get only the last one to match. The spam tag is what will be displayed in the index when you use %H in the -$index_format variable. It's also the string that the ~H pattern-matching +$index_format variable. It's also the string that the ?H pattern-matching expression matches against for and functions. And it's what sorting by spam attribute will use as a sort key. @@ -3022,7 +2963,7 @@ path A specialized string for representing paths including support for mailbox - shortcuts (see Section 8, ?Mailbox Shortcuts?) as well as tilde (?~?) for a + shortcuts (see Section 7, ?Mailbox Shortcuts?) as well as tilde (???) for a user's home directory and more. quadoption @@ -3037,7 +2978,7 @@ regular expression - A regular expression, see Section 2, ?Regular Expressions? for an + A regular expression, see Section 1, ?Regular Expressions? for an introduction. folder magic @@ -3170,51 +3111,6 @@ Note that there is a space between and the set configuration command, preventing Mutt from recording the macro's commands into its history. -26.4. Type Conversions - -Variables are always assigned string values which Mutt parses into its internal -representation according to the type of the variable, for example an integer -number for numeric types. For all queries (including $-expansion) the value is -converted from its internal type back into string. As a result, any variable -can be assigned any value given that its content is valid for the target. This -also counts for custom variables which are of type string. In case of parsing -errors, Mutt will print error messages. Example 3.18, ?Type conversions using -variables? demonstrates type conversions. - -Example 3.18. Type conversions using variables - -set my_lines = "5" # value is string "5" -set pager_index_lines = $my_lines # value is integer 5 - -set my_sort = "date-received" # value is string "date-received" -set sort = "last-$my_sort" # value is sort last-date-received - -set my_inc = $read_inc # value is string "10" (default of $read_inc) -set my_foo = $my_inc # value is string "10" - - -These assignments are all valid. If, however, the value of $my_lines would have -been ?five? (or something else that cannot be parsed into a number), the -assignment to $pager_index_lines would have produced an error message. - -Type conversion applies to all configuration commands which take arguments. But -please note that every expanded value of a variable is considered just a single -token. A working example is: - -set my_pattern = "~A" -set my_number = "10" - -# same as: score ~A +10 -score $my_pattern +$my_number - -What does not work is: - -set my_mx = "+mailbox1 +mailbox2" -mailboxes $my_mx +mailbox3 - -because the value of $my_mx is interpreted as a single mailbox named ?+mailbox1 -+mailbox2? and not two distinct mailboxes. - 27. Reading Initialization Commands From Another File Usage: @@ -3222,15 +3118,14 @@ source filename This command allows the inclusion of initialization commands from other files. -For example, I place all of my aliases in ~/.mail_aliases so that I can make my -~/.muttrc readable and keep my aliases private. +For example, I place all of my aliases in ?/.mail_aliases so that I can make my +?/.muttrc readable and keep my aliases private. -If the filename begins with a tilde (?~?), it will be expanded to the path of +If the filename begins with a tilde (???), it will be expanded to the path of your home directory. If the filename ends with a vertical bar (?|?), then filename is considered to -be an executable program from which to read input (e.g. source ~/bin/myscript -|). +be an executable program from which to read input (eg. source ?/bin/myscript|). 28. Removing Hooks @@ -3321,7 +3216,7 @@ All % expandos in a format string are expanded before the script is called so that: -Example 3.19. Using external filters in format strings +Example 3.18. Using external filters in format strings set status_format="script.sh '%r %f (%L)'|" @@ -3375,95 +3270,34 @@ Table of Contents -1. Character Set Handling -2. Regular Expressions -3. Patterns: Searching, Limiting and Tagging - - 3.1. Pattern Modifier - 3.2. Simple Searches - 3.3. Nesting and Boolean Operators - 3.4. Searching by Date - -4. Using Tags -5. Using Hooks - - 5.1. Message Matching in Hooks - -6. External Address Queries -7. Mailbox Formats -8. Mailbox Shortcuts -9. Handling Mailing Lists -10. New Mail Detection - - 10.1. How New Mail Detection Works - 10.2. Polling For New Mail - -11. Editing Threads - - 11.1. Linking Threads - 11.2. Breaking Threads - -12. Delivery Status Notification (DSN) Support -13. Start a WWW Browser on URLs -14. Miscellany - -1. Character Set Handling - -A ?character set? is basically a mapping between bytes and glyphs and implies a -certain character encoding scheme. For example, for the ISO 8859 family of -character sets, an encoding of 8bit per character is used. For the Unicode -character set, different character encodings may be used, UTF-8 being the most -popular. In UTF-8, a character is represented using a variable number of bytes -ranging from 1 to 4. - -Since Mutt is a command-line tool run from a shell, and delegates certain tasks -to external tools (such as an editor for composing/editing messages), all of -these tools need to agree on a character set and encoding. There exists no way -to reliably deduce the character set a plain text file has. Interoperability is -gained by the use of well-defined environment variables. The full set can be -printed by issuing locale on the command line. - -Upon startup, Mutt determines the character set on its own using routines that -inspect locale-specific environment variables. Therefore, it is generally not -necessary to set the $charset variable in Mutt. It may even be -counter-productive as Mutt uses system and library functions that derive the -character set themselves and on which Mutt has no influence. It's safest to let -Mutt work out the locale setup itself. - -If you happen to work with several character sets on a regular basis, it's -highly advisable to use Unicode and an UTF-8 locale. Unicode can represent -nearly all characters in a message at the same time. When not using a Unicode -locale, it may happen that you receive messages with characters not -representable in your locale. When displaying such a message, or replying to or -forwarding it, information may get lost possibly rendering the message unusable -(not only for you but also for the recipient, this breakage is not reversible -as lost information cannot be guessed). - -A Unicode locale makes all conversions superfluous which eliminates the risk of -conversion errors. It also eliminates potentially wrong expectations about the -character set between Mutt and external programs. - -The terminal emulator used also must be properly configured for the current -locale. Terminal emulators usually do not derive the locale from environment -variables, they need to be configured separately. If the terminal is -incorrectly configured, Mutt may display random and unexpected characters -(question marks, octal codes, or just random glyphs), format strings may not -work as expected, you may not be abled to enter non-ascii characters, and -possible more. Data is always represented using bytes and so a correct setup is -very important as to the machine, all character sets ?look? the same. - -Warning: A mismatch between what system and library functions think the locale -is and what Mutt was told what the locale is may make it behave badly with -non-ascii input: it will fail at seemingly random places. This warning is to be -taken seriously since not only local mail handling may suffer: sent messages -may carry wrong character set information the receiver has too deal with. The -need to set $charset directly in most cases points at terminal and environment -variable setup problems, not Mutt problems. +1. Regular Expressions +2. Patterns: Searching, Limiting and Tagging -A list of officially assigned and known character sets can be found at IANA, a -list of locally supported locales can be obtained by running locale -a. + 2.1. Pattern Modifier + 2.2. Simple Searches + 2.3. Nesting and Boolean Operators + 2.4. Searching by Date + +3. Using Tags +4. Using Hooks + + 4.1. Message Matching in Hooks + +5. External Address Queries +6. Mailbox Formats +7. Mailbox Shortcuts +8. Handling Mailing Lists +9. Handling multiple folders +10. Editing Threads + + 10.1. Linking Threads + 10.2. Breaking Threads + +11. Delivery Status Notification (DSN) Support +12. Start a WWW Browser on URLs +13. Miscellany -2. Regular Expressions +1. Regular Expressions All string patterns in Mutt including those in more complex patterns must be specified using regular expressions (regexp) in the ?POSIX extended? syntax @@ -3571,9 +3405,8 @@ An equivalence class is a locale-specific name for a list of characters that are equivalent. The name is enclosed in ?[=? and ?=]?. For example, - the name ?e? might be used to represent all of ?e? with grave (???), ?e? - with acute (???) and ?e?. In this case, [[=e=]] is a regexp that matches - any of: ?e? with grave (???), ?e? with acute (???) and ?e?. + the name ?e? might be used to represent all of ??? ??? and ?e?. In this + case, [[=e=]] is a regexp that matches any of ???, ??? and ?e?. A regular expression matching a single character may be followed by one of several repetition operators described in Table 4.2, ?Regular expression @@ -3646,9 +3479,9 @@ Please note however that these operators are not defined by POSIX, so they may or may not be available in stock libraries on various systems. -3. Patterns: Searching, Limiting and Tagging +2. Patterns: Searching, Limiting and Tagging -3.1. Pattern Modifier +2.1. Pattern Modifier Many of Mutt's commands allow you to specify a pattern to match (limit, tag-pattern, delete-pattern, etc.). Table 4.4, ?Pattern modifiers? shows @@ -3770,7 +3603,7 @@ +-----------------------------------------------------------------------------+ -Where EXPR is a regular expression, and GROUP is an address group. +Where EXPR is a regular expression. *) The forms ?<[MAX]?, ?>[MIN]?, ?[MIN]-? and ?-[MAX]? are allowed, too. @@ -3782,7 +3615,7 @@ of backslash (?\?), which is normally used for quoting. If it is your intention to use a backslash in the regular expression, you will need to use two backslashes instead (?\\?). You can force Mutt to treat EXPR as a simple string -instead of a regular expression by using = instead of ~ in the pattern name. +instead of a regular expression by using = instead of ? in the pattern name. For example, =b *.* will find all messages that contain the literal string ?*.*?. Simple string matches are less powerful than regular expressions but can be considerably faster. This is especially true for IMAP folders, because @@ -3802,12 +3635,12 @@ ^~C \.de$ -3.2. Simple Searches +2.2. Simple Searches Mutt supports two versions of so called ?simple searches?. These are issued if the query entered for searching, limiting and similar operations does not seem to contain a valid pattern modifier (i.e. it does not contain one of these -characters: ?~?, ?=? or ?%?). If the query is supposed to contain one of these +characters: ???, ?=? or ?%?). If the query is supposed to contain one of these special characters, they must be escaped by prepending a backslash (?\?). The first type is by checking whether the query string equals a keyword @@ -3851,7 +3684,7 @@ $simple_search as a template. Mutt will insert your query properly quoted and search for the composed complex query. -3.3. Nesting and Boolean Operators +2.3. Nesting and Boolean Operators Logical AND is performed by specifying more than one criterion. For example: @@ -3878,12 +3711,11 @@ !(~t mutt|~c mutt) ~f elkins -Here is an example using white space in the regular expression (note the ?'? -and ?"? delimiters). For this to match, the mail's subject must match the ?^ -Junk +From +Me$? and it must be from either ?Jim +Somebody? or ?Ed -+SomeoneElse?: +Here is an example using white space in the regular expression (note the ' and +" delimiters). For this to match, the mail's subject must match the ?^Junk ++From +Me$? and it must be from either ?Jim +Somebody? or ?Ed +SomeoneElse?: -'~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")' + '~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")' Note @@ -3891,14 +3723,14 @@ enclose the expression in double or single quotes since those characters are also used to separate different parts of Mutt's pattern language. For example: ~f "me@(mutt\.org|cs\.hmc\.edu)" Without the quotes, the parenthesis wouldn't -end. This would be separated to two OR'd patterns: ~f me@(mutt\.org and cs\.hmc +end. This would be separated to two OR'd patterns: ?f me@(mutt\.org and cs\.hmc \.edu). They are never what you want. -3.4. Searching by Date +2.4. Searching by Date Mutt supports two types of dates, absolute and relative. -3.4.1. Absolute Dates +2.4.1. Absolute Dates Dates must be in DD/MM/YY format (month and year are optional, defaulting to the current month and year). An example of a valid range of dates is: @@ -3936,7 +3768,7 @@ Limit to messages matching: ~d 15/1/2001*2w -3.4.2. Relative Dates +2.4.2. Relative Dates This type of date is relative to the current date, and may be specified as: @@ -3959,7 +3791,7 @@ you change the setting of your $index_format to include a %[...] format, these are not the dates shown in the main index. -4. Using Tags +3. Using Tags Sometimes it is desirable to perform an operation on a group of messages all at once rather than one at a time. An example might be to save messages to a @@ -3982,7 +3814,7 @@ operator; after this operator the rest of the macro will be executed as normal. -5. Using Hooks +4. Using Hooks A hook is a concept found in many other programs which allows you to execute arbitrary commands before performing some operation. For example, you may wish @@ -4031,11 +3863,11 @@ send-hook ~C'^b@b\.b$' my_hdr from: c@c.c -In Example 4.3, ?Specifying a ?default? hook?, by default the value of $from -and $realname is not overridden. When sending messages either To: or Cc: to +In Example 4.3, ?Specifying a default hook?, by default the value of $from and +$realname is not overridden. When sending messages either To: or Cc: to , the From: header is changed to . -5.1. Message Matching in Hooks +4.1. Message Matching in Hooks Hooks that act upon messages (message-hook, reply-hook, send-hook, send2-hook, save-hook, fcc-hook) are evaluated in a slightly different manner. For the @@ -4063,14 +3895,14 @@ pattern is translated at the time the hook is declared, so the value of $default_hook that is in effect at that time will be used. -6. External Address Queries +5. External Address Queries Mutt supports connecting to external directory databases such as LDAP, ph/qi, bbdb, or NIS through a wrapper script which connects to Mutt using a simple interface. Using the $query_command variable, you specify the wrapper command to use. For example: -set query_command = "mutt_ldap_query.pl %s" +set query_command = "mutt_ldap_query.pl '%s'" The wrapper script should accept the query on the command-line. It should return a one line message, then each matching response on a single line, each @@ -4101,10 +3933,10 @@ will activate the query menu. At the query menu, you can select one or more addresses to be added to the prompt. -7. Mailbox Formats +6. Mailbox Formats Mutt supports reading and writing of four different local mailbox formats: -mbox, MMDF, MH and Maildir. The mailbox type is auto detected, so there is no +mbox, MMDF, MH and Maildir. The mailbox type is autodetected, so there is no need to use a flag for different mailbox types. When creating new mailboxes, Mutt uses the default specified with the $mbox_type variable. A short description of the formats follows. @@ -4121,9 +3953,9 @@ open and easy to archive. MMDF. This is a variant of the mbox format. Each message is surrounded by lines -containing ?^A^A^A^A? (four times control-A's). The same problems as for mbox -apply (also with finding the right message separator as four control-A's may -appear in message bodies). +containing ?^A^A^A^A? (four control-A's). The same problems as for mbox apply +(also with finding the right message separator as four control-A's may appear +in message bodies). MH. A radical departure from mbox and MMDF, a mailbox consists of a directory and each message is stored in a separate file. The filename indicates the @@ -4149,42 +3981,36 @@ Maildir is locking-free, it's easy to sync across different machines using file-level synchronization tools. -8. Mailbox Shortcuts +7. Mailbox Shortcuts There are a number of built in shortcuts which refer to specific mailboxes. These shortcuts can be used anywhere you are prompted for a file or mailbox path or in path-related configuration variables. Note that these only work at the beginning of a string. -Table 4.7. Mailbox shortcuts + * ! ? refers to your $spoolfile (incoming) mailbox -+-----------------------------------------------------------------------------+ -|Shortcut| Refers to... | -|--------+--------------------------------------------------------------------| -|! |your $spoolfile (incoming) mailbox | -|--------+--------------------------------------------------------------------| -|> |your $mbox file | -|--------+--------------------------------------------------------------------| -|< |your $record file | -|--------+--------------------------------------------------------------------| -|^ |the current mailbox | -|--------+--------------------------------------------------------------------| -|- or !! |the file you've last visited | -|--------+--------------------------------------------------------------------| -|~ |your home directory | -|--------+--------------------------------------------------------------------| -|= or + |your $folder directory | -|--------+--------------------------------------------------------------------| -|@alias |to the default save folder as determined by the address of the alias| -+-----------------------------------------------------------------------------+ + * > ? refers to your $mbox file + + * < ? refers to your $record file + + * ^ ? refers to the current mailbox + * - or !! ? refers to the file you've last visited + + * ? ? refers to your home directory + + * = or + ? refers to your $folder directory + + * @alias ? refers to the default save folder as determined by the address of + the alias For example, to store a copy of outgoing messages in the folder they were composed in, a folder-hook can be used to set $record: folder-hook . 'set record=^' -9. Handling Mailing Lists +8. Handling Mailing Lists Mutt has a few configuration options that make dealing with large amounts of mail easier. The first thing you must do is to let Mutt know what addresses you @@ -4244,7 +4070,7 @@ list subject matter (or just to annotate messages individually). The $index_format variable's ?%y? and ?%Y? expandos can be used to expand ?X-Label:? fields in the index, and Mutt's pattern-matcher can match regular -expressions to ?X-Label:? fields with the ?~y? selector. ?X-Label:? is not a +expressions to ?X-Label:? fields with the ??y? selector. ?X-Label:? is not a standard message header field, but it can easily be inserted by procmail and other mail filtering agents. @@ -4256,48 +4082,12 @@ because you can easily delete uninteresting threads and quickly find topics of value. -10. New Mail Detection +9. Handling multiple folders Mutt supports setups with multiple folders, allowing all of them to be monitored for new mail (see Section 14, ?Monitoring Incoming Mail? for details). -10.1. How New Mail Detection Works - -For Mbox and Mmdf folders, new mail is detected by comparing access and/or -modification times of files: Mutt assumes a folder has new mail if it wasn't -accessed after it was last modified. Utilities like biff or frm or any other -program which accesses the mailbox might cause Mutt to never detect new mail -for that mailbox if they do not properly reset the access time. Other possible -causes of Mutt not detecting new mail in these folders are backup tools -(updating access times) or filesystems mounted without access time update -support (for Linux systems, see the relatime option). - -Note - -Contrary to older Mutt releases, it now maintains the new mail status of a -folder by properly resetting the access time if the folder contains at least -one message which is neither read, nor deleted, nor marked as old. - -In cases where new mail detection for Mbox or Mmdf folders appears to be -unreliable, the $check_mbox_size option can be used to make Mutt track and -consult file sizes for new mail detection instead which won't work for -size-neutral changes. - -New mail for Maildir is assumed if there is one message in the new/ -subdirectory which is not marked deleted (see $maildir_trash). For MH folders, -a mailbox is considered having new mail if there's at least one message in the -?unseen? sequence as specified by $mh_seq_unseen. - -Mutt does not poll POP3 folders for new mail, it only periodically checks the -currently opened folder (if it's a POP3 folder). - -For IMAP, by default Mutt uses recent message counts provided by the server to -detect new mail. If the $imap_idle option is set, it'll use the IMAP IDLE -extension if advertised by the server. - -10.2. Polling For New Mail - When in the index menu and being idle (also see $timeout), Mutt periodically checks for new mail in all folders which have been configured via the mailboxes command. The interval depends on the folder type: for local/IMAP folders it @@ -4317,19 +4107,17 @@ in the status bar, please refer to the $status_format variable for details. When changing folders, Mutt fills the prompt with the first folder from the -mailboxes list containing new mail (if any), pressing will cycle -through folders with new mail. The (by default unbound) function - in the index can be used to immediately open the next -folder with unread mail (if any). +mailboxes list containing new mail (if any), pressing space will cycle through +folders with new mail. -11. Editing Threads +10. Editing Threads Mutt has the ability to dynamically restructure threads that are broken either by misconfigured software or bad behavior from some correspondents. This allows to clean your mailboxes from these annoyances which make it hard to follow a discussion. -11.1. Linking Threads +10.1. Linking Threads Some mailers tend to ?forget? to correctly set the ?In-Reply-To:? and ?References:? headers when replying to a message. This results in broken @@ -4339,9 +4127,9 @@ reply will then be connected to this parent message. You can also connect multiple children at once, tagging them and using the - command (?;?) or the $auto_tag option. + command (';') or the $auto_tag option. -11.2. Breaking Threads +10.2. Breaking Threads On mailing lists, some people are in the bad habit of starting a new discussion by hitting ?reply? to any message from the list and changing the subject to a @@ -4349,7 +4137,7 @@ function (bound by default to #), which will turn the subthread starting from the current message into a whole different thread. -12. Delivery Status Notification (DSN) Support +11. Delivery Status Notification (DSN) Support RFC1894 defines a set of MIME content types for relaying information about the status of electronic mail messages. These can be thought of as ?return @@ -4369,7 +4157,7 @@ For SMTP delivery using $smtp_url, it depends on the capabilities announced by the server whether Mutt will attempt to request DSN or not. -13. Start a WWW Browser on URLs +12. Start a WWW Browser on URLs If a message contains URLs, it is efficient to get a menu with all the URLs and start a WWW browser on one of them. This functionality is provided by the @@ -4379,7 +4167,7 @@ macro index \cb |urlview\n macro pager \cb |urlview\n -14. Miscellany +13. Miscellany This section documents various features that fit nowhere else. @@ -4408,10 +4196,9 @@ 1. Using MIME in Mutt - 1.1. MIME Overview - 1.2. Viewing MIME Messages in the Pager - 1.3. The Attachment Menu - 1.4. The Compose Menu + 1.1. Viewing MIME Messages in the Pager + 1.2. The Attachment Menu + 1.3. The Compose Menu 2. MIME Type Configuration with mime.types 3. MIME Viewer Configuration with Mailcap @@ -4437,48 +4224,16 @@ 1. Using MIME in Mutt -1.1. MIME Overview - -MIME is short for ?Multipurpose Internet Mail Extension? and describes -mechanisms to internationalize and structure mail messages. Before the -introduction of MIME, messages had a single text part and were limited to -us-ascii header and content. With MIME, messages can have attachments (and even -attachments which itself have attachments and thus form a tree structure), -nearly arbitrary characters can be used for sender names, recipients and -subjects. - -Besides the handling of non-ascii characters in message headers, to Mutt the -most important aspect of MIME are so-called MIME types. These are constructed -using a major and minor type separated by a forward slash. These specify -details about the content that follows. Based upon these, Mutt decides how to -handle this part. The most popular major type is ?text? with minor types for -plain text, HTML and various other formats. Major types also exist for images, -audio, video and of course general application data (e.g. to separate -cryptographically signed data with a signature, send office documents, and in -general arbitrary binary data). There's also the multipart major type which -represents the root of a subtree of MIME parts. A list of supported MIME types -can be found in Table 5.1, ?Supported MIME types?. - -MIME also defines a set of encoding schemes for transporting MIME content over -the network: 7bit, 8bit, quoted-printable, base64 and binary. There're some -rules when to choose what for encoding headers and/or body (if needed), and -Mutt will in general make a good choice. - -Mutt does most of MIME encoding/decoding behind the scenes to form messages -conforming to MIME on the sending side. On reception, it can be flexibly -configured as to how what MIME structure is displayed (and if it's displayed): -these decisions are based on the content's MIME type. There are three areas/ -menus in dealing with MIME: the pager (while viewing a message), the attachment -menu and the compose menu. +There are three areas/menus in Mutt which deal with MIME, they are the pager +(while viewing a message), the attachment menu and the compose menu. -1.2. Viewing MIME Messages in the Pager +1.1. Viewing MIME Messages in the Pager When you select a message from the index and view it in the pager, Mutt decodes -as much of a message as possible to a text representation. Mutt internally -supports a number of MIME types, including the text major type (with all minor -types), the message/rfc822 (mail messages) type and some multipart types. In -addition, it recognizes a variety of PGP MIME types, including PGP/MIME and -application/pgp. +the message to a text representation. Mutt internally supports a number of MIME +types, including text/plain, text/enriched, message/rfc822, and message/news. +In addition, the export controlled version of Mutt recognizes a variety of PGP +MIME types, including PGP/MIME and application/pgp. Mutt will denote attachments with a couple lines describing them. These lines are of the form: @@ -4487,13 +4242,13 @@ [-- Type: text/plain, Encoding: 7bit, Size: 10000 --] Where the Description is the description or filename given for the attachment, -and the Encoding is one of the already mentioned content encodings. +and the Encoding is one of 7bit/8bit/quoted-printable/base64/binary. If Mutt cannot deal with a MIME type, it will display a message like: [-- image/gif is unsupported (use 'v' to view this part) --] -1.3. The Attachment Menu +1.2. The Attachment Menu The default binding for is ?v?, which displays the attachment menu for a message. The attachment menu displays a list of the @@ -4503,16 +4258,15 @@ operator. You can also reply to the current message from this menu, and only the current attachment (or the attachments tagged) will be quoted in your reply. You can view attachments as text, or view them using the mailcap viewer -definition (the mailcap mechanism is explained later in detail). +definition. Finally, you can apply the usual message-related functions (like , and the and functions) to attachments of type message/rfc822. -See table Table 9.7, ?Default Attachment Menu Bindings? for all available -functions. +See the help on the attachment menu for more information. -1.4. The Compose Menu +1.3. The Compose Menu The compose menu is the menu you see before you send a message. It allows you to edit the recipient list, the subject, and other aspects of your message. It @@ -4522,12 +4276,12 @@ modifying the attachment information, notably the type, encoding and description. -Attachments appear as follows by default: +Attachments appear as follows: - 1 [text/plain, 7bit, 1K] /tmp/mutt-euler-8082-0 2 [applica/x-gunzip, base64, 422K] ~/src/mutt-0.85.tar.gz -The ?-? denotes that Mutt will delete the file after sending (or postponing, or +The '-' denotes that Mutt will delete the file after sending (or postponing, or canceling) the message. It can be toggled with the command (default: u). The next field is the MIME content-type, and can be changed with the command (default: ^T). The next field is the encoding for the @@ -4537,86 +4291,52 @@ megabytes. The next field is the filename, which can be changed with the command (default: R). The final field is the description of the attachment, and can be changed with the command (default: -d). See $attach_format for a full list of available expandos to format this -display to your needs. +d). 2. MIME Type Configuration with mime.types -To get most out of MIME, it's important that a MIME part's content type matches -the content as closely as possible so that the recipient's client can -automatically select the right viewer for the content. However, there's no -reliable for Mutt to know how to detect every possible file type. Instead, it -uses a simple plain text mapping file that specifies what file extension -corresponds to what MIME type. This file is called mime.types. - When you add an attachment to your mail message, Mutt searches your personal -mime.types file at $HOME/.mime.types, and then the system mime.types file at / -usr/local/share/mutt/mime.types or /etc/mime.types +mime.types file at ${HOME}/.mime.types, and then the system mime.types file at +/usr/local/share/mutt/mime.types or /etc/mime.types -Each line starts with the full MIME type, followed by a space and -space-separated list of file extensions. For example you could use: - -Example 5.1. mime.types +The mime.types file consist of lines containing a MIME type and a space +separated list of extensions. For example: application/postscript ps eps application/pgp pgp audio/x-aiff aif aifc aiff - A sample mime.types file comes with the Mutt distribution, and should contain most of the MIME types you are likely to use. -If Mutt can not determine the MIME type by the extension of the file you +If Mutt can not determine the mime type by the extension of the file you attach, it will look at the file. If the file is free of binary information, Mutt will assume that the file is plain text, and mark it as text/plain. If the file contains binary information, then Mutt will mark it as application/ octet-stream. You can change the MIME type that Mutt assigns to an attachment -by using the command from the compose menu (default: ^T), see -Table 5.1, ?Supported MIME types? for supported major types. Mutt recognizes -all of these if the appropriate entry is found in the mime.types file. -Non-recognized mime types should only be used if the recipient of the message -is likely to be expecting such attachments. - -Table 5.1. Supported MIME types - -+------------------------------------------------------------------+ -|MIME major type|Standard| Description | -|---------------+--------+-----------------------------------------| -|application |yes |General application data | -|---------------+--------+-----------------------------------------| -|audio |yes |Audio data | -|---------------+--------+-----------------------------------------| -|image |yes |Image data | -|---------------+--------+-----------------------------------------| -|message |yes |Mail messages, message status information| -|---------------+--------+-----------------------------------------| -|model |yes |VRML and other modeling data | -|---------------+--------+-----------------------------------------| -|multipart |yes |Container for other MIME parts | -|---------------+--------+-----------------------------------------| -|text |yes |Text data | -|---------------+--------+-----------------------------------------| -|video |yes |Video data | -|---------------+--------+-----------------------------------------| -|chemical |no |Mostly molecular data | -+------------------------------------------------------------------+ - - -MIME types are not arbitrary, they need to be assigned by IANA. +by using the command from the compose menu (default: ^T). The MIME +type is actually a major mime type followed by the sub-type, separated by a '/ +'. 6 major types: application, text, image, video, audio, and model have been +approved after various internet discussions. Mutt recognizes all of these if +the appropriate entry is found in the mime.types file. It also recognizes other +major mime types, such as the chemical type that is widely used in the +molecular modeling community to pass molecular data in various forms to various +molecular viewers. Non-recognized mime types should only be used if the +recipient of the message is likely to be expecting such attachments. 3. MIME Viewer Configuration with Mailcap Mutt supports RFC 1524 MIME Configuration, in particular the Unix specific format specified in Appendix A of RFC 1524. This file format is commonly -referred to as the ?mailcap? format. Many MIME compliant programs utilize the +referred to as the mailcap format. Many MIME compliant programs utilize the mailcap format, allowing you to specify handling for all MIME types in one place for all programs. Programs known to use this format include Firefox, lynx and metamail. -In order to handle various MIME types that Mutt doesn't have built-in support -for, it parses a series of external configuration files to find an external -handler. The default search string for these files is a colon delimited list -containing the following files: +In order to handle various MIME types that Mutt can not handle internally, Mutt +parses a series of external configuration files to find an external handler. +The default search string for these files is a colon delimited list containing +the following files: 1. $HOME/.mailcap @@ -4651,14 +4371,14 @@ A blank line is blank. A definition line consists of a content type, a view command, and any number of -optional fields. Each field of a definition line is divided by a semicolon ?;? +optional fields. Each field of a definition line is divided by a semicolon ';' character. -The content type is specified in the MIME standard ?type/subtype? notation. For +The content type is specified in the MIME standard type/subtype method. For example, text/plain, text/html, image/gif, etc. In addition, the mailcap format -includes two formats for wildcards, one using the special ?*? subtype, the +includes two formats for wildcards, one using the special '*' subtype, the other is the implicit wild, where you only include the major type. For example, -image/*, or video will match all image types and video types, respectively. +image/*, or video, will match all image types and video types, respectively. The view command is a Unix command for viewing the type specified. There are two different types of commands supported. The default is to send the body of @@ -4667,13 +4387,10 @@ of the MIME message to a temporary file, and then call the view command with the %s replaced by the name of the temporary file. In both cases, Mutt will turn over the terminal to the view program until the program quits, at which -time Mutt will remove the temporary file if it exists. This means that mailcap -does not work out of the box with programs which detach themselves from the -terminal right after starting, like open on Mac OS X. In order to nevertheless -use these programs with mailcap, you probably need custom shell scripts. +time Mutt will remove the temporary file if it exists. So, in the simplest form, you can send a text/plain message to the external -pager more on standard input: +pager more on stdin: text/plain; more @@ -4685,8 +4402,8 @@ text/html; lynx %s -In this case, lynx does not support viewing a file from standard input, so you -must use the %s syntax. +In this case, lynx does not support viewing a file from stdin, so you must use +the %s syntax. Note @@ -4705,6 +4422,8 @@ text/html; lynx %s text/*; more +This is the simplest form of a mailcap file. + 3.2. Secure Use of Mailcap The interpretation of shell meta-characters embedded in MIME parameters can @@ -4719,8 +4438,8 @@ Keep the %-expandos away from shell quoting. Don't quote them with single or double quotes. Mutt does this for you, the right way, as should any other program which interprets mailcap. Don't put them into backtick expansions. Be -highly careful with evil statements, and avoid them if possible at all. Trying -to fix broken behavior with quotes introduces new leaks ? there is no +highly careful with eval statements, and avoid them if possible at all. Trying +to fix broken behavior with quotes introduces new leaks - there is no alternative to correct quoting in the first place. If you have to use the %-expandos' values in context where you need quoting or @@ -4737,27 +4456,23 @@ 3.3.1. Optional Fields In addition to the required content-type and view command fields, you can add -semi-colon ?;? separated fields to set flags and other options. Mutt recognizes +semi-colon ';' separated fields to set flags and other options. Mutt recognizes the following optional fields: copiousoutput This flag tells Mutt that the command passes possibly large amounts of text - on standard output. This causes Mutt to invoke a pager (either the internal - pager or the external pager defined by the pager variable) on the output of - the view command. Without this flag, Mutt assumes that the command is - interactive. One could use this to replace the pipe to more in the lynx - -dump example in the Basic section: + on stdout. This causes Mutt to invoke a pager (either the internal pager or + the external pager defined by the pager variable) on the output of the view + command. Without this flag, Mutt assumes that the command is interactive. + One could use this to replace the pipe to more in the lynx -dump example in + the Basic section: text/html; lynx -dump %s ; copiousoutput This will cause lynx to format the text/html output as text/plain and Mutt will use your standard pager to display the results. - Note that when using the built-in pager, only entries with this flag will - be considered a handler for a MIME type ? all other entries will be - ignored. - needsterminal Mutt uses this flag when viewing attachments with auto_view, in order to @@ -4790,7 +4505,7 @@ This flag specifies the command to use to edit a specific MIME type. Mutt supports this from the compose menu, and also uses it to compose new - attachments. Mutt will default to the defined $editor for text attachments. + attachments. Mutt will default to the defined editor for text attachments. nametemplate=