diff options
| -rw-r--r-- | ChangeLog | 38 | ||||
| -rw-r--r-- | Changes | 60 | ||||
| -rw-r--r-- | OPS | 1 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | addrbook.c | 3 | ||||
| -rw-r--r-- | attach.c | 3 | ||||
| -rw-r--r-- | commands.c | 4 | ||||
| -rw-r--r-- | compose.c | 140 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 320 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | copy.c | 5 | ||||
| -rw-r--r-- | curs_main.c | 2 | ||||
| -rw-r--r-- | doc/PGP-Notes.txt (renamed from doc/pgp-Notes.txt) | 111 | ||||
| -rw-r--r-- | doc/manual.sgml | 2 | ||||
| -rw-r--r-- | edit.c | 2 | ||||
| -rw-r--r-- | enter.c | 9 | ||||
| -rw-r--r-- | flags.c | 7 | ||||
| -rw-r--r-- | functions.h | 1 | ||||
| -rw-r--r-- | globals.h | 5 | ||||
| -rw-r--r-- | hdrline.c | 58 | ||||
| -rw-r--r-- | headers.c | 2 | ||||
| -rw-r--r-- | hook.c | 4 | ||||
| -rw-r--r-- | imap.c | 210 | ||||
| -rw-r--r-- | init.c | 73 | ||||
| -rw-r--r-- | init.h | 5 | ||||
| -rw-r--r-- | main.c | 18 | ||||
| -rw-r--r-- | mh.c | 29 | ||||
| -rw-r--r-- | mutt.h | 13 | ||||
| -rw-r--r-- | mx.c | 5 | ||||
| -rw-r--r-- | pager.c | 2 | ||||
| -rw-r--r-- | pgpkey.c | 4 | ||||
| -rw-r--r-- | pgppubring.c | 23 | ||||
| -rw-r--r-- | postpone.c | 4 | ||||
| -rw-r--r-- | protos.h | 9 | ||||
| -rw-r--r-- | query.c | 23 | ||||
| -rw-r--r-- | recvattach.c | 2 | ||||
| -rw-r--r-- | reldate.h | 2 | ||||
| -rw-r--r-- | send.c | 44 | ||||
| -rw-r--r-- | sendlib.c | 34 |
41 files changed, 909 insertions, 388 deletions
@@ -1707,3 +1707,41 @@ Changes since 0.92.6 alias group bob joe with no commas (mailx compatibility) +Changes since 0.92.7 +-------------------- + +- [patch-0.92.7.handler.empty_cc_bcc.1] fixed bug in edit_envelope() which + caused the message to be aborted if the cc or bcc field was empty + +- buffer used to store the error message in mutt_pattern_comp() called + sizeof() on the wrong variable + +- renamed $header_format to $index_format ($hdr_format is still accepted) + +- [patch-0.92.7.vikas.postpone.1] fixed typo for binding the `postpone' + menu, and changes the menu to use $index_format for display of postponed + messages + +- mutt_error() is now a function pointer which either has the value of + mutt_curses_error() or mutt_nocurses_error() which simplifies the muttrc + parsing code + +- "source '~/bin/myscript|'" was fixed so that it works correctly + +- [patch-0.92.7.me.mh_sync.1] fixed bug where syncing mh mailboxes silently + failed + +- [patch-0.92.7.me.pattern.1] fixes bug with mismatched backtics in the + pattern language + +- mutt_default_from() no longer sets the "real name" portion of the return + address so that it can be delayed until after execution of send-hook + commands + + +PGP-related changes since 0.92.6i +--------------------------------- + +- [patch-0.92.6i.tlr.pgp_longids.1] Correct the + calculation of 64 bit "v4" key IDs. + @@ -1,38 +1,52 @@ -Changes since 0.92.7 +Changes since 0.92.8 -------------------- -- [patch-0.92.7.handler.empty_cc_bcc.1] fixed bug in edit_envelope() which - caused the message to be aborted if the cc or bcc field was empty +- [patch-0.90.12i.jmydaes.command-complete.1] Command completion -- buffer used to store the error message in mutt_pattern_comp() called - sizeof() on the wrong variable +- [patch-0.92.8.mtsirkin.attach-viewer.1] When viewing + attachments, fall back to the attachment's file name if + no description is available. -- renamed $header_format to $index_format ($hdr_format is still accepted) +- [patch-0.92.8i.ds.attachmsg.1] Attach messages from the compose menu. -- [patch-0.92.7.vikas.postpone.1] fixed typo for binding the `postpone' - menu, and changes the menu to use $index_format for display of postponed - messages +- [patch-0.92.8i.tlr.make_string_context.1] Fix a + segmentation fault when invoking mutt -p from the + command line. -- mutt_error() is now a function pointer which either has the value of - mutt_curses_error() or mutt_nocurses_error() which simplifies the muttrc - parsing code +- [patch-0.92.8i.tlr.mh_sequences.1] Don't generate + .mh_sequences files for maildir folders. -- "source '~/bin/myscript|'" was fixed so that it works correctly +- fix a NULL pointer deference in hdrline.c -- [patch-0.92.7.me.mh_sync.1] fixed bug where syncing mh mailboxes silently - failed +- [patch-0.92.8i.jmy.hook-bugfix.1] Fix a segmentation + fault in the send-hook code. -- [patch-0.92.7.me.pattern.1] fixes bug with mismatched backtics in the - pattern language +- [patch-0.92.8i.tlr.addrbook.1] Untag all aliases before + entering the address-book menu. -- mutt_default_from() no longer sets the "real name" portion of the return - address so that it can be delayed until after execution of send-hook - commands +- Enforce a non-NULL QueryCmd in the beginning of + mutt_query_complete() and mutt_query_menu(). +- Make all query.c functions except mutt_query_complete() + and mutt_query_menu() static. -PGP-related changes since 0.92.6i +- The latest IMAP patch from Andy Sloane has been added. + +PGP related Changes since 0.92.8i --------------------------------- -- [patch-0.92.6i.tlr.pgp_longids.1] Correct the - calculation of 64 bit "v4" key IDs. +- [patch-0.92.8i.maj.MIC_alg.1] Properly initializes a + variable in the PGP part of the Compose menu. + +- [patch-0.92.8i.tlr.pgpkey_dflt.1] Avoid possible + segmentation faults when determining the default value + of the PGP key selection prompt. + +- [patch-0.92.8i.wk.opgp_5bytelength.1] Recognize + OpenPGP's public key algorithm #20 (i.e., ElGamal for + Signing and Encrypting). + +- Moved doc/pgp-Notes.txt to doc/PGP-Notes.txt, and + updated that part of the documentation. + @@ -7,6 +7,7 @@ OP_BROWSER_NEW_FILE "select a new file in this directory" OP_CHANGE_DIRECTORY "change directories" OP_CHECK_NEW "check mailboxes for new mail" OP_COMPOSE_ATTACH_FILE "attach a file(s) to this message" +OP_COMPOSE_ATTACH_MESSAGE "attach a message(s) to this message" OP_COMPOSE_EDIT_BCC "edit the BCC list" OP_COMPOSE_EDIT_CC "edit the CC list" OP_COMPOSE_EDIT_DESCRIPTION "edit attachment description" @@ -5,13 +5,14 @@ Installation instructructions are detailed in ``INSTALL''. The user manual is in doc/manual.txt. -PGP users please read doc/pgp-Notes.txt before proceeding. +PGP users please read doc/PGP-Notes.txt before proceeding. For more information, see the Mutt home page, http://www.cs.hmc.edu/~me/mutt/index.html. The primary distribution point for Mutt is -ftp://ftp.cs.hmc.edu/pub/me/mutt. See the home page for mirror sites. +ftp://ftp.cs.hmc.edu/pub/me/mutt. See the home page for +mirror sites. Michael Elkins <me@cs.hmc.edu>, January 22, 1998 Thomas Roessler <roessler@guug.de>, February 3, 1998 @@ -34,6 +34,9 @@ /* Do you want support for the POP3 protocol? (--enable-pop) */ #undef USE_POP +/* Do you want support for the IMAP protocol? (--enable-imap) */ +#undef USE_IMAP + /* * Is mail spooled to the user's home directory? If defined, MAILPATH should * be set to the filename of the spool mailbox relative the the home @@ -149,7 +149,10 @@ void mutt_alias_menu (char *buf, size_t buflen, ALIAS *aliases) /* count the number of aliases */ for (aliasp = aliases; aliasp; aliasp = aliasp->next) + { + aliasp->tagged = 0; menu->max++; + } menu->data = AliasTable = (ALIAS **) safe_calloc (menu->max, sizeof (ALIAS *)); @@ -420,6 +420,9 @@ int mutt_view_attachment (FILE *fp, BODY *a, int flag) if (a->description) strfcpy (descrip, a->description, sizeof (descrip)); + else if (a->filename) + snprintf (descrip, sizeof (descrip), "---Attachment: %s : %s", + a->filename, type); else snprintf (descrip, sizeof (descrip), "---Attachment: %s", type); } @@ -180,7 +180,7 @@ int mutt_display_message (HEADER *cur) builtin = 1; else { - mutt_make_string (buf, sizeof (buf), PagerFmt, cur); + mutt_make_string (buf, sizeof (buf), PagerFmt, Context, cur); fputs (buf, fpout); fputs ("\n\n", fpout); } @@ -475,7 +475,7 @@ void mutt_enter_command (void) int old_sortre = option (OPTSORTRE); buffer[0] = 0; - if (mutt_get_field (":", buffer, sizeof (buffer), 0) != 0 || !buffer[0]) + if (mutt_get_field (":", buffer, sizeof (buffer), M_COMMAND) != 0 || !buffer[0]) return; err.data = errbuf; err.dsize = sizeof (errbuf); @@ -23,6 +23,7 @@ #include "mime.h" #include "attach.h" #include "mapping.h" +#include "mailbox.h" #include <string.h> #include <sys/stat.h> @@ -149,16 +150,20 @@ static int pgp_send_menu (int bits) mutt_error("This doesn't make sense if you don't want to sign the message."); else { + /* Copy the existing MIC algorithm into place */ + strfcpy(input_micalg, PgpSignMicalg, sizeof(input_micalg)); + if(mutt_get_field("MIC algorithm: ", input_micalg, sizeof(input_micalg), 0) == 0) { if(strcasecmp(input_micalg, "pgp-md5") && strcasecmp(input_micalg, "pgp-sha1") && strcasecmp(input_micalg, "pgp-rmd160")) { - mutt_error("Unknown MIC algorithm!"); - strfcpy(input_micalg, "x-unknown", sizeof(input_micalg)); + mutt_error("Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"); + } + else { + safe_free((void **) &PgpSignMicalg); + PgpSignMicalg = safe_strdup(input_micalg); } - safe_free((void **) &PgpSignMicalg); - PgpSignMicalg = safe_strdup(input_micalg); } } } @@ -370,6 +375,61 @@ static int delete_attachment (MUTTMENU *menu, short *idxlen, int x) return (0); } +static struct mapping_t AttachMsgHelp[] = { + { "Exit", OP_EXIT }, + { "Help", OP_HELP }, + { "Attach Message", OP_GENERIC_SELECT_ENTRY }, + { NULL } +}; + + +static void attach_msg_make_entry (char *s, size_t l, MUTTMENU *menu, int num) +{ + CONTEXT *tmp = Context; + + Context = (CONTEXT *) menu->data; + index_make_entry (s, l, menu, num); + Context = tmp; +} + +static HEADER *select_msg (CONTEXT *ctx) +{ + MUTTMENU *menu; + int i, done=0, r=-1; + char helpstr[SHORT_STRING]; + char title[SHORT_STRING]; + + snprintf(title, sizeof (title), "Messages to attach from folder %s", + ctx->path); + + menu = mutt_new_menu (); + menu->make_entry = attach_msg_make_entry; + menu->menu = MENU_GENERIC; + menu->max = ctx->msgcount; + menu->title = title; + menu->data = ctx; + menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_GENERIC, + AttachMsgHelp); + + while (!done) + { + switch (i = mutt_menuLoop (menu)) + { + case OP_GENERIC_SELECT_ENTRY: + r = menu->current; + done = 1; + break; + + case OP_EXIT: + done = 1; + break; + } + } + + mutt_menuDestroy (&menu); + return (r > -1 ? ctx->hdrs[ctx->v2r[r]] : NULL); +} + /* return values: * * 1 message should be postponed @@ -393,6 +453,8 @@ int mutt_send_menu (HEADER *msg, /* structure for new message */ int op = 0; int loop = 1; int fccSet = 0; /* has the user edited the Fcc: field ? */ + CONTEXT *ctx = NULL; + HEADER *hdr = NULL; idx = mutt_gen_attach_list (msg->content, idx, &idxlen, &idxmax, 0, 1); @@ -548,10 +610,31 @@ int mutt_send_menu (HEADER *msg, /* structure for new message */ case OP_COMPOSE_ATTACH_FILE: + case OP_COMPOSE_ATTACH_MESSAGE: + fname[0] = 0; - if (mutt_enter_fname ("Attach file", fname, sizeof (fname), - &menu->redraw, 0) == -1) - break; + { + char* prompt; + int flag; + + if (op == OP_COMPOSE_ATTACH_FILE) + { + prompt = "Attach file"; + flag = 0; + } + else + { + prompt = "Open mailbox to attach message from"; + flag = 1; + } + + if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, + flag) == -1) + { + break; + } + } + if (!fname[0]) continue; mutt_expand_path (fname, sizeof (fname)); @@ -563,6 +646,34 @@ int mutt_send_menu (HEADER *msg, /* structure for new message */ break; } + if (op == OP_COMPOSE_ATTACH_MESSAGE) + { + menu->redraw = REDRAW_FULL; + + ctx = mx_open_mailbox (fname, 0, NULL); + if (ctx == NULL) + { + mutt_perror (fname); + break; + } + + if (!ctx->msgcount) + { + mx_close_mailbox (ctx); + safe_free ((void **) &ctx); + mutt_error ("No messages in that folder."); + break; + } + + hdr = select_msg (ctx); + if (hdr == NULL) + { + mx_close_mailbox (ctx); + safe_free ((void **) &ctx); + break; + } + } + if (idxlen == idxmax) { safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5)); @@ -570,7 +681,13 @@ int mutt_send_menu (HEADER *msg, /* structure for new message */ } idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR)); - if ((idx[idxlen]->content = mutt_make_attach (fname)) != NULL) + + if (op == OP_COMPOSE_ATTACH_FILE) + idx[idxlen]->content = mutt_make_file_attach (fname); + else + idx[idxlen]->content = mutt_make_message_attach (ctx, hdr); + + if (idx[idxlen]->content != NULL) { idx[idxlen]->level = (idxlen > 0) ? idx[idxlen-1]->level : 0; @@ -580,11 +697,12 @@ int mutt_send_menu (HEADER *msg, /* structure for new message */ menu->current = idxlen++; mutt_update_tree (idx, idxlen); menu->max = idxlen; - menu->redraw |= REDRAW_INDEX | REDRAW_STATUS; + if (op == OP_COMPOSE_ATTACH_FILE) + menu->redraw |= REDRAW_INDEX | REDRAW_STATUS; } else { - mutt_error ("Unable to attach file!"); + mutt_error ("Unable to attach!"); safe_free ((void **) &idx[idxlen]); } break; @@ -752,7 +870,7 @@ int mutt_send_menu (HEADER *msg, /* structure for new message */ } fclose (fp); - if ((idx[idxlen]->content = mutt_make_attach (fname)) == NULL) + if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) { mutt_error ("What we have here is a failure to make an attachment"); continue; diff --git a/config.h.in b/config.h.in index 8b888139..efc45ee9 100644 --- a/config.h.in +++ b/config.h.in @@ -46,6 +46,9 @@ /* Do you want support for the POP3 protocol? (--enable-pop) */ #undef USE_POP +/* Do you want support for the IMAP protocol? (--enable-imap) */ +#undef USE_IMAP + /* * Is mail spooled to the user's home directory? If defined, MAILPATH should * be set to the filename of the spool mailbox relative the the home @@ -30,6 +30,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-pop Enable POP3 support" ac_help="$ac_help + --enable-imap Enable IMAP support" +ac_help="$ac_help --enable-flock Use flock() to lock files" ac_help="$ac_help --disable-fcntl Do NOT use fcntl() to lock files " @@ -553,11 +555,11 @@ fi -VERSION=0.92.8 +VERSION=0.92.9 SUBVERSION='' echo $ac_n "checking for prefix""... $ac_c" 1>&6 -echo "configure:561: checking for prefix" >&5 +echo "configure:563: checking for prefix" >&5 if test x$prefix = xNONE; then mutt_cv_prefix=$ac_default_prefix else @@ -568,7 +570,7 @@ echo "$ac_t""$mutt_cv_prefix" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:572: checking for $ac_word" >&5 +echo "configure:574: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -597,7 +599,7 @@ 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 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:601: checking for $ac_word" >&5 +echo "configure:603: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -645,7 +647,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:649: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:651: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -655,11 +657,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 659 "configure" +#line 661 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -679,12 +681,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:683: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:685: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:688: checking whether we are using GNU C" >&5 +echo "configure:690: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -693,7 +695,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -708,7 +710,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:712: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:714: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -736,7 +738,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:740: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:742: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -792,7 +794,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:796: checking for a BSD compatible install" >&5 +echo "configure:798: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -845,7 +847,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:849: checking for $ac_word" >&5 +echo "configure:851: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,7 +888,7 @@ if test -f $srcdir/pgp.c; then # Extract the first word of "pgpk", so it can be a program name with args. set dummy pgpk; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:890: checking for $ac_word" >&5 +echo "configure:892: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -931,7 +933,7 @@ EOF # Extract the first word of "pgp", so it can be a program name with args. set dummy pgp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:935: checking for $ac_word" >&5 +echo "configure:937: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -995,7 +997,7 @@ EOF # Extract the first word of "ispell", so it can be a program name with args. set dummy ispell; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:999: checking for $ac_word" >&5 +echo "configure:1001: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1032,7 +1034,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1036: checking how to run the C preprocessor" >&5 +echo "configure:1038: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1047,13 +1049,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1051 "configure" +#line 1053 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1064,13 +1066,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1068 "configure" +#line 1070 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1096,7 +1098,7 @@ echo "$ac_t""$CPP" 1>&6 if test "${with_slang+set}" = set; then withval="$with_slang" echo $ac_n "checking if -ltermlib is required""... $ac_c" 1>&6 -echo "configure:1100: checking if -ltermlib is required" >&5 +echo "configure:1102: checking if -ltermlib is required" >&5 if eval "test \"`echo '$''{'mutt_cv_bsdish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1104,7 +1106,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1108 "configure" +#line 1110 "configure" #include "confdefs.h" #include <sys/param.h> @@ -1117,7 +1119,7 @@ main () #endif } EOF -if { (eval echo configure:1121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then mutt_cv_bsdish=yes else @@ -1134,7 +1136,7 @@ fi echo "$ac_t""$mutt_cv_bsdish" 1>&6 echo $ac_n "checking for S-Lang""... $ac_c" 1>&6 -echo "configure:1138: checking for S-Lang" >&5 +echo "configure:1140: checking for S-Lang" >&5 if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src @@ -1180,16 +1182,16 @@ EOF echo $ac_n "checking if I can compile a test SLang program""... $ac_c" 1>&6 -echo "configure:1184: checking if I can compile a test SLang program" >&5 +echo "configure:1186: checking if I can compile a test SLang program" >&5 cat > conftest.$ac_ext <<EOF -#line 1186 "configure" +#line 1188 "configure" #include "confdefs.h" int main() { SLtt_get_terminfo (); ; return 0; } EOF -if { (eval echo configure:1193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -1217,7 +1219,7 @@ fi echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:1221: checking for initscr in -lncurses" >&5 +echo "configure:1223: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1225,7 +1227,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 1229 "configure" +#line 1231 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1236,7 +1238,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:1240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1259,17 +1261,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1263: checking for $ac_hdr" >&5 +echo "configure:1265: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1268 "configure" +#line 1270 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1310,12 +1312,12 @@ fi echo $ac_n "checking for start_color""... $ac_c" 1>&6 -echo "configure:1314: checking for start_color" >&5 +echo "configure:1316: checking for start_color" >&5 if eval "test \"`echo '$''{'ac_cv_func_start_color'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1319 "configure" +#line 1321 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with cha |