From: Adeodato Simó Date: Wed, 16 Aug 2006 14:03:41 +0000 (+0200) Subject: New upstream release 1.5.13. X-Git-Tag: 1.5.13-1~3 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/63918bfd01f66dbb07af0cac82359c0032ce6376?ds=sidebyside New upstream release 1.5.13. --- diff --git a/debian/changelog b/debian/changelog index 7e8be03..2610a92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mutt (1.5.13-1) unstable; urgency=low + + * New upstream release. + + -- Adeodato Simó Wed, 16 Aug 2006 15:22:53 +0200 + mutt (1.5.12-1) unstable; urgency=low * New upstream release. Ship upstream's UPDATING file as NEWS.gz in diff --git a/debian/patches/debian-specific/Md.Muttrc.diff b/debian/patches/debian-specific/Md.Muttrc.diff index 2aa56e6..9c442bc 100644 --- a/debian/patches/debian-specific/Md.Muttrc.diff +++ b/debian/patches/debian-specific/Md.Muttrc.diff @@ -39,11 +39,11 @@ # imitate the old search-body function macro index \eb "~b " "search in message bodies" -@@ -14,7 +46,17 @@ - macro index,pager \cb "urlview" "call urlview to extract URLs out of a message" +@@ -15,7 +47,17 @@ + macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" # Show documentation when pressing F1 --macro generic,pager "less @docdir@/manual.txt" "show Mutt documentation" +-macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" +macro generic "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation" +macro index "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation" +macro pager "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation" @@ -58,7 +58,7 @@ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" -@@ -83,7 +125,22 @@ +@@ -84,7 +126,22 @@ attachments -A message/external-body attachments -I message/external-body diff --git a/debian/patches/debian-specific/dont_rebuild_po_files.diff b/debian/patches/debian-specific/dont_rebuild_po_files.diff index 4f2c292..28a1076 100644 --- a/debian/patches/debian-specific/dont_rebuild_po_files.diff +++ b/debian/patches/debian-specific/dont_rebuild_po_files.diff @@ -6,6 +6,6 @@ -$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in +$(srcdir)/$(PACKAGE).pot: #$(POTFILES) $(srcdir)/POTFILES.in + rm -f $@ $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ - --files-from=$(srcdir)/POTFILES.in \ diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 5c43021..027bbec 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -16,6 +16,7 @@ The home page for this patch is: doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done) - adjust the init.h hunk to the presence of group & ungroup - 2006-07-15: adjust Makefile.am and doc/manual.xml.head to mutt-1.5.12 + - 2006-08-16: adjust Makefile.am mutt-1.5.13 == END PATCH --- /dev/null @@ -540,7 +541,7 @@ The home page for this patch is: +void mutt_fast_close_compressed (CONTEXT *); --- configure.in.orig +++ configure.in -@@ -745,6 +745,11 @@ +@@ -798,6 +798,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -568,7 +569,7 @@ The home page for this patch is: --- doc/manual.xml.head.orig +++ doc/manual.xml.head -@@ -4745,6 +4745,205 @@ +@@ -4749,6 +4749,205 @@ @@ -833,7 +834,7 @@ The home page for this patch is: ) --- init.h.orig +++ init.h -@@ -3108,6 +3108,11 @@ +@@ -3119,6 +3119,11 @@ { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, { "group", parse_group, 0 }, { "ungroup", parse_ungroup, 0 }, @@ -866,12 +867,12 @@ The home page for this patch is: bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = $(BUILT_SOURCES) \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ -- crypt.c cryptglue.c \ -+ crypt.c cryptglue.c compress.c \ +- crypt.c cryptglue.c \ ++ crypt.c cryptglue.c compress.c \ 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 \ -@@ -68,7 +68,7 @@ +@@ -66,7 +66,7 @@ crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ @@ -920,7 +921,7 @@ The home page for this patch is: /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -863,6 +868,11 @@ +@@ -864,6 +869,11 @@ void *data; /* driver specific data */ #endif /* USE_IMAP */ @@ -1052,7 +1053,7 @@ The home page for this patch is: patch-1.5.6.dw.maildir-mtime.1 --- po/de.po.orig +++ po/de.po -@@ -1262,6 +1262,48 @@ +@@ -1267,6 +1267,48 @@ msgid "Failed to figure out sender" msgstr "Kann Absender nicht ermitteln" @@ -1101,7 +1102,7 @@ The home page for this patch is: #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1910,6 +1952,10 @@ +@@ -1915,6 +1957,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -1112,7 +1113,7 @@ The home page for this patch is: #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -3424,18 +3470,10 @@ +@@ -3422,18 +3468,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" diff --git a/debian/patches/misc/autotools-update.diff b/debian/patches/misc/autotools-update.diff index a98d2e3..84562a1 100644 --- a/debian/patches/misc/autotools-update.diff +++ b/debian/patches/misc/autotools-update.diff @@ -1,21 +1,6 @@ --- Makefile.in.orig +++ Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,8 +15,6 @@ - @SET_MAKE@ - - --SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -77,10 +75,10 @@ +@@ -72,10 +72,10 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ @@ -30,7 +15,7 @@ filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \ hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \ -@@ -194,6 +192,7 @@ +@@ -189,6 +189,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPGME_CONFIG = @GPGME_CONFIG@ @@ -38,7 +23,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -253,10 +252,7 @@ +@@ -248,10 +249,7 @@ USE_SSL_TRUE = @USE_SSL_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ @@ -49,7 +34,7 @@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ -@@ -271,24 +267,30 @@ +@@ -266,24 +264,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ @@ -80,16 +65,16 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -@@ -301,7 +303,7 @@ - BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h +@@ -296,7 +300,7 @@ + BUILT_SOURCES = keymap_defs.h patchlist.c mutt_SOURCES = $(BUILT_SOURCES) \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ -- crypt.c cryptglue.c \ -+ crypt.c cryptglue.c compress.c \ +- crypt.c cryptglue.c \ ++ crypt.c cryptglue.c compress.c \ 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 \ -@@ -333,7 +335,7 @@ +@@ -328,7 +332,7 @@ crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ @@ -98,7 +83,7 @@ attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ -@@ -501,6 +503,7 @@ +@@ -500,6 +504,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ @@ -9225,7 +9210,7 @@ if test "${mutt_cv_bsdish+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -7706,13 +9172,22 @@ +@@ -7707,13 +9173,22 @@ } _ACEOF rm -f conftest$ac_exeext @@ -9252,7 +9237,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -7725,14 +9200,16 @@ +@@ -7726,14 +9201,16 @@ ( exit $ac_status ) mutt_cv_bsdish=no fi @@ -9274,7 +9259,7 @@ if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src -@@ -7761,12 +9238,12 @@ +@@ -7762,12 +9239,12 @@ LDFLAGS="$LDFLAGS -L${withval}/lib" fi fi @@ -9291,7 +9276,7 @@ if test "${ac_cv_lib_termlib_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -7783,30 +9260,42 @@ +@@ -7784,30 +9261,42 @@ int main () { @@ -9343,7 +9328,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -7815,14 +9304,15 @@ +@@ -7816,14 +9305,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9363,7 +9348,7 @@ if test $ac_cv_lib_termlib_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBTERMLIB 1 -@@ -7846,8 +9336,8 @@ +@@ -7847,8 +9337,8 @@ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS resize.o" @@ -9374,7 +9359,7 @@ if test "${ac_cv_lib_slang_SLtt_get_terminfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -7860,40 +9350,52 @@ +@@ -7861,40 +9351,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -9439,7 +9424,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -7902,14 +9404,15 @@ +@@ -7903,14 +9405,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9459,7 +9444,7 @@ if test $ac_cv_lib_slang_SLtt_get_terminfo = yes; then MUTTLIBS="$MUTTLIBS -lslang -lm" else -@@ -7923,20 +9426,20 @@ +@@ -7924,20 +9427,20 @@ else mutt_cv_curses=/usr @@ -9486,7 +9471,7 @@ if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -7963,53 +9466,59 @@ +@@ -7964,53 +9467,59 @@ #undef initscr @@ -9565,7 +9550,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8018,13 +9527,14 @@ +@@ -8019,13 +9528,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9584,7 +9569,7 @@ if test $ac_cv_func_initscr = yes; then : else -@@ -8033,9 +9543,9 @@ +@@ -8034,9 +9544,9 @@ for lib in ncurses ncursesw do as_ac_Lib=`echo "ac_cv_lib_$lib''_waddnwstr" | $as_tr_sh` @@ -9597,7 +9582,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8047,40 +9557,52 @@ +@@ -8048,40 +9558,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -9662,7 +9647,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8089,23 +9611,25 @@ +@@ -8090,23 +9612,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9695,7 +9680,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8117,40 +9641,52 @@ +@@ -8118,40 +9642,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -9760,7 +9745,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8159,14 +9695,16 @@ +@@ -8160,14 +9696,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9781,7 +9766,7 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then MUTTLIBS="$MUTTLIBS -l$cf_ncurses" -@@ -8175,18 +9713,19 @@ +@@ -8176,18 +9714,19 @@ for ac_header in ncursesw/ncurses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -9809,7 +9794,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8197,24 +9736,36 @@ +@@ -8198,24 +9737,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -9854,7 +9839,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8223,15 +9774,16 @@ +@@ -8224,15 +9775,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9877,7 +9862,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8240,8 +9792,13 @@ +@@ -8241,8 +9793,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -9893,7 +9878,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -8265,9 +9822,10 @@ +@@ -8266,9 +9823,10 @@ ac_header_preproc=no fi @@ -9906,7 +9891,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -8291,25 +9849,19 @@ +@@ -8292,25 +9850,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -9939,7 +9924,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -8326,18 +9878,19 @@ +@@ -8327,18 +9879,19 @@ for ac_header in ncurses/ncurses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -9967,7 +9952,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8348,24 +9901,36 @@ +@@ -8349,24 +9902,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -10012,7 +9997,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8374,15 +9939,16 @@ +@@ -8375,15 +9940,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10035,7 +10020,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8391,8 +9957,13 @@ +@@ -8392,8 +9958,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -10051,7 +10036,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -8416,9 +9987,10 @@ +@@ -8417,9 +9988,10 @@ ac_header_preproc=no fi @@ -10064,7 +10049,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -8442,25 +10014,19 @@ +@@ -8443,25 +10015,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -10097,7 +10082,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -8473,18 +10039,19 @@ +@@ -8474,18 +10040,19 @@ for ac_header in ncurses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -10125,7 +10110,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8495,24 +10062,36 @@ +@@ -8496,24 +10063,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -10170,7 +10155,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8521,15 +10100,16 @@ +@@ -8522,15 +10101,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10193,7 +10178,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8538,8 +10118,13 @@ +@@ -8539,8 +10119,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -10209,7 +10194,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -8563,9 +10148,10 @@ +@@ -8564,9 +10149,10 @@ ac_header_preproc=no fi @@ -10222,7 +10207,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -8589,25 +10175,19 @@ +@@ -8590,25 +10176,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -10255,7 +10240,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -8626,8 +10206,8 @@ +@@ -8627,8 +10207,8 @@ fi else @@ -10266,7 +10251,7 @@ if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -8654,53 +10234,59 @@ +@@ -8655,53 +10235,59 @@ #undef initscr @@ -10345,7 +10330,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8709,21 +10295,22 @@ +@@ -8710,21 +10296,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10374,7 +10359,7 @@ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -8736,40 +10323,52 @@ +@@ -8737,40 +10324,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -10439,7 +10424,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8778,22 +10377,23 @@ +@@ -8779,22 +10378,23 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10469,7 +10454,7 @@ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -8806,40 +10406,52 @@ +@@ -8807,40 +10407,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -10534,7 +10519,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8848,14 +10460,15 @@ +@@ -8849,14 +10461,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10554,7 +10539,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then LIBS="-lcur_colr $LIBS" -@@ -8864,8 +10477,8 @@ +@@ -8865,8 +10478,8 @@ else @@ -10565,7 +10550,7 @@ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -8878,40 +10491,52 @@ +@@ -8879,40 +10492,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -10630,7 +10615,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -8920,14 +10545,15 @@ +@@ -8921,14 +10546,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10650,7 +10635,7 @@ if test $ac_cv_lib_Hcurses_initscr = yes; then # HP's header uses __HP_CURSES, but user claims _HP_CURSES. -@@ -8960,8 +10586,8 @@ +@@ -8961,8 +10587,8 @@ # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. @@ -10661,7 +10646,7 @@ if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -8988,53 +10614,59 @@ +@@ -8989,53 +10615,59 @@ #undef tgoto @@ -10740,7 +10725,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9043,13 +10675,14 @@ +@@ -9044,13 +10676,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10759,7 +10744,7 @@ if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined else -@@ -9057,9 +10690,9 @@ +@@ -9058,9 +10691,9 @@ for cf_term_lib in termcap termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` @@ -10772,7 +10757,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -9071,40 +10704,52 @@ +@@ -9072,40 +10705,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -10837,7 +10822,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9113,14 +10758,16 @@ +@@ -9114,14 +10759,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10858,7 +10843,7 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi -@@ -9135,9 +10782,9 @@ +@@ -9136,9 +10783,9 @@ for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` @@ -10871,7 +10856,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -9149,40 +10796,52 @@ +@@ -9150,40 +10797,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -10936,7 +10921,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9191,14 +10850,16 @@ +@@ -9192,14 +10851,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10957,7 +10942,7 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi -@@ -9210,8 +10871,8 @@ +@@ -9211,8 +10872,8 @@ LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then @@ -10968,7 +10953,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9228,24 +10889,36 @@ +@@ -9229,24 +10890,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -11013,7 +10998,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9254,18 +10927,19 @@ +@@ -9255,18 +10928,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11039,7 +11024,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9282,24 +10956,36 @@ +@@ -9283,24 +10957,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -11084,7 +11069,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9326,24 +11012,36 @@ +@@ -9327,24 +11013,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -11129,7 +11114,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9352,16 +11050,18 @@ +@@ -9353,16 +11051,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11153,7 +11138,7 @@ fi fi -@@ -9379,9 +11079,9 @@ +@@ -9380,9 +11080,9 @@ for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm do @@ -11166,7 +11151,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -9402,24 +11102,36 @@ +@@ -9403,24 +11103,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -11211,7 +11196,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9442,24 +11154,36 @@ +@@ -9443,24 +11155,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -11256,7 +11241,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9472,7 +11196,8 @@ +@@ -9473,7 +11197,8 @@ eval "ac_cv_func_decl_$ac_func=no" fi @@ -11266,7 +11251,7 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -9480,12 +11205,13 @@ +@@ -9481,12 +11206,13 @@ eval "ac_cv_func_decl_$ac_func=yes" fi @@ -11283,7 +11268,7 @@ ac_tr_func=`echo HAVE_$ac_func | tr '[a-z]' '[A-Z]'` -@@ -9495,8 +11221,8 @@ +@@ -9496,8 +11222,8 @@ _ACEOF else @@ -11294,7 +11279,7 @@ fi done -@@ -9512,10 +11238,11 @@ +@@ -9513,10 +11239,11 @@ fi LIBS="$old_LIBS" @@ -11309,7 +11294,7 @@ if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -9539,24 +11266,36 @@ +@@ -9540,24 +11267,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -11354,7 +11339,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9565,9 +11304,10 @@ +@@ -9566,9 +11305,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11367,7 +11352,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -@@ -9623,6 +11363,7 @@ +@@ -9624,6 +11364,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -11375,7 +11360,7 @@ #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -9642,18 +11383,27 @@ +@@ -9643,18 +11384,27 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) @@ -11409,7 +11394,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9666,12 +11416,14 @@ +@@ -9667,12 +11417,14 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi @@ -11427,7 +11412,7 @@ if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -9688,18 +11440,19 @@ +@@ -9689,18 +11441,19 @@ for ac_header in stdarg.h sys/ioctl.h ioctl.h sysexits.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11455,7 +11440,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9710,24 +11463,36 @@ +@@ -9711,24 +11464,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -11500,7 +11485,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9736,15 +11501,16 @@ +@@ -9737,15 +11502,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11523,7 +11508,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9753,8 +11519,13 @@ +@@ -9754,8 +11520,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -11539,7 +11524,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -9778,9 +11549,10 @@ +@@ -9779,9 +11550,10 @@ ac_header_preproc=no fi @@ -11552,7 +11537,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -9804,25 +11576,19 @@ +@@ -9805,25 +11577,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -11585,7 +11570,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -9839,18 +11605,19 @@ +@@ -9840,18 +11606,19 @@ for ac_header in sys/time.h sys/resource.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11613,7 +11598,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9861,24 +11628,36 @@ +@@ -9862,24 +11629,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -11658,7 +11643,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -9887,15 +11666,16 @@ +@@ -9888,15 +11667,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11681,7 +11666,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9904,8 +11684,13 @@ +@@ -9905,8 +11685,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -11697,7 +11682,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -9929,9 +11714,10 @@ +@@ -9930,9 +11715,10 @@ ac_header_preproc=no fi @@ -11710,7 +11695,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -9955,25 +11741,19 @@ +@@ -9956,25 +11742,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -11743,7 +11728,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -9989,18 +11769,19 @@ +@@ -9990,18 +11770,19 @@ for ac_header in unix.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11771,7 +11756,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -10011,24 +11792,36 @@ +@@ -10012,24 +11793,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -11816,7 +11801,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10037,15 +11830,16 @@ +@@ -10038,15 +11831,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11839,7 +11824,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -10054,8 +11848,13 @@ +@@ -10055,8 +11849,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -11855,7 +11840,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -10079,9 +11878,10 @@ +@@ -10080,9 +11879,10 @@ ac_header_preproc=no fi @@ -11868,7 +11853,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -10105,25 +11905,19 @@ +@@ -10106,25 +11906,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -11901,7 +11886,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -10141,9 +11935,9 @@ +@@ -10142,9 +11936,9 @@ for ac_func in setrlimit getsid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -11914,7 +11899,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -10169,53 +11963,59 @@ +@@ -10170,53 +11964,59 @@ #undef $ac_func @@ -11993,7 +11978,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10224,13 +12024,15 @@ +@@ -10225,13 +12025,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12013,7 +11998,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -10240,8 +12042,8 @@ +@@ -10241,8 +12043,8 @@ done @@ -12024,7 +12009,7 @@ if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -10253,56 +12055,61 @@ +@@ -10254,56 +12056,61 @@ /* end confdefs.h. */ #include #include @@ -12108,7 +12093,7 @@ cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -10310,8 +12117,8 @@ +@@ -10311,8 +12118,8 @@ @@ -12119,7 +12104,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -10338,14 +12145,14 @@ +@@ -10339,14 +12146,14 @@ $EGREP "volatile.*sig_atomic_t" >/dev/null 2>&1; then is_sig_atomic_t_volatile=yes; @@ -12138,7 +12123,7 @@ fi rm -f conftest* -@@ -10353,10 +12160,10 @@ +@@ -10354,10 +12161,10 @@ else @@ -12153,7 +12138,7 @@ if test "${ac_cv_type_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -10367,36 +12174,49 @@ +@@ -10368,36 +12175,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -12213,7 +12198,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10405,12 +12225,13 @@ +@@ -10406,12 +12226,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12231,7 +12216,7 @@ if test $ac_cv_type_sig_atomic_t = yes; then : else -@@ -10439,8 +12260,8 @@ +@@ -10440,8 +12261,8 @@ fi @@ -12242,7 +12227,7 @@ if test "${ac_cv_have_decl_sys_siglist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -10462,6 +12283,7 @@ +@@ -10463,6 +12284,7 @@ { #ifndef sys_siglist char *p = (char *) sys_siglist; @@ -12250,7 +12235,7 @@ #endif ; -@@ -10469,24 +12291,36 @@ +@@ -10470,24 +12292,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -12295,7 +12280,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10495,12 +12329,13 @@ +@@ -10496,12 +12330,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12313,7 +12298,7 @@ if test $ac_cv_have_decl_sys_siglist = yes; then cat >>confdefs.h <<_ACEOF -@@ -10519,8 +12354,8 @@ +@@ -10520,8 +12355,8 @@ @@ -12324,7 +12309,7 @@ if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -10531,36 +12366,49 @@ +@@ -10532,36 +12367,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -12384,7 +12369,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10569,12 +12417,13 @@ +@@ -10570,12 +12418,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12402,7 +12387,7 @@ if test $ac_cv_type_pid_t = yes; then : else -@@ -10585,8 +12434,8 @@ +@@ -10586,8 +12435,8 @@ fi @@ -12413,7 +12398,7 @@ if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -10597,36 +12446,49 @@ +@@ -10598,36 +12447,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -12473,7 +12458,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10635,12 +12497,13 @@ +@@ -10636,12 +12498,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12491,7 +12476,7 @@ if test $ac_cv_type_ssize_t = yes; then : else -@@ -10660,9 +12523,9 @@ +@@ -10661,9 +12524,9 @@ for ac_func in fgetpos memmove setegid srand48 strerror do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -12504,7 +12489,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -10688,53 +12551,59 @@ +@@ -10689,53 +12552,59 @@ #undef $ac_func @@ -12583,7 +12568,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10743,13 +12612,15 @@ +@@ -10744,13 +12613,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12603,7 +12588,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -10765,9 +12636,9 @@ +@@ -10766,9 +12637,9 @@ for ac_func in setenv strcasecmp strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -12616,7 +12601,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -10793,53 +12664,59 @@ +@@ -10794,53 +12665,59 @@ #undef $ac_func @@ -12695,7 +12680,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10848,25 +12725,25 @@ +@@ -10849,25 +12726,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12730,7 +12715,7 @@ esac fi -@@ -10874,8 +12751,8 @@ +@@ -10875,8 +12752,8 @@ @@ -12741,7 +12726,7 @@ if test "${ac_cv_func_getopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -10902,53 +12779,59 @@ +@@ -10903,53 +12780,59 @@ #undef getopt @@ -12820,7 +12805,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -10957,31 +12840,33 @@ +@@ -10958,31 +12841,33 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12866,7 +12851,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -10992,24 +12877,36 @@ +@@ -10993,24 +12878,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -12911,7 +12896,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11018,15 +12915,16 @@ +@@ -11019,15 +12916,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -12934,7 +12919,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -11035,8 +12933,13 @@ +@@ -11036,8 +12934,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -12950,7 +12935,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -11060,9 +12963,10 @@ +@@ -11061,9 +12964,10 @@ ac_header_preproc=no fi @@ -12963,7 +12948,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -11086,25 +12990,19 @@ +@@ -11087,25 +12991,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -12996,22 +12981,20 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -11124,9 +13022,9 @@ - for ac_func in snprintf - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -11120,8 +13018,8 @@ + fi + + SNPRINTFOBJS="" +-echo "$as_me:$LINENO: checking for snprintf" >&5 +-echo $ECHO_N "checking for snprintf... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for snprintf" >&5 ++echo $ECHO_N "checking for snprintf... $ECHO_C" >&6; } + if test "${ac_cv_func_snprintf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -@@ -11152,53 +13050,59 @@ +@@ -11148,53 +13046,59 @@ - #undef $ac_func + #undef snprintf -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. @@ -13023,15 +13006,15 @@ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char $ac_func (); + 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_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func +-#if defined (__stub_snprintf) || defined (__stub___snprintf) ++#if defined __stub_snprintf || defined __stub___snprintf choke me -#else --char (*f) () = $ac_func; +-char (*f) () = snprintf; -#endif -#ifdef __cplusplus -} @@ -13040,8 +13023,8 @@ int main () { --return f != $ac_func; -+return $ac_func (); +-return f != snprintf; ++return snprintf (); ; return 0; } @@ -13088,42 +13071,38 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11207,13 +13111,15 @@ +@@ -11203,21 +13107,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" +-ac_cv_func_snprintf=no ++ ac_cv_func_snprintf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -11228,9 +13134,9 @@ - for ac_func in vsnprintf - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +-echo "$as_me:$LINENO: result: $ac_cv_func_snprintf" >&5 +-echo "${ECHO_T}$ac_cv_func_snprintf" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_snprintf" >&5 ++echo "${ECHO_T}$ac_cv_func_snprintf" >&6; } + if test $ac_cv_func_snprintf = yes; then + mutt_cv_func_snprintf=yes + else + mutt_cv_func_snprintf=no + fi + +-echo "$as_me:$LINENO: checking for vsnprintf" >&5 +-echo $ECHO_N "checking for vsnprintf... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for vsnprintf" >&5 ++echo $ECHO_N "checking for vsnprintf... $ECHO_C" >&6; } + if test "${ac_cv_func_vsnprintf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -@@ -11256,53 +13162,59 @@ +@@ -11244,53 +13149,59 @@ - #undef $ac_func + #undef vsnprintf -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. @@ -13135,15 +13114,15 @@ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char $ac_func (); + 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_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func +-#if defined (__stub_vsnprintf) || defined (__stub___vsnprintf) ++#if defined __stub_vsnprintf || defined __stub___vsnprintf choke me -#else --char (*f) () = $ac_func; +-char (*f) () = vsnprintf; -#endif -#ifdef __cplusplus -} @@ -13152,8 +13131,8 @@ int main () { --return f != $ac_func; -+return $ac_func (); +-return f != vsnprintf; ++return vsnprintf (); ; return 0; } @@ -13200,30 +13179,136 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11311,13 +13223,15 @@ +@@ -11299,13 +13210,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" +-ac_cv_func_vsnprintf=no ++ ac_cv_func_vsnprintf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -11329,18 +13243,16 @@ - done +-echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf" >&5 +-echo "${ECHO_T}$ac_cv_func_vsnprintf" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf" >&5 ++echo "${ECHO_T}$ac_cv_func_vsnprintf" >&6; } + if test $ac_cv_func_vsnprintf = yes; then + mutt_cv_func_vsnprintf=yes + else +@@ -11313,8 +13225,8 @@ + fi + + if test $mutt_cv_func_snprintf = yes; then +-echo "$as_me:$LINENO: checking whether your system's snprintf is C99 compliant" >&5 +-echo $ECHO_N "checking whether your system's snprintf is C99 compliant... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether your system's snprintf is C99 compliant" >&5 ++echo $ECHO_N "checking whether your system's snprintf is C99 compliant... $ECHO_C" >&6; } + if test "${mutt_cv_c99_snprintf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11338,13 +13250,22 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11357,17 +13278,19 @@ + ( exit $ac_status ) + mutt_cv_c99_snprintf=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi +-echo "$as_me:$LINENO: result: $mutt_cv_c99_snprintf" >&5 +-echo "${ECHO_T}$mutt_cv_c99_snprintf" >&6 ++{ echo "$as_me:$LINENO: result: $mutt_cv_c99_snprintf" >&5 ++echo "${ECHO_T}$mutt_cv_c99_snprintf" >&6; } + else + mutt_cv_c99_snprintf=no + fi + if test $mutt_cv_func_vsnprintf = yes; then +-echo "$as_me:$LINENO: checking whether your system's vsnprintf is C99 compliant" >&5 +-echo $ECHO_N "checking whether your system's vsnprintf is C99 compliant... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether your system's vsnprintf is C99 compliant" >&5 ++echo $ECHO_N "checking whether your system's vsnprintf is C99 compliant... $ECHO_C" >&6; } + if test "${mutt_cv_c99_vsnprintf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11401,13 +13324,22 @@ - if test $mutt_cv_snprintf = yes; then + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11420,11 +13352,13 @@ + ( exit $ac_status ) + mutt_cv_c99_vsnprintf=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi +-echo "$as_me:$LINENO: result: $mutt_cv_c99_vsnprintf" >&5 +-echo "${ECHO_T}$mutt_cv_c99_vsnprintf" >&6 ++{ echo "$as_me:$LINENO: result: $mutt_cv_c99_vsnprintf" >&5 ++echo "${ECHO_T}$mutt_cv_c99_vsnprintf" >&6; } + else + mutt_cv_c99_vsnprintf=no + fi +@@ -11443,18 +13377,16 @@ + + fi + if test $mutt_cv_c99_snprintf = no -o $mutt_cv_c99_vsnprintf = no; then - case $LIBOBJS in - "snprintf.$ac_objext" | \ - *" snprintf.$ac_objext" | \ @@ -13244,7 +13329,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -11357,29 +13269,41 @@ +@@ -11471,29 +13403,41 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -13296,7 +13381,7 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -11402,24 +13326,36 @@ +@@ -11516,24 +13460,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -13341,7 +13426,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11427,25 +13363,27 @@ +@@ -11541,25 +13497,27 @@ #define va_copy __va_copy _ACEOF @@ -13376,7 +13461,7 @@ conftest$ac_exeext conftest.$ac_ext -@@ -11453,9 +13391,9 @@ +@@ -11567,9 +13525,9 @@ for ac_func in ftruncate do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -13389,7 +13474,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -11481,53 +13419,59 @@ +@@ -11595,53 +13553,59 @@ #undef $ac_func @@ -13468,7 +13553,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11536,13 +13480,15 @@ +@@ -11650,13 +13614,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13488,7 +13573,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -11550,8 +13496,8 @@ +@@ -11664,8 +13630,8 @@ else @@ -13499,7 +13584,7 @@ if test "${ac_cv_lib_x_chsize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -11564,40 +13510,52 @@ +@@ -11678,40 +13644,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -13564,7 +13649,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11606,14 +13564,15 @@ +@@ -11720,14 +13698,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13584,7 +13669,7 @@ if test $ac_cv_lib_x_chsize = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBX 1 -@@ -11631,9 +13590,9 @@ +@@ -11745,9 +13724,9 @@ for ac_func in strftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -13597,7 +13682,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -11659,53 +13618,59 @@ +@@ -11773,53 +13752,59 @@ #undef $ac_func @@ -13676,7 +13761,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11714,13 +13679,15 @@ +@@ -11828,13 +13813,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13696,7 +13781,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -11728,8 +13695,8 @@ +@@ -11842,8 +13829,8 @@ else @@ -13707,7 +13792,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -11742,40 +13709,52 @@ +@@ -11856,40 +13843,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -13772,7 +13857,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11784,14 +13763,15 @@ +@@ -11898,14 +13897,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13792,7 +13877,7 @@ if test $ac_cv_lib_intl_strftime = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBINTL 1 -@@ -11809,9 +13789,9 @@ +@@ -11923,9 +13923,9 @@ for ac_func in fchdir do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -13805,7 +13890,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -11837,53 +13817,59 @@ +@@ -11951,53 +13951,59 @@ #undef $ac_func @@ -13884,7 +13969,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -11892,13 +13878,15 @@ +@@ -12006,13 +14012,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -13904,7 +13989,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -11911,18 +13899,17 @@ +@@ -12025,18 +14033,17 @@ @@ -13928,7 +14013,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -11948,53 +13935,59 @@ +@@ -12062,53 +14069,59 @@ #undef $ac_func @@ -14007,7 +14092,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12003,13 +13996,15 @@ +@@ -12117,13 +14130,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14027,7 +14112,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -12020,11 +14015,12 @@ +@@ -12134,11 +14149,12 @@ fi done @@ -14043,7 +14128,7 @@ if test "${mutt_cv_regex_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12043,13 +14039,22 @@ +@@ -12157,13 +14173,22 @@ 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 @@ -14070,7 +14155,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12062,11 +14067,13 @@ +@@ -12176,11 +14201,13 @@ ( exit $ac_status ) mutt_cv_regex_broken=yes fi @@ -14087,7 +14172,7 @@ if test $mutt_cv_regex_broken = yes ; then echo "Using the included GNU regex instead." >&6 mutt_cv_regex=yes -@@ -12079,23 +14086,21 @@ +@@ -12193,23 +14220,21 @@ #define USE_GNU_REGEX 1 _ACEOF @@ -14118,7 +14203,7 @@ if test x$with_homespool != x; then if test $with_homespool = yes; then with_homespool=mailbox -@@ -12118,13 +14123,12 @@ +@@ -12232,13 +14257,12 @@ mutt_cv_setgid=no else @@ -14136,7 +14221,7 @@ if test "${mutt_cv_mailpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12139,10 +14143,11 @@ +@@ -12253,10 +14277,11 @@ mutt_cv_mailpath=/usr/mail fi fi @@ -14151,7 +14236,7 @@ if test "$mutt_cv_mailpath" = no; then { { echo "$as_me:$LINENO: error: \"Could not determine where new mail is stored.\"" >&5 echo "$as_me: error: \"Could not determine where new mail is stored.\"" >&2;} -@@ -12154,8 +14159,8 @@ +@@ -12268,8 +14293,8 @@ _ACEOF @@ -14162,7 +14247,7 @@ if test "${mutt_cv_worldwrite+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12181,13 +14186,22 @@ +@@ -12296,13 +14321,22 @@ } _ACEOF rm -f conftest$ac_exeext @@ -14189,7 +14274,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12200,11 +14214,13 @@ +@@ -12315,11 +14349,13 @@ ( exit $ac_status ) mutt_cv_worldwrite=no fi @@ -14206,7 +14291,7 @@ mutt_cv_setgid=no if test $mutt_cv_worldwrite = yes; then -@@ -12215,8 +14231,8 @@ +@@ -12330,8 +14366,8 @@ else @@ -14217,7 +14302,7 @@ if test "${mutt_cv_groupwrite+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12242,13 +14258,22 @@ +@@ -12358,13 +14394,22 @@ } _ACEOF rm -f conftest$ac_exeext @@ -14244,7 +14329,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12261,11 +14286,13 @@ +@@ -12377,11 +14422,13 @@ ( exit $ac_status ) mutt_cv_groupwrite=no fi @@ -14261,7 +14346,7 @@ if test $mutt_cv_groupwrite = yes; then -@@ -12283,11 +14310,11 @@ +@@ -12399,11 +14446,11 @@ fi fi @@ -14277,7 +14362,7 @@ if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ || test "x$mutt_cv_external_dotlock" = "xyes" -@@ -12305,18 +14332,18 @@ +@@ -12421,18 +14468,18 @@ @@ -14304,7 +14389,7 @@ docdir=$mutt_cv_docdir -@@ -12332,10 +14359,9 @@ +@@ -12448,10 +14495,9 @@ @@ -14317,7 +14402,7 @@ if test $withval != no; then cat >>confdefs.h <<_ACEOF -@@ -12344,15 +14370,15 @@ +@@ -12460,15 +14506,15 @@ fi fi @@ -14337,7 +14422,7 @@ cat >>confdefs.h <<\_ACEOF #define USE_POP 1 -@@ -12363,12 +14389,12 @@ +@@ -12480,12 +14526,12 @@ need_md5="yes" fi @@ -14354,7 +14439,7 @@ cat >>confdefs.h <<\_ACEOF #define USE_IMAP 1 -@@ -12381,7 +14407,8 @@ +@@ -12498,7 +14544,8 @@ need_md5="yes" fi @@ -14364,7 +14449,7 @@ if test x$need_imap = xyes; then -@@ -12404,18 +14431,19 @@ +@@ -12521,18 +14568,19 @@ for ac_header in sys/select.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -14392,7 +14477,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -12426,24 +14454,36 @@ +@@ -12543,24 +14591,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -14437,7 +14522,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12452,15 +14492,16 @@ +@@ -12569,15 +14629,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14460,7 +14545,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -12469,8 +14510,13 @@ +@@ -12586,8 +14647,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -14476,7 +14561,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -12494,9 +14540,10 @@ +@@ -12611,9 +14677,10 @@ ac_header_preproc=no fi @@ -14489,7 +14574,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -12520,25 +14567,19 @@ +@@ -12637,25 +14704,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -14522,7 +14607,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -12550,8 +14591,8 @@ +@@ -12667,8 +14728,8 @@ done @@ -14533,7 +14618,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -12563,11 +14604,11 @@ +@@ -12680,11 +14741,11 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "socklen_t" >/dev/null 2>&1; then @@ -14549,7 +14634,7 @@ cat >>confdefs.h <<\_ACEOF #define socklen_t int -@@ -12576,8 +14617,8 @@ +@@ -12693,8 +14754,8 @@ fi rm -f conftest* @@ -14560,7 +14645,7 @@ if test "${ac_cv_func_gethostent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12604,53 +14645,59 @@ +@@ -12721,53 +14782,59 @@ #undef gethostent @@ -14639,7 +14724,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12659,19 +14706,20 @@ +@@ -12776,19 +14843,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14666,7 +14751,7 @@ if test "${ac_cv_lib_nsl_gethostent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12684,40 +14732,52 @@ +@@ -12801,40 +14869,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -14731,7 +14816,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12726,14 +14786,15 @@ +@@ -12843,14 +14923,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14751,7 +14836,7 @@ if test $ac_cv_lib_nsl_gethostent = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 -@@ -12745,8 +14806,8 @@ +@@ -12862,8 +14943,8 @@ fi @@ -14762,7 +14847,7 @@ if test "${ac_cv_func_setsockopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12773,53 +14834,59 @@ +@@ -12890,53 +14971,59 @@ #undef setsockopt @@ -14841,7 +14926,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12828,19 +14895,20 @@ +@@ -12945,19 +15032,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14868,7 +14953,7 @@ if test "${ac_cv_lib_socket_setsockopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -12853,40 +14921,52 @@ +@@ -12970,40 +15058,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -14933,7 +15018,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -12895,14 +14975,15 @@ +@@ -13012,14 +15112,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14953,7 +15038,7 @@ if test $ac_cv_lib_socket_setsockopt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 -@@ -12918,9 +14999,9 @@ +@@ -13035,9 +15136,9 @@ for ac_func in getaddrinfo do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -14966,7 +15051,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -12946,53 +15027,59 @@ +@@ -13063,53 +15164,59 @@ #undef $ac_func @@ -15045,7 +15130,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13001,13 +15088,15 @@ +@@ -13118,13 +15225,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15065,7 +15150,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -13026,13 +15115,13 @@ +@@ -13143,13 +15252,13 @@ @@ -15083,7 +15168,7 @@ if test "$gss_prefix" != "no" then if test "$need_imap" = "yes" -@@ -13051,8 +15140,8 @@ +@@ -13168,8 +15277,8 @@ fi # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 @@ -15094,7 +15179,7 @@ if test "${ac_cv_path_KRB5CFGPATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13067,28 +15156,29 @@ +@@ -13184,28 +15293,29 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -15130,7 +15215,7 @@ if test "$KRB5CFGPATH" != "none" then GSSAPI_CFLAGS="$CPPFLAGS `$KRB5CFGPATH --cflags gssapi`" -@@ -13107,8 +15197,8 @@ +@@ -13224,8 +15334,8 @@ LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS" fi @@ -15141,7 +15226,7 @@ if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13121,40 +15211,52 @@ +@@ -13238,40 +15348,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -15206,7 +15291,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13163,14 +15265,15 @@ +@@ -13280,14 +15402,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15226,7 +15311,7 @@ if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then GSSAPI_IMPL="MIT", -@@ -13181,8 +15284,8 @@ +@@ -13298,8 +15421,8 @@ if test "$GSSAPI_IMPL" = "none" then @@ -15237,7 +15322,7 @@ if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13195,40 +15298,52 @@ +@@ -13312,40 +15435,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -15302,7 +15387,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13237,14 +15352,15 @@ +@@ -13354,14 +15489,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15322,7 +15407,7 @@ if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then GSSAPI_IMPL="Heimdal" -@@ -13257,8 +15373,8 @@ +@@ -13374,8 +15510,8 @@ if test "$GSSAPI_IMPL" = "none" then @@ -15333,7 +15418,7 @@ if test "${ac_cv_lib_gssapi_krb5_g_order_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13271,40 +15387,52 @@ +@@ -13388,40 +15524,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -15398,7 +15483,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13313,14 +15441,15 @@ +@@ -13430,14 +15578,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15418,7 +15503,7 @@ if test $ac_cv_lib_gssapi_krb5_g_order_init = yes; then GSSAPI_IMPL="OldMIT", -@@ -13335,10 +15464,10 @@ +@@ -13452,10 +15601,10 @@ LDFLAGS="$saved_LDFLAGS" LIBS="$saved_LIBS" @@ -15433,7 +15518,7 @@ if test "$GSSAPI_IMPL" = "none" then cat >confcache <<\_ACEOF -@@ -13359,44 +15488,63 @@ +@@ -13476,44 +15625,63 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -15515,7 +15600,7 @@ fi if test "$GSSAPI_IMPL" = "Heimdal" then -@@ -13432,10 +15580,9 @@ +@@ -13549,10 +15717,9 @@ @@ -15528,7 +15613,7 @@ then if test "$need_socket" != "yes"; then { { echo "$as_me:$LINENO: error: SSL support is only useful with POP or IMAP support" >&5 -@@ -13451,8 +15598,8 @@ +@@ -13568,8 +15735,8 @@ saved_LIBS="$LIBS" @@ -15539,7 +15624,7 @@ if test "${ac_cv_lib_crypto_X509_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13465,40 +15612,52 @@ +@@ -13582,40 +15749,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -15604,7 +15689,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13507,14 +15666,15 @@ +@@ -13624,14 +15803,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15624,7 +15709,7 @@ if test $ac_cv_lib_crypto_X509_new = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPTO 1 -@@ -13529,8 +15689,8 @@ +@@ -13646,8 +15826,8 @@ fi @@ -15635,7 +15720,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13543,40 +15703,52 @@ +@@ -13660,40 +15840,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -15700,7 +15785,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13585,14 +15757,15 @@ +@@ -13702,14 +15894,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15720,7 +15805,7 @@ if test $ac_cv_lib_ssl_SSL_new = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSSL 1 -@@ -13612,9 +15785,9 @@ +@@ -13729,9 +15922,9 @@ for ac_func in RAND_status RAND_egd do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -15733,7 +15818,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -13640,53 +15813,59 @@ +@@ -13757,53 +15950,59 @@ #undef $ac_func @@ -15812,7 +15897,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13695,13 +15874,15 @@ +@@ -13812,13 +16011,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15832,7 +15917,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -13728,16 +15909,17 @@ +@@ -13845,16 +16046,17 @@ fi @@ -15855,7 +15940,7 @@ if test "$gnutls_prefix" != "no" -a x"$need_ssl" != xyes then if test "$need_socket" != "yes" -@@ -13757,8 +15939,8 @@ +@@ -13874,8 +16076,8 @@ # Extract the first word of "libgnutls-config", so it can be a program name with args. set dummy libgnutls-config; ac_word=$2 @@ -15866,7 +15951,7 @@ if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -13773,30 +15955,31 @@ +@@ -13890,30 +16092,31 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -15906,7 +15991,7 @@ no_libgnutls="" if test "$LIBGNUTLS_CONFIG" = "no" ; then no_libgnutls=yes -@@ -13878,13 +16061,22 @@ +@@ -13995,13 +16198,22 @@ _ACEOF rm -f conftest$ac_exeext @@ -15933,7 +16018,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13897,31 +16089,34 @@ +@@ -14014,31 +16226,34 @@ ( exit $ac_status ) no_libgnutls=yes fi @@ -15979,7 +16064,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13932,24 +16127,36 @@ +@@ -14049,24 +16264,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -16024,7 +16109,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -13958,15 +16165,16 @@ +@@ -14075,15 +16302,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16047,7 +16132,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13975,8 +16183,13 @@ +@@ -14092,8 +16320,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -16063,7 +16148,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -14000,9 +16213,10 @@ +@@ -14117,9 +16350,10 @@ ac_header_preproc=no fi @@ -16076,7 +16161,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -14026,25 +16240,19 @@ +@@ -14143,25 +16377,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -16109,7 +16194,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -14076,8 +16284,8 @@ +@@ -14193,8 +16421,8 @@ if test -f conf.libgnutlstest ; then : else @@ -16120,7 +16205,7 @@ fi if test "$LIBGNUTLS_CONFIG" = "no" ; then echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" -@@ -14112,24 +16320,36 @@ +@@ -14229,24 +16457,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -16165,7 +16250,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14147,12 +16367,13 @@ +@@ -14264,12 +16504,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16181,7 +16266,7 @@ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" -@@ -14182,10 +16403,9 @@ +@@ -14299,10 +16540,9 @@ @@ -16194,7 +16279,7 @@ if test "$with_sasl" != "no" then if test "$need_socket" != "yes" -@@ -14204,8 +16424,8 @@ +@@ -14321,8 +16561,8 @@ saved_LIBS="$LIBS" @@ -16205,7 +16290,7 @@ if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -14218,40 +16438,52 @@ +@@ -14335,40 +16575,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -16270,7 +16355,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14260,14 +16492,15 @@ +@@ -14377,14 +16629,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16290,7 +16375,7 @@ if test $ac_cv_lib_sasl2_sasl_client_init = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSASL2 1 -@@ -14291,10 +16524,10 @@ +@@ -14408,10 +16661,10 @@ _ACEOF need_sasl=yes @@ -16303,7 +16388,7 @@ if test x$need_sasl = xyes; then -@@ -14307,10 +16540,9 @@ +@@ -14424,10 +16677,9 @@ @@ -16316,7 +16401,7 @@ if test "$with_idn" != "no" ; then if test "$with_idn" != "yes" ; then CPPFLAGS="$CPPFLAGS -I$with_idn/include" -@@ -14319,12 +16551,13 @@ +@@ -14436,12 +16688,13 @@ fi @@ -16333,7 +16418,7 @@ if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -14337,40 +16570,52 @@ +@@ -14454,40 +16707,52 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -16398,7 +16483,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14379,14 +16624,15 @@ +@@ -14496,14 +16761,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16418,7 +16503,7 @@ if test $ac_cv_lib_idn_stringprep_check_version = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBIDN 1 -@@ -14401,9 +16647,9 @@ +@@ -14518,9 +16784,9 @@ for ac_func in idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -16431,7 +16516,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -14429,53 +16675,59 @@ +@@ -14546,53 +16812,59 @@ #undef $ac_func @@ -16510,7 +16595,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14484,13 +16736,15 @@ +@@ -14601,13 +16873,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16530,7 +16615,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -14504,9 +16758,9 @@ +@@ -14621,9 +16895,9 @@ for ac_func in idna_to_ascii_from_utf8 idna_to_ascii_8z do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -16543,7 +16628,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -14532,53 +16786,59 @@ +@@ -14649,53 +16923,59 @@ #undef $ac_func @@ -16622,7 +16707,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14587,13 +16847,15 @@ +@@ -14704,13 +16984,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16642,7 +16727,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -14607,9 +16869,9 @@ +@@ -14724,9 +17006,9 @@ for ac_func in idna_to_ascii_lz idna_to_ascii_from_locale do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -16655,7 +16740,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -14635,53 +16897,59 @@ +@@ -14752,53 +17034,59 @@ #undef $ac_func @@ -16734,7 +16819,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14690,13 +16958,15 @@ +@@ -14807,13 +17095,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16754,7 +16839,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -14708,10 +16978,9 @@ +@@ -14825,10 +17115,9 @@ fi @@ -16767,7 +16852,7 @@ cat >>confdefs.h <<\_ACEOF #define DEBUG 1 -@@ -14719,26 +16988,27 @@ +@@ -14836,26 +17125,27 @@ fi @@ -16804,7 +16889,7 @@ if test $mutt_cv_fcntl = yes; then -@@ -14748,8 +17018,8 @@ +@@ -14865,8 +17155,8 @@ fi @@ -16815,7 +16900,7 @@ ac_cv_dirent_d_ino=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -14767,24 +17037,36 @@ +@@ -14884,24 +17174,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -16860,7 +16945,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14793,8 +17075,10 @@ +@@ -14910,8 +17212,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -16872,7 +16957,7 @@ conftest$ac_exeext conftest.$ac_ext if test x$ac_cv_dirent_d_ino = xyes ; then -@@ -14803,15 +17087,15 @@ +@@ -14920,15 +17224,15 @@ _ACEOF fi @@ -16894,7 +16979,7 @@ if test $mutt_cv_inodesort = yes; then -@@ -14822,71 +17106,82 @@ +@@ -14939,71 +17243,82 @@ fi mutt_cv_warnings=yes @@ -17000,7 +17085,7 @@ cat >>confdefs.h <<_ACEOF #define EXECSHELL "$withval" -@@ -14903,12 +17198,12 @@ +@@ -15020,12 +17335,12 @@ #define EXECSHELL "/bin/sh" _ACEOF @@ -17017,7 +17102,7 @@ cat >>confdefs.h <<\_ACEOF #define EXACT_ADDRESS 1 -@@ -14916,12 +17211,12 @@ +@@ -15033,12 +17348,12 @@ fi @@ -17034,7 +17119,7 @@ cat >>confdefs.h <<\_ACEOF #define USE_HCACHE 1 -@@ -14936,16 +17231,16 @@ +@@ -15053,16 +17368,16 @@ ac_prefer_qdbm=yes @@ -17057,7 +17142,7 @@ if test "${ac_cv_vlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -14967,24 +17262,36 @@ +@@ -15084,24 +17399,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -17102,7 +17187,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -14993,27 +17300,29 @@ +@@ -15110,27 +17437,29 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17141,7 +17226,7 @@ if test "${ac_cv_gdbmopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15035,24 +17344,36 @@ +@@ -15152,24 +17481,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -17186,7 +17271,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15061,22 +17382,24 @@ +@@ -15178,22 +17519,24 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17218,7 +17303,7 @@ if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" for d in $ac_bdb_prefix; do -@@ -15086,8 +17409,8 @@ +@@ -15203,8 +17546,8 @@ done done BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" @@ -17229,7 +17314,7 @@ for d in $bdbpfx; do BDB_INCLUDE_DIR="" BDB_LIB_DIR="" -@@ -15121,24 +17444,36 @@ +@@ -15238,24 +17581,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -17274,7 +17359,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15151,8 +17486,10 @@ +@@ -15268,8 +17623,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17286,7 +17371,7 @@ conftest$ac_exeext conftest.$ac_ext done test x$ac_cv_dbcreate = xyes && break -@@ -15162,11 +17499,11 @@ +@@ -15279,11 +17636,11 @@ test x$BDB_LIB != x && break done if test x$ac_cv_dbcreate = xyes; then @@ -17302,7 +17387,7 @@ fi fi -@@ -15200,7 +17537,8 @@ +@@ -15317,7 +17674,8 @@ { (exit 1); exit 1; }; } fi fi @@ -17312,7 +17397,7 @@ if test "$need_md5" = "yes" then -@@ -15213,17 +17551,17 @@ +@@ -15330,17 +17688,17 @@ @@ -17336,7 +17421,7 @@ if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15234,36 +17572,49 @@ +@@ -15351,36 +17709,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -17396,7 +17481,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15272,24 +17623,25 @@ +@@ -15389,24 +17760,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17429,7 +17514,7 @@ if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15300,36 +17652,49 @@ +@@ -15417,36 +17789,49 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -17489,7 +17574,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15338,26 +17703,27 @@ +@@ -15455,26 +17840,27 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17524,7 +17609,7 @@ if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15372,29 +17738,42 @@ +@@ -15489,29 +17875,42 @@ main () { char *p = (char *) alloca (2 * sizeof (int)); @@ -17575,7 +17660,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15403,13 +17782,14 @@ +@@ -15520,13 +17919,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17594,7 +17679,7 @@ if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -15418,8 +17798,8 @@ +@@ -15535,8 +17935,8 @@ fi @@ -17605,7 +17690,7 @@ if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15454,29 +17834,42 @@ +@@ -15571,29 +17971,42 @@ main () { char *p = (char *) alloca (1); @@ -17656,7 +17741,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15485,13 +17878,14 @@ +@@ -15602,13 +18015,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17675,7 +17760,7 @@ if test $ac_cv_func_alloca_works = yes; then -@@ -15505,15 +17899,15 @@ +@@ -15622,15 +18036,15 @@ # 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. @@ -17694,7 +17779,7 @@ if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15523,7 +17917,7 @@ +@@ -15640,7 +18054,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -17703,7 +17788,7 @@ webecray #else wenotbecray -@@ -15539,14 +17933,14 @@ +@@ -15656,14 +18070,14 @@ rm -f conftest* fi @@ -17723,7 +17808,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -15572,53 +17966,59 @@ +@@ -15689,53 +18103,59 @@ #undef $ac_func @@ -17802,7 +17887,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15627,13 +18027,15 @@ +@@ -15744,13 +18164,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17822,7 +17907,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -@@ -15646,8 +18048,8 @@ +@@ -15763,8 +18185,8 @@ done fi @@ -17833,7 +17918,7 @@ if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -15660,6 +18062,7 @@ +@@ -15777,6 +18199,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -17841,7 +17926,7 @@ int find_stack_direction () { -@@ -15677,17 +18080,26 @@ +@@ -15794,17 +18217,26 @@ int main () { @@ -17873,7 +17958,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15700,11 +18112,13 @@ +@@ -15817,11 +18249,13 @@ ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi @@ -17890,7 +17975,7 @@ cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -@@ -15718,18 +18132,19 @@ +@@ -15835,18 +18269,19 @@ for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -17918,7 +18003,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -15740,24 +18155,36 @@ +@@ -15857,24 +18292,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -17963,7 +18048,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15766,15 +18193,16 @@ +@@ -15883,15 +18330,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17986,7 +18071,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -15783,8 +18211,13 @@ +@@ -15900,8 +18348,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -18002,7 +18087,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -15808,9 +18241,10 @@ +@@ -15925,9 +18378,10 @@ ac_header_preproc=no fi @@ -18015,7 +18100,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -15834,25 +18268,19 @@ +@@ -15951,25 +18405,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -18048,7 +18133,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -15868,9 +18296,9 @@ +@@ -15985,9 +18433,9 @@ for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -18061,7 +18146,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -15896,53 +18324,59 @@ +@@ -16013,53 +18461,59 @@ #undef $ac_func @@ -18140,7 +18225,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -15951,13 +18385,15 @@ +@@ -16068,13 +18522,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18160,7 +18245,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -15966,8 +18402,8 @@ +@@ -16083,8 +18539,8 @@ fi done @@ -18171,7 +18256,7 @@ if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -16062,15 +18498,15 @@ +@@ -16179,15 +18635,15 @@ /* First, make a file with some known garbage in it. */ data = (char *) malloc (pagesize); if (!data) @@ -18190,7 +18275,7 @@ close (fd); /* Next, try to mmap the file at a fixed address which already has -@@ -16078,17 +18514,17 @@ +@@ -16195,17 +18651,17 @@ we see the same garbage. */ fd = open ("conftest.mmap", O_RDWR); if (fd < 0) @@ -18213,7 +18298,7 @@ /* 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 -@@ -16097,24 +18533,33 @@ +@@ -16214,24 +18670,33 @@ *(data2 + i) = *(data2 + i) + 1; data3 = (char *) malloc (pagesize); if (!data3) @@ -18255,7 +18340,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16127,11 +18572,13 @@ +@@ -16244,11 +18709,13 @@ ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi @@ -18272,7 +18357,7 @@ if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF -@@ -16142,8 +18589,8 @@ +@@ -16259,8 +18726,8 @@ rm -f conftest.mmap @@ -18283,7 +18368,7 @@ if test "${ac_cv_gnu_library_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -16173,8 +18620,8 @@ +@@ -16290,8 +18757,8 @@ fi @@ -18294,7 +18379,7 @@ GLIBC21="$ac_cv_gnu_library_2_1" -@@ -16194,18 +18641,19 @@ +@@ -16311,18 +18778,19 @@ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -18322,7 +18407,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -16216,24 +18664,36 @@ +@@ -16333,24 +18801,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -18367,7 +18452,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16242,15 +18702,16 @@ +@@ -16359,15 +18839,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18390,7 +18475,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -16259,8 +18720,13 @@ +@@ -16376,8 +18857,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -18406,7 +18491,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -16284,9 +18750,10 @@ +@@ -16401,9 +18887,10 @@ ac_header_preproc=no fi @@ -18419,7 +18504,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -16310,25 +18777,19 @@ +@@ -16427,25 +18914,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -18452,7 +18537,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -16366,9 +18827,9 @@ +@@ -16483,9 +18964,9 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -18465,7 +18550,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -16394,53 +18855,59 @@ +@@ -16511,53 +18992,59 @@ #undef $ac_func @@ -18544,7 +18629,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16449,13 +18916,15 @@ +@@ -16566,13 +19053,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18564,7 +18649,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -16468,19 +18937,19 @@ +@@ -16585,19 +19074,19 @@ @@ -18590,7 +18675,7 @@ if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -16506,24 +18975,36 @@ +@@ -16623,24 +19112,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -18635,7 +18720,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16532,8 +19013,10 @@ +@@ -16649,8 +19150,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18647,7 +18732,7 @@ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" -@@ -16557,24 +19040,36 @@ +@@ -16674,24 +19177,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -18692,7 +18777,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16584,23 +19079,25 @@ +@@ -16701,23 +19216,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18723,7 +18808,7 @@ if test "${am_cv_proto_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -16633,24 +19130,36 @@ +@@ -16750,24 +19267,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -18768,7 +18853,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16659,17 +19168,18 @@ +@@ -16776,17 +19305,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18791,7 +18876,7 @@ cat >>confdefs.h <<_ACEOF #define ICONV_CONST $am_cv_proto_iconv_arg1 -@@ -16683,8 +19193,8 @@ +@@ -16800,8 +19330,8 @@ @@ -18802,7 +18887,7 @@ if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -16704,24 +19214,36 @@ +@@ -16821,24 +19351,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -18847,7 +18932,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16730,14 +19252,15 @@ +@@ -16847,14 +19389,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18867,7 +18952,7 @@ if test $am_cv_langinfo_codeset = yes; then cat >>confdefs.h <<\_ACEOF -@@ -16747,8 +19270,8 @@ +@@ -16864,8 +19407,8 @@ fi if test $ac_cv_header_locale_h = yes; then @@ -18878,7 +18963,7 @@ if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -16768,24 +19291,36 @@ +@@ -16885,24 +19428,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -18923,7 +19008,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16794,13 +19329,14 @@ +@@ -16911,13 +19466,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18942,7 +19027,7 @@ if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF -@@ -16809,17 +19345,17 @@ +@@ -16926,17 +19482,17 @@ fi fi @@ -18968,7 +19053,7 @@ BUILD_INCLUDED_LIBINTL=no -@@ -16832,18 +19368,18 @@ +@@ -16949,18 +19505,18 @@ #define ENABLE_NLS 1 _ACEOF @@ -18995,7 +19080,7 @@ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then -@@ -16853,17 +19389,17 @@ +@@ -16970,17 +19526,17 @@ if test "${ac_cv_header_libintl_h+set}" = set; then @@ -19019,7 +19104,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -16874,24 +19410,36 @@ +@@ -16991,24 +19547,36 @@ #include _ACEOF rm -f conftest.$ac_objext @@ -19064,7 +19149,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -16900,15 +19448,16 @@ +@@ -17017,15 +19585,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19087,7 +19172,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -16917,8 +19466,13 @@ +@@ -17034,8 +19603,13 @@ /* end confdefs.h. */ #include _ACEOF @@ -19103,7 +19188,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -16942,9 +19496,10 @@ +@@ -17059,9 +19633,10 @@ ac_header_preproc=no fi @@ -19116,7 +19201,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -16968,30 +19523,23 @@ +@@ -17085,30 +19660,23 @@ echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} @@ -19154,7 +19239,7 @@ if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17013,24 +19561,36 @@ +@@ -17130,24 +19698,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -19199,7 +19284,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -17039,17 +19599,18 @@ +@@ -17156,17 +19736,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19224,7 +19309,7 @@ if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17073,24 +19634,36 @@ +@@ -17190,24 +19771,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -19269,7 +19354,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -17099,14 +19672,15 @@ +@@ -17216,14 +19809,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19289,7 +19374,7 @@ fi if test "$gt_cv_func_gnugettext1_libc" = "yes" \ -@@ -17128,9 +19702,9 @@ +@@ -17245,9 +19839,9 @@ for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -19302,7 +19387,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -17156,53 +19730,59 @@ +@@ -17273,53 +19867,59 @@ #undef $ac_func @@ -19381,7 +19466,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -17211,13 +19791,15 @@ +@@ -17328,13 +19928,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19401,7 +19486,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -17230,8 +19812,8 @@ +@@ -17347,8 +19949,8 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -19412,7 +19497,7 @@ if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17257,17 +19839,17 @@ +@@ -17374,17 +19976,17 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then @@ -19436,7 +19521,7 @@ if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17282,33 +19864,34 @@ +@@ -17399,33 +20001,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -19479,7 +19564,7 @@ if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17334,11 +19917,11 @@ +@@ -17451,11 +20054,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -19495,7 +19580,7 @@ fi -@@ -17358,8 +19941,8 @@ +@@ -17475,8 +20078,8 @@ INTLOBJS="\$(GETTOBJS)" # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -19506,7 +19591,7 @@ if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17385,17 +19968,17 @@ +@@ -17502,17 +20105,17 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then @@ -19530,7 +19615,7 @@ if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17410,32 +19993,33 @@ +@@ -17527,32 +20130,33 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -19572,7 +19657,7 @@ if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17461,11 +20045,11 @@ +@@ -17578,11 +20182,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -19588,7 +19673,7 @@ fi -@@ -17480,8 +20064,8 @@ +@@ -17597,8 +20201,8 @@ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else @@ -19599,7 +19684,7 @@ GMSGFMT=":" fi fi -@@ -17490,15 +20074,15 @@ +@@ -17607,15 +20211,15 @@ if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else @@ -19618,7 +19703,7 @@ -@@ -17510,8 +20094,8 @@ +@@ -17627,8 +20231,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -19629,7 +19714,7 @@ if test "${ac_cv_prog_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17524,33 +20108,35 @@ +@@ -17641,33 +20245,35 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -19672,7 +19757,7 @@ 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;; -@@ -17558,8 +20144,8 @@ +@@ -17675,8 +20281,8 @@ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac @@ -19683,7 +19768,7 @@ fi if test $ac_verc_fail = yes; then INTLBISON=: -@@ -17597,8 +20183,8 @@ +@@ -17714,8 +20320,8 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -19694,7 +19779,7 @@ NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no -@@ -17617,8 +20203,8 @@ +@@ -17734,8 +20340,8 @@ fi done LINGUAS=$NEW_LINGUAS @@ -19705,7 +19790,7 @@ fi if test -n "$LINGUAS"; then -@@ -17649,18 +20235,19 @@ +@@ -17766,18 +20372,19 @@ for ac_header in iconv.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -19733,7 +19818,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -17671,24 +20258,36 @@ +@@ -17788,24 +20395,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -19778,7 +19863,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -17697,15 +20296,16 @@ +@@ -17814,15 +20433,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -19801,7 +19886,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -17714,8 +20314,13 @@ +@@ -17831,8 +20451,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -19817,7 +19902,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -17739,9 +20344,10 @@ +@@ -17856,9 +20481,10 @@ ac_header_preproc=no fi @@ -19830,7 +19915,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -17765,33 +20371,27 @@ +@@ -17882,33 +20508,27 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -19873,7 +19958,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -17803,16 +20403,16 @@ +@@ -17920,16 +20540,16 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "typedef.*iconv_t" >/dev/null 2>&1; then @@ -19894,7 +19979,7 @@ fi rm -f conftest* -@@ -17821,8 +20421,8 @@ +@@ -17938,8 +20558,8 @@ done @@ -19905,7 +19990,7 @@ if test "${mutt_cv_iconv_good+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17854,13 +20454,22 @@ +@@ -17971,13 +20591,22 @@ _ACEOF rm -f conftest$ac_exeext @@ -19932,7 +20017,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -17873,20 +20482,22 @@ +@@ -17990,20 +20619,22 @@ ( exit $ac_status ) mutt_cv_iconv_good=no fi @@ -19960,7 +20045,7 @@ if test "${mutt_cv_iconv_nontrans+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -17919,13 +20530,22 @@ +@@ -18036,13 +20667,22 @@ _ACEOF rm -f conftest$ac_exeext @@ -19987,7 +20072,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -17938,12 +20558,14 @@ +@@ -18055,12 +20695,14 @@ ( exit $ac_status ) mutt_cv_iconv_nontrans=yes fi @@ -20005,7 +20090,7 @@ if test "$mutt_cv_iconv_nontrans" = yes; then cat >>confdefs.h <<\_ACEOF #define ICONV_NONTRANS 1 -@@ -17969,9 +20591,9 @@ +@@ -18086,9 +20728,9 @@ for ac_func in bind_textdomain_codeset do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -20018,7 +20103,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -17997,53 +20619,59 @@ +@@ -18114,53 +20756,59 @@ #undef $ac_func @@ -20097,7 +20182,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18052,13 +20680,15 @@ +@@ -18169,13 +20817,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20117,7 +20202,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -18076,18 +20706,19 @@ +@@ -18193,18 +20843,19 @@ for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -20145,7 +20230,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -18098,24 +20729,36 @@ +@@ -18215,24 +20866,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -20190,7 +20275,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18124,15 +20767,16 @@ +@@ -18241,15 +20904,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20213,7 +20298,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -18141,8 +20785,13 @@ +@@ -18258,8 +20922,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -20229,7 +20314,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -18166,9 +20815,10 @@ +@@ -18283,9 +20952,10 @@ ac_header_preproc=no fi @@ -20242,7 +20327,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -18192,25 +20842,19 @@ +@@ -18309,25 +20979,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -20275,7 +20360,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -18223,8 +20867,8 @@ +@@ -18340,8 +21004,8 @@ done @@ -20286,7 +20371,7 @@ if test "${mutt_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -18250,24 +20894,36 @@ +@@ -18367,24 +21031,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -20331,7 +20416,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18276,12 +20932,13 @@ +@@ -18393,12 +21069,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20349,7 +20434,7 @@ if test "$mutt_cv_wchar_t" = no; then -@@ -18291,8 +20948,8 @@ +@@ -18408,8 +21085,8 @@ fi @@ -20360,7 +20445,7 @@ if test "${mutt_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -18318,24 +20975,36 @@ +@@ -18435,24 +21112,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -20405,7 +20490,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18344,12 +21013,13 @@ +@@ -18461,12 +21150,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20423,7 +20508,7 @@ if test "$mutt_cv_wint_t" = no; then -@@ -18363,18 +21033,19 @@ +@@ -18480,18 +21170,19 @@ for ac_header in wctype.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -20451,7 +20536,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -18385,24 +21056,36 @@ +@@ -18502,24 +21193,36 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -20496,7 +20581,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18411,15 +21094,16 @@ +@@ -18528,15 +21231,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20519,7 +20604,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -18428,8 +21112,13 @@ +@@ -18545,8 +21249,13 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF @@ -20535,7 +20620,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -18453,9 +21142,10 @@ +@@ -18570,9 +21279,10 @@ ac_header_preproc=no fi @@ -20548,7 +20633,7 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -18479,25 +21169,19 @@ +@@ -18596,25 +21306,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} @@ -20581,7 +20666,7 @@ fi if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -18516,9 +21200,9 @@ +@@ -18633,9 +21337,9 @@ for ac_func in iswalnum iswalpha iswcntrl iswdigit do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -20594,7 +20679,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -18544,53 +21228,59 @@ +@@ -18661,53 +21365,59 @@ #undef $ac_func @@ -20673,7 +20758,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18599,13 +21289,15 @@ +@@ -18716,13 +21426,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20693,7 +20778,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -18623,9 +21315,9 @@ +@@ -18740,9 +21452,9 @@ for ac_func in iswgraph iswlower iswprint iswpunct iswspace iswupper do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -20706,7 +20791,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -18651,53 +21343,59 @@ +@@ -18768,53 +21480,59 @@ #undef $ac_func @@ -20785,7 +20870,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18706,13 +21404,15 @@ +@@ -18823,13 +21541,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20805,7 +20890,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -18727,9 +21427,9 @@ +@@ -18844,9 +21564,9 @@ for ac_func in iswxdigit towupper towlower do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -20818,7 +20903,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -@@ -18755,53 +21455,59 @@ +@@ -18872,53 +21592,59 @@ #undef $ac_func @@ -20897,7 +20982,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18810,13 +21516,15 @@ +@@ -18927,13 +21653,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20917,7 +21002,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -18826,8 +21534,8 @@ +@@ -18943,8 +21671,8 @@ done @@ -20928,7 +21013,7 @@ if test "${mutt_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -18853,24 +21561,36 @@ +@@ -18970,24 +21698,36 @@ } _ACEOF rm -f conftest.$ac_objext @@ -20973,7 +21058,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18879,12 +21599,13 @@ +@@ -18996,12 +21736,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20991,7 +21076,7 @@ if test "$mutt_cv_mbstate_t" = no; then -@@ -18896,15 +21617,15 @@ +@@ -19013,15 +21754,15 @@ wc_funcs=maybe @@ -21013,7 +21098,7 @@ if test "${mutt_cv_wc_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -18935,24 +21656,36 @@ +@@ -19052,24 +21793,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -21058,7 +21143,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -18961,12 +21694,14 @@ +@@ -19078,12 +21831,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -21076,7 +21161,7 @@ wc_funcs=$mutt_cv_wc_funcs fi -@@ -18978,8 +21713,8 @@ +@@ -19095,8 +21850,8 @@ fi @@ -21087,7 +21172,7 @@ if test "${mutt_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -18999,24 +21734,36 @@ +@@ -19116,24 +21871,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -21132,7 +21217,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -19025,13 +21772,14 @@ +@@ -19142,13 +21909,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -21151,7 +21236,7 @@ if test $mutt_cv_langinfo_codeset = yes; then cat >>confdefs.h <<\_ACEOF -@@ -19040,8 +21788,8 @@ +@@ -19157,8 +21925,8 @@ fi @@ -21162,7 +21247,7 @@ if test "${mutt_cv_langinfo_yesexpr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -19061,24 +21809,36 @@ +@@ -19178,24 +21946,36 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -21207,7 +21292,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -19087,13 +21847,14 @@ +@@ -19204,13 +21984,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -21226,7 +21311,7 @@ if test $mutt_cv_langinfo_yesexpr = yes; then cat >>confdefs.h <<\_ACEOF -@@ -19105,8 +21866,8 @@ +@@ -19222,8 +22003,8 @@ have_openjade="no" # Extract the first word of "ospcat", so it can be a program name with args. set dummy ospcat; ac_word=$2 @@ -21237,7 +21322,7 @@ if test "${ac_cv_path_OSPCAT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -19121,32 +21882,33 @@ +@@ -19238,32 +22019,33 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -21279,7 +21364,7 @@ dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"` DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\([^']*\)\/catalog'.*/\1/p"` # ospcat may spit out an absolute path without an SOIBASE -@@ -19156,17 +21918,18 @@ +@@ -19273,17 +22055,18 @@ fi if test -f $DSLROOT/print/docbook.dsl then @@ -21303,7 +21388,7 @@ 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 -@@ -19185,39 +21948,58 @@ +@@ -19302,39 +22085,58 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -21378,7 +21463,7 @@ fi fi rm -f confcache -@@ -19226,32 +22008,18 @@ +@@ -19343,32 +22145,18 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -21417,7 +21502,7 @@ done LIBOBJS=$ac_libobjs -@@ -19331,11 +22099,35 @@ +@@ -19448,11 +22236,35 @@ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' @@ -21455,7 +21540,7 @@ # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset -@@ -19344,8 +22136,43 @@ +@@ -19461,8 +22273,43 @@ fi @@ -21500,7 +21585,7 @@ PS1='$ ' PS2='> ' PS4='+ ' -@@ -19359,18 +22186,19 @@ +@@ -19476,18 +22323,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else @@ -21523,7 +21608,7 @@ as_basename=basename else as_basename=false -@@ -19378,159 +22206,120 @@ +@@ -19495,159 +22343,120 @@ # Name of the executable. @@ -21539,6 +21624,15 @@ - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` +- +- +-# PATH needs CR, and LINENO needs CR and PATH. +-# 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 + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q @@ -21553,15 +21647,6 @@ + } + s/.*/./; q'` -- --# PATH needs CR, and LINENO needs CR and PATH. --# 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 -- -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh @@ -21754,7 +21839,7 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: -@@ -19539,7 +22328,19 @@ +@@ -19656,7 +22465,19 @@ as_mkdir_p=false fi @@ -21775,7 +21860,7 @@ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -19548,31 +22349,14 @@ +@@ -19665,31 +22486,14 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -21811,7 +21896,7 @@ CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -19580,30 +22364,20 @@ +@@ -19697,30 +22501,20 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ @@ -21828,7 +21913,10 @@ -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi -- ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" + -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi @@ -21836,10 +21924,7 @@ -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - +- -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi @@ -21850,7 +21935,7 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -@@ -19630,19 +22404,21 @@ +@@ -19747,19 +22541,21 @@ $config_commands Report bugs to ." @@ -21878,7 +21963,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF -@@ -19653,39 +22429,24 @@ +@@ -19770,39 +22566,24 @@ do case $1 in --*=*) @@ -21924,7 +22009,7 @@ debug=: ;; --file | --fil | --fi | --f ) $ac_shift -@@ -19695,18 +22456,24 @@ +@@ -19812,18 +22593,24 @@ $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; @@ -21954,7 +22039,7 @@ esac shift -@@ -19722,48 +22489,60 @@ +@@ -19839,48 +22626,60 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then @@ -22036,7 +22121,7 @@ # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely -@@ -19775,397 +22554,502 @@ +@@ -19892,646 +22691,633 @@ fi # Have a temporary directory for convenience. Make it in the build tree @@ -22472,7 +22557,7 @@ +DSLROOT!$DSLROOT$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF - ++ + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then + break + elif $ac_last_try; then @@ -22489,7 +22574,7 @@ + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi -+ + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end @@ -22544,7 +22629,7 @@ +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 @@ -22552,7 +22637,7 @@ + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac ++ esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag @@ -22857,8 +22942,8 @@ +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g @@ -22867,15 +22952,15 @@ + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac - _ACEOF ++_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? - cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -@@ -20173,248 +23057,130 @@ + _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b @@ -22897,14 +22982,6 @@ - cat $tmp/out - rm -f $tmp/out - fi -- --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_HEADER section. --# +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t @@ -22926,6 +23003,14 @@ +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;} +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# +- -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# @@ -23016,19 +23101,7 @@ - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines - +- -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' @@ -23059,7 +23132,19 @@ -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed -- ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines + -# This sed command replaces #undef with comments. This is necessary, for +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for @@ -23226,7 +23311,7 @@ # Compute $ac_file's index in $config_headers. _am_stamp_count=1 for _am_header in $config_headers :; do -@@ -20425,135 +23191,39 @@ +@@ -20542,135 +23328,39 @@ _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done @@ -23388,7 +23473,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. -@@ -20563,18 +23233,29 @@ +@@ -20680,18 +23370,29 @@ # each Makefile.in and add a new line on top of each file to say so. # So let's grep whole file. if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then @@ -23426,7 +23511,7 @@ else continue fi -@@ -20596,49 +23277,76 @@ +@@ -20713,49 +23414,76 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -23530,7 +23615,7 @@ # Support "outfile[:infile[:infile...]]" case "$ac_file" in *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -@@ -20667,11 +23375,10 @@ +@@ -20784,11 +23512,10 @@ ;; esac done ;; @@ -23544,24 +23629,154 @@ { (exit 0); exit 0; } _ACEOF ---- imap/Makefile.in.orig -+++ imap/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ +--- contrib/Makefile.in.orig ++++ contrib/Makefile.in +@@ -96,6 +96,7 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GPGME_CONFIG = @GPGME_CONFIG@ ++GREP = @GREP@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -155,10 +156,7 @@ + USE_SSL_TRUE = @USE_SSL_TRUE@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ +-ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ +@@ -173,24 +171,30 @@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ ++datarootdir = @datarootdir@ + docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ +@@ -220,9 +224,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign contrib/Makefile ++ $(AUTOMAKE) --gnu contrib/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +--- doc/Makefile.in.orig ++++ doc/Makefile.in +@@ -97,6 +97,7 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GPGME_CONFIG = @GPGME_CONFIG@ ++GREP = @GREP@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -156,10 +157,7 @@ + USE_SSL_TRUE = @USE_SSL_TRUE@ + VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ +-ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ +@@ -174,24 +172,30 @@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ ++datarootdir = @datarootdir@ + docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ +@@ -245,9 +249,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign doc/Makefile ++ $(AUTOMAKE) --gnu doc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -431,13 +435,13 @@ - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,8 +15,6 @@ - @SET_MAKE@ + check: + manual.txt: manual.html +- /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@ ++ -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@ + manual.html: $(srcdir)/html.xsl stamp-doc-xml +- xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml ++ -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml --SOURCES = $(libimap_a_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -126,6 +124,7 @@ + stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml +- xsltproc --nonet $(srcdir)/chunk.xsl manual.xml ++ -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml + touch stamp-doc-chunked + + manual.pdf: manual.tex +--- imap/Makefile.in.orig ++++ imap/Makefile.in +@@ -124,6 +124,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPGME_CONFIG = @GPGME_CONFIG@ @@ -23569,7 +23784,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -185,10 +184,7 @@ +@@ -183,10 +184,7 @@ USE_SSL_TRUE = @USE_SSL_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ @@ -23580,7 +23795,7 @@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ -@@ -203,24 +199,30 @@ +@@ -201,24 +199,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ @@ -23613,12 +23828,6 @@ sysconfdir = @sysconfdir@ --- m4/Makefile.in.orig +++ m4/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -95,6 +95,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -23669,7 +23878,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -@@ -220,9 +224,9 @@ +@@ -207,9 +211,9 @@ exit 1;; \ esac; \ done; \ diff --git a/debian/patches/series b/debian/patches/series index af9dccf..31c4104 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,6 +18,7 @@ debian-specific/dont_document_not_present_features.diff -p0 misc/define-pgp_getkeys_command.diff -p0 misc/autotools-update.diff -p0 -misc/fix-reldate-location.diff -p0 + +upstream/thread_pattern_in_UPDATING.diff -p0 # not-applied/patch-1.5.8.hr.sensible_browser_position.3 diff --git a/debian/patches/upstream/thread_pattern_in_UPDATING.diff b/debian/patches/upstream/thread_pattern_in_UPDATING.diff new file mode 100644 index 0000000..20e6b27 --- /dev/null +++ b/debian/patches/upstream/thread_pattern_in_UPDATING.diff @@ -0,0 +1,14 @@ +--- UPDATING.orig ++++ UPDATING +@@ -4,6 +4,11 @@ + The keys used are: + !: modified feature, -: deleted feature, +: new feature + ++1.5.13 (2006-08-14): ++ ++ + thread patterns. Use ~(...) to match all threads that ++ contain a message that matches ... ++ + 1.5.12 (2006-07-14): + + - $imap_cachedir replaced with $message_cachedir