X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4c13acfc45a942f5f481ce6a3dfcea461da505ad..ed58a90a3935cdc925786acdc46a89f7e5ff8403:/debian/patches/autotools-update?ds=sidebyside diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update index eeccd6c..3e29601 100644 --- a/debian/patches/autotools-update +++ b/debian/patches/autotools-update @@ -1,6 +1,6 @@ -diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in ---- mutt-1.5.8.orig/Makefile.in 2005-02-12 21:58:25.000000000 +0100 -+++ mutt-1.5.8/Makefile.in 2005-03-10 07:55:36.122707840 +0100 +diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in +--- mutt-1.5.9.orig/Makefile.in 2005-03-13 17:37:46.000000000 +0100 ++++ mutt-1.5.9/Makefile.in 2005-04-03 19:58:55.328383264 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -12,6 +12,24 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +@@ -15,7 +15,7 @@ + @SET_MAKE@ + + +-SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) ++SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -40,7 +40,7 @@ + build_triplet = @build@ + host_triplet = @host@ + EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ +- makedoc$(EXEEXT) ++ pgpewrap$(EXEEXT) makedoc$(EXEEXT) + bin_PROGRAMS = mutt$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Muttrc.head.in \ @@ -76,10 +76,10 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ @@ -27,16 +45,30 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ handler.$(OBJEXT) hash.$(OBJEXT) hdrline.$(OBJEXT) \ headers.$(OBJEXT) help.$(OBJEXT) hook.$(OBJEXT) \ -@@ -286,7 +286,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap - @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap - SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) -@@ -294,7 +294,7 @@ +@@ -99,6 +99,10 @@ + am__DEPENDENCIES_1 = + am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT) + mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS) ++pgpewrap_SOURCES = pgpewrap.c ++pgpewrap_OBJECTS = pgpewrap.$(OBJEXT) ++pgpewrap_LDADD = $(LDADD) ++pgpewrap_DEPENDENCIES = @LIBOBJS@ + am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ + lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \ + pgppacket.$(OBJEXT) ascii.$(OBJEXT) +@@ -113,9 +117,9 @@ + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) \ +- $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) ++ $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) + DIST_SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) \ +- $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) \ ++ $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c \ + $(pgpring_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +@@ -294,7 +298,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 \ @@ -45,7 +77,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in 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 \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -@@ -325,7 +325,7 @@ +@@ -325,7 +329,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 \ @@ -54,16 +86,17 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in 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 \ -@@ -337,7 +337,7 @@ - makedoc.c stamp-doc-rc README.SSL smime.h\ - muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ - ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ -- snprintf.c regex.c -+ snprintf.c regex.c crypt-gpgme.h - - EXTRA_SCRIPTS = smime_keys - mutt_dotlock_SOURCES = mutt_dotlock.c -@@ -487,6 +487,7 @@ +@@ -441,6 +445,9 @@ + mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES) + @rm -f mutt_dotlock$(EXEEXT) + $(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS) ++pgpewrap$(EXEEXT): $(pgpewrap_OBJECTS) $(pgpewrap_DEPENDENCIES) ++ @rm -f pgpewrap$(EXEEXT) ++ $(LINK) $(pgpewrap_LDFLAGS) $(pgpewrap_OBJECTS) $(pgpewrap_LDADD) $(LIBS) + pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) + @rm -f pgpring$(EXEEXT) + $(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS) +@@ -487,6 +494,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@ @@ -71,7 +104,15 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ -@@ -597,7 +598,13 @@ +@@ -542,6 +550,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patchlist.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgp.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpewrap.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpinvoke.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpkey.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgplib.Po@am__quote@ +@@ -597,7 +606,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -86,7 +127,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -609,7 +616,7 @@ +@@ -609,7 +624,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -95,7 +136,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -@@ -617,7 +624,13 @@ +@@ -617,7 +632,13 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @@ -110,7 +151,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -638,7 +651,7 @@ +@@ -638,7 +659,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -119,10 +160,44 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -Only in mutt-1.5.8: autom4te.cache -diff -ru mutt-1.5.8.orig/config.h.in mutt-1.5.8/config.h.in ---- mutt-1.5.8.orig/config.h.in 2005-02-12 21:57:46.000000000 +0100 -+++ mutt-1.5.8/config.h.in 2005-03-10 07:55:30.238718258 +0100 +@@ -914,8 +935,9 @@ + + install-data-am: install-data-local + +-install-exec-am: install-binPROGRAMS install-binSCRIPTS \ +- install-exec-local ++install-exec-am: install-binPROGRAMS install-binSCRIPTS ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + + install-info: install-info-recursive + +@@ -956,9 +978,9 @@ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-binSCRIPTS \ + install-data install-data-am install-data-local install-exec \ +- install-exec-am install-exec-local install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ install-exec-am install-exec-hook install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +@@ -993,7 +1015,7 @@ + patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh + $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c + +-install-exec-local: ++install-exec-hook: + if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \ + rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ + ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ +Only in mutt-1.5.9: autom4te.cache +diff -ru mutt-1.5.9.orig/config.h.in mutt-1.5.9/config.h.in +--- mutt-1.5.9.orig/config.h.in 2005-03-13 17:37:09.000000000 +0100 ++++ mutt-1.5.9/config.h.in 2005-04-03 19:58:50.546379495 +0200 @@ -498,6 +498,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -133,108 +208,19 @@ diff -ru mutt-1.5.8.orig/config.h.in mutt-1.5.8/config.h.in /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK -Only in mutt-1.5.8: config.h.in~ -diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure ---- mutt-1.5.8.orig/configure 2005-02-12 21:57:29.000000000 +0100 -+++ mutt-1.5.8/configure 2005-03-10 07:55:37.063546277 +0100 -@@ -852,51 +852,55 @@ - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --disable-largefile omit support for large files -- --enable-gpgme Enable GPGME support -- --disable-pgp Disable PGP support -- --disable-smime Disable SMIME support -- --enable-external-dotlock Force use of an external dotlock program -- --enable-pop Enable POP3 support -- --enable-imap Enable IMAP support -- --enable-debug Enable debugging support -- --enable-flock Use flock() to lock files -- --disable-fcntl Do NOT use fcntl() to lock files -- --enable-inodesort Read files in maildir folders sorted by inode. -- --disable-warnings Turn off compiler warnings (not recommended) -- --enable-nfs-fix Work around an NFS with broken attributes caching -- --enable-buffy-size Use file size attribute instead of access time -- --enable-mailtool Enable Sun mailtool attachments support -- --enable-locales-fix The result of isprint() is unreliable -- --enable-exact-address Enable regeneration of email addresses -- --enable-hcache Enable header caching -- --disable-iconv Disable iconv support -- --disable-nls Do not use Native Language Support -+ --enable-gpgme Enable GPGME support -+ --disable-pgp Disable PGP support -+ --disable-smime Disable SMIME support -+ --enable-external-dotlock -+ Force use of an external dotlock program -+ --enable-pop Enable POP3 support -+ --enable-imap Enable IMAP support -+ --enable-debug Enable debugging support -+ --enable-flock Use flock() to lock files -+ --disable-fcntl Do NOT use fcntl() to lock files -+ --enable-inodesort Read files in maildir folders sorted by inode -+ --disable-warnings Turn off compiler warnings (not recommended) -+ --enable-nfs-fix Work around an NFS with broken attributes caching -+ --enable-buffy-size Use file size attribute instead of access time -+ --enable-mailtool Enable Sun mailtool attachments support -+ --enable-locales-fix The result of isprint() is unreliable +Only in mutt-1.5.9: config.h.in~ +diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure +--- mutt-1.5.9.orig/configure 2005-03-13 17:36:32.000000000 +0100 ++++ mutt-1.5.9/configure 2005-04-03 19:58:56.255190487 +0200 +@@ -868,6 +868,7 @@ + --enable-buffy-size Use file size attribute instead of access time + --enable-mailtool Enable Sun mailtool attachments support + --enable-locales-fix The result of isprint() is unreliable + --enable-compressed Enable compressed folders support -+ --enable-exact-address Enable regeneration of email addresses -+ --enable-hcache Enable header caching -+ --disable-iconv Disable iconv support -+ --disable-nls Do not use Native Language Support - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-gpgme-prefix=PFX prefix where GPGME is installed (optional) -- --with-mixmaster=PATH Include Mixmaster support -- --with-slang=DIR Use S-Lang instead of ncurses -- --with-curses=DIR Where ncurses is installed -- --with-regex Use the GNU regex library -- --with-homespool=FILE File in user's directory where new mail is spooled -- --with-mailpath=DIR Directory where spool mailboxes are located -- --with-docdir=PATH Specify where to put the documentation -- --with-domain=DOMAIN Specify your DNS domain name -- --with-gss=PFX Compile in GSSAPI authentication for IMAP -- --with-ssl=PFX Compile in SSL support for POP/IMAP -- --with-nss=PFX Compile in SSL support for POP/IMAP via NSS -- --with-gnutls=PFX Enable SSL support using gnutls -- --with-sasl=PFX Use Cyrus SASL library for POP/IMAP authentication -- --with-sasl2=PFX Use Cyrus SASL library version 2 for POP/IMAP authentication -- --with-idn=PFX Use GNU libidn for domain names -- --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) -- --without-gdbm Get rid of gdbm even if it is available -- --with-bdb=DIR Use BerkeleyDB4 if gdbm is not available -- --with-libiconv-prefix=DIR Search for libiconv in DIR/include and DIR/lib -- --with-included-gettext Use the GNU gettext library included here -- --without-wc-funcs Do not use the system's wchar_t functions -+ --with-gpgme-prefix=PFX prefix where GPGME is installed (optional) -+ --with-mixmaster=PATH Include Mixmaster support -+ --with-slang=DIR Use S-Lang instead of ncurses -+ --with-curses=DIR Where ncurses is installed -+ --with-regex Use the GNU regex library -+ --with-homespool=FILE File in user's directory where new mail is spooled -+ --with-mailpath=DIR Directory where spool mailboxes are located -+ --with-docdir=PATH Specify where to put the documentation -+ --with-domain=DOMAIN Specify your DNS domain name -+ --with-gss=PFX Compile in GSSAPI authentication for IMAP -+ --with-ssl=PFX Compile in SSL support for POP/IMAP -+ --with-nss=PFX Compile in SSL support for POP/IMAP via NSS -+ --with-gnutls=PFX Enable SSL support using gnutls -+ --with-sasl=PFX Use Cyrus SASL library for POP/IMAP authentication -+ --with-sasl2=PFX Use Cyrus SASL library version 2 for POP/IMAP -+ authentication -+ --with-idn=PFX Use GNU libidn for domain names -+ --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) -+ --without-gdbm Don't use gdbm even if it is available -+ --with-bdb=DIR Use BerkeleyDB4 if gdbm is not available -+ --with-libiconv-prefix=DIR -+ Search for libiconv in DIR/include and DIR/lib -+ --with-included-gettext Use the GNU gettext library included here -+ --without-wc-funcs Do not use the system's wchar_t functions - - Some influential environment variables: - CC C compiler command -@@ -998,7 +1002,7 @@ + --enable-exact-address Enable regeneration of email addresses + --enable-hcache Enable header caching + --disable-iconv Disable iconv support +@@ -1001,7 +1002,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi @@ -243,7 +229,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure done fi -@@ -2429,8 +2433,7 @@ +@@ -2432,8 +2433,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -253,7 +239,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2488,8 +2491,7 @@ +@@ -2491,8 +2491,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -263,7 +249,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2605,8 +2607,7 @@ +@@ -2608,8 +2607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -273,7 +259,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2660,8 +2661,7 @@ +@@ -2663,8 +2661,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -283,7 +269,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2706,8 +2706,7 @@ +@@ -2709,8 +2706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -293,7 +279,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2751,8 +2750,7 @@ +@@ -2754,8 +2750,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -303,7 +289,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3004,8 +3002,7 @@ +@@ -3007,8 +3002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -313,7 +299,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3059,8 +3056,7 @@ +@@ -3062,8 +3056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -323,7 +309,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3395,8 +3391,7 @@ +@@ -3398,8 +3391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -333,7 +319,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3566,8 +3561,7 @@ +@@ -3569,8 +3561,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -343,7 +329,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3642,8 +3636,7 @@ +@@ -3645,8 +3636,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -353,7 +339,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4296,8 +4289,7 @@ +@@ -4299,8 +4289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -363,7 +349,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4413,8 +4405,7 @@ +@@ -4416,8 +4405,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -373,7 +359,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4496,8 +4487,7 @@ +@@ -4499,8 +4487,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -383,7 +369,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4526,8 +4516,7 @@ +@@ -4529,8 +4516,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -393,7 +379,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4597,8 +4586,7 @@ +@@ -4600,8 +4586,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -403,7 +389,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4650,8 +4638,7 @@ +@@ -4653,8 +4638,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -413,7 +399,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4722,8 +4709,7 @@ +@@ -4725,8 +4709,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -423,7 +409,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4775,8 +4761,7 @@ +@@ -4778,8 +4761,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -433,7 +419,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4999,8 +4984,7 @@ +@@ -5002,8 +4984,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -443,7 +429,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5147,8 +5131,7 @@ +@@ -5150,8 +5131,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -453,7 +439,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5210,8 +5193,7 @@ +@@ -5213,8 +5193,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -463,7 +449,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5273,8 +5255,7 @@ +@@ -5276,8 +5255,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -473,7 +459,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5314,8 +5295,7 @@ +@@ -5317,8 +5295,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -483,7 +469,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5371,8 +5351,7 @@ +@@ -5374,8 +5351,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -493,7 +479,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5412,8 +5391,7 @@ +@@ -5415,8 +5391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -503,7 +489,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5477,8 +5455,7 @@ +@@ -5480,8 +5455,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -513,7 +499,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5509,10 +5486,8 @@ +@@ -5512,10 +5486,8 @@ esac else if test "$cross_compiling" = yes; then @@ -526,7 +512,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -5624,8 +5599,7 @@ +@@ -5627,8 +5599,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -536,7 +522,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5687,8 +5661,7 @@ +@@ -5690,8 +5661,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -546,7 +532,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5728,8 +5701,7 @@ +@@ -5731,8 +5701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -556,7 +542,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5785,8 +5757,7 @@ +@@ -5788,8 +5757,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -566,7 +552,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5826,8 +5797,7 @@ +@@ -5829,8 +5797,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -576,7 +562,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5891,8 +5861,7 @@ +@@ -5894,8 +5861,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -586,7 +572,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5923,10 +5892,8 @@ +@@ -5926,10 +5892,8 @@ esac else if test "$cross_compiling" = yes; then @@ -599,7 +585,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6038,8 +6005,7 @@ +@@ -6041,8 +6005,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -609,7 +595,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6101,8 +6067,7 @@ +@@ -6104,8 +6067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -619,7 +605,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6142,8 +6107,7 @@ +@@ -6145,8 +6107,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -629,7 +615,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6199,8 +6163,7 @@ +@@ -6202,8 +6163,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -639,7 +625,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6240,8 +6203,7 @@ +@@ -6243,8 +6203,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -649,7 +635,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6305,8 +6267,7 @@ +@@ -6308,8 +6267,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -659,7 +645,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6337,10 +6298,8 @@ +@@ -6340,10 +6298,8 @@ esac else if test "$cross_compiling" = yes; then @@ -672,7 +658,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6452,8 +6411,7 @@ +@@ -6455,8 +6411,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -682,7 +668,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6515,8 +6473,7 @@ +@@ -6518,8 +6473,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -692,7 +678,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6556,8 +6513,7 @@ +@@ -6559,8 +6513,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -702,7 +688,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6613,8 +6569,7 @@ +@@ -6616,8 +6569,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -712,7 +698,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6654,8 +6609,7 @@ +@@ -6657,8 +6609,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -722,7 +708,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6719,8 +6673,7 @@ +@@ -6722,8 +6673,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -732,7 +718,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6751,10 +6704,8 @@ +@@ -6754,10 +6704,8 @@ esac else if test "$cross_compiling" = yes; then @@ -745,7 +731,16 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -7216,8 +7167,7 @@ +@@ -6992,7 +6940,7 @@ + #define CRYPT_BACKEND_CLASSIC_PGP 1 + _ACEOF + +- PGPAUX_TARGET="pgpring pgpewrap" ++ PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" + fi + +@@ -7219,8 +7167,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -755,7 +750,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7303,8 +7253,7 @@ +@@ -7306,8 +7253,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -765,7 +760,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7419,8 +7368,7 @@ +@@ -7422,8 +7368,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -775,7 +770,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7490,8 +7438,7 @@ +@@ -7493,8 +7438,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -785,7 +780,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7560,8 +7507,7 @@ +@@ -7563,8 +7507,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -795,7 +790,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7627,8 +7573,7 @@ +@@ -7630,8 +7573,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -805,7 +800,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7778,8 +7723,7 @@ +@@ -7781,8 +7723,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -815,7 +810,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7962,8 +7906,7 @@ +@@ -7965,8 +7906,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -825,7 +820,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8031,8 +7974,7 @@ +@@ -8034,8 +7974,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -835,7 +830,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8101,8 +8043,7 @@ +@@ -8104,8 +8043,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -845,7 +840,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8173,8 +8114,7 @@ +@@ -8176,8 +8114,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -855,7 +850,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8296,8 +8236,7 @@ +@@ -8299,8 +8236,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -865,7 +860,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8366,8 +8305,7 @@ +@@ -8369,8 +8305,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -875,7 +870,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8444,8 +8382,7 @@ +@@ -8447,8 +8382,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -885,7 +880,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8507,8 +8444,7 @@ +@@ -8510,8 +8444,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -895,7 +890,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8561,8 +8497,7 @@ +@@ -8564,8 +8497,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -905,7 +900,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8605,8 +8540,7 @@ +@@ -8608,8 +8540,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -915,7 +910,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8681,8 +8615,7 @@ +@@ -8684,8 +8615,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -925,7 +920,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8721,8 +8654,7 @@ +@@ -8724,8 +8654,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -935,7 +930,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8818,8 +8750,7 @@ +@@ -8821,8 +8750,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -945,7 +940,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8989,8 +8920,7 @@ +@@ -8992,8 +8920,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -955,7 +950,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9140,8 +9070,7 @@ +@@ -9143,8 +9070,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -965,7 +960,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9290,8 +9219,7 @@ +@@ -9293,8 +9219,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -975,7 +970,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9477,8 +9405,7 @@ +@@ -9480,8 +9405,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -985,7 +980,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9550,8 +9477,7 @@ +@@ -9553,8 +9477,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -995,7 +990,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9658,8 +9584,7 @@ +@@ -9661,8 +9584,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1005,7 +1000,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9748,8 +9673,7 @@ +@@ -9751,8 +9673,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1015,7 +1010,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9822,8 +9746,7 @@ +@@ -9825,8 +9746,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1025,7 +1020,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9888,8 +9811,7 @@ +@@ -9891,8 +9811,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1035,7 +1030,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9996,8 +9918,7 @@ +@@ -9999,8 +9918,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1045,7 +1040,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10100,8 +10021,7 @@ +@@ -10103,8 +10021,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1055,7 +1050,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10209,8 +10129,7 @@ +@@ -10212,8 +10129,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1065,7 +1060,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10270,8 +10189,7 @@ +@@ -10273,8 +10189,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1075,7 +1070,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10459,8 +10377,7 @@ +@@ -10462,8 +10377,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1085,7 +1080,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10563,8 +10480,7 @@ +@@ -10566,8 +10480,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1095,7 +1090,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10678,8 +10594,7 @@ +@@ -10681,8 +10594,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1105,7 +1100,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10748,8 +10663,7 @@ +@@ -10751,8 +10663,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1115,7 +1110,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10856,8 +10770,7 @@ +@@ -10859,8 +10770,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1125,7 +1120,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10926,8 +10839,7 @@ +@@ -10929,8 +10839,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1135,7 +1130,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11034,8 +10946,7 @@ +@@ -11037,8 +10946,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1145,7 +1140,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11145,8 +11056,7 @@ +@@ -11148,8 +11056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1155,7 +1150,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11645,8 +11555,7 @@ +@@ -11648,8 +11555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1165,7 +1160,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11712,8 +11621,7 @@ +@@ -11715,8 +11621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1175,7 +1170,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11814,8 +11722,7 @@ +@@ -11817,8 +11722,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1185,7 +1180,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11881,8 +11788,7 @@ +@@ -11884,8 +11788,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1195,7 +1190,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11987,8 +11893,7 @@ +@@ -11990,8 +11893,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1205,7 +1200,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12149,8 +12054,7 @@ +@@ -12152,8 +12054,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1215,7 +1210,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12223,8 +12127,7 @@ +@@ -12226,8 +12127,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1225,7 +1220,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12299,8 +12202,7 @@ +@@ -12302,8 +12202,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1235,7 +1230,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12493,8 +12395,7 @@ +@@ -12496,8 +12395,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1245,7 +1240,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12571,8 +12472,7 @@ +@@ -12574,8 +12472,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1255,7 +1250,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12681,8 +12581,7 @@ +@@ -12684,8 +12581,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1265,7 +1260,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12982,8 +12881,7 @@ +@@ -12985,8 +12881,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1275,7 +1270,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13156,8 +13054,7 @@ +@@ -13159,8 +13054,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1285,7 +1280,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13268,8 +13165,7 @@ +@@ -13271,8 +13165,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1295,7 +1290,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13392,8 +13288,7 @@ +@@ -13395,8 +13288,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1305,7 +1300,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13515,8 +13410,7 @@ +@@ -13518,8 +13410,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1315,7 +1310,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13620,8 +13514,7 @@ +@@ -13623,8 +13514,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1325,7 +1320,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13723,8 +13616,7 @@ +@@ -13726,8 +13616,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1335,7 +1330,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13826,8 +13718,7 @@ +@@ -13829,8 +13718,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1345,7 +1340,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13978,6 +13869,18 @@ +@@ -13981,6 +13869,18 @@ fi fi; @@ -1364,7 +1359,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure # Check whether --with-exec-shell or --without-exec-shell was given. if test "${with_exec_shell+set}" = set; then -@@ -14070,8 +13973,7 @@ +@@ -14073,8 +13973,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1374,7 +1369,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14156,8 +14058,7 @@ +@@ -14159,8 +14058,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1384,7 +1379,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14273,8 +14174,7 @@ +@@ -14276,8 +14174,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1394,7 +1389,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14339,8 +14239,7 @@ +@@ -14342,8 +14239,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1404,7 +1399,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14404,8 +14303,7 @@ +@@ -14407,8 +14303,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1414,7 +1409,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14486,8 +14384,7 @@ +@@ -14489,8 +14384,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1424,7 +1419,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14628,8 +14525,7 @@ +@@ -14631,8 +14525,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1434,7 +1429,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14767,8 +14663,7 @@ +@@ -14770,8 +14663,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1444,7 +1439,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14952,8 +14847,7 @@ +@@ -14955,8 +14847,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1454,7 +1449,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15243,8 +15137,7 @@ +@@ -15246,8 +15137,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1464,7 +1459,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15450,8 +15343,7 @@ +@@ -15453,8 +15343,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1474,7 +1469,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15533,8 +15425,7 @@ +@@ -15536,8 +15425,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1484,7 +1479,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15584,8 +15475,7 @@ +@@ -15587,8 +15475,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1494,7 +1489,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15660,8 +15550,7 @@ +@@ -15663,8 +15550,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1504,7 +1499,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15731,8 +15620,7 @@ +@@ -15734,8 +15620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1514,7 +1509,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15795,8 +15683,7 @@ +@@ -15798,8 +15683,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1524,7 +1519,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15901,8 +15788,7 @@ +@@ -15904,8 +15788,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1534,7 +1529,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16040,8 +15926,7 @@ +@@ -16043,8 +15926,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1544,7 +1539,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16100,8 +15985,7 @@ +@@ -16103,8 +15985,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1554,7 +1549,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16212,8 +16096,7 @@ +@@ -16215,8 +16096,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1564,7 +1559,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16698,8 +16581,7 @@ +@@ -16701,8 +16581,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1574,7 +1569,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17053,8 +16935,7 @@ +@@ -17056,8 +16935,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1584,7 +1579,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17125,8 +17006,7 @@ +@@ -17128,8 +17006,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1594,7 +1589,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17277,8 +17157,7 @@ +@@ -17280,8 +17157,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1604,7 +1599,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17345,8 +17224,7 @@ +@@ -17348,8 +17224,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1614,7 +1609,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17412,8 +17290,7 @@ +@@ -17415,8 +17290,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1624,7 +1619,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17600,8 +17477,7 @@ +@@ -17603,8 +17477,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1634,7 +1629,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17707,8 +17583,7 @@ +@@ -17710,8 +17583,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1644,7 +1639,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17811,8 +17686,7 @@ +@@ -17814,8 +17686,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1654,7 +1649,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17880,8 +17754,7 @@ +@@ -17883,8 +17754,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1664,7 +1659,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17962,8 +17835,7 @@ +@@ -17965,8 +17835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1674,7 +1669,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18026,8 +17898,7 @@ +@@ -18029,8 +17898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1684,7 +1679,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18088,8 +17959,7 @@ +@@ -18091,8 +17959,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1694,7 +1689,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19082,11 +18952,6 @@ +@@ -19085,11 +18952,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1706,7 +1701,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ -@@ -19125,6 +18990,12 @@ +@@ -19128,6 +18990,12 @@ fi;; esac done` || { (exit 1); exit 1; } @@ -1719,9 +1714,9 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -diff -ru mutt-1.5.8.orig/imap/Makefile.in mutt-1.5.8/imap/Makefile.in ---- mutt-1.5.8.orig/imap/Makefile.in 2005-02-12 21:58:24.000000000 +0100 -+++ mutt-1.5.8/imap/Makefile.in 2005-03-10 07:55:35.624793344 +0100 +diff -ru mutt-1.5.9.orig/imap/Makefile.in mutt-1.5.9/imap/Makefile.in +--- mutt-1.5.9.orig/imap/Makefile.in 2005-03-13 17:37:45.000000000 +0100 ++++ mutt-1.5.9/imap/Makefile.in 2005-04-03 19:58:54.831486654 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -1733,18 +1728,9 @@ diff -ru mutt-1.5.8.orig/imap/Makefile.in mutt-1.5.8/imap/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -223,7 +223,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - @USE_GSS_TRUE@GSSSOURCES = auth_gss.c - @USE_SASL_FALSE@AUTHENTICATORS = auth_anon.c auth_cram.c - @USE_SASL_TRUE@AUTHENTICATORS = auth_sasl.c -diff -ru mutt-1.5.8.orig/m4/Makefile.in mutt-1.5.8/m4/Makefile.in ---- mutt-1.5.8.orig/m4/Makefile.in 2005-02-12 21:58:24.000000000 +0100 -+++ mutt-1.5.8/m4/Makefile.in 2005-03-10 07:55:35.786765529 +0100 +diff -ru mutt-1.5.9.orig/m4/Makefile.in mutt-1.5.9/m4/Makefile.in +--- mutt-1.5.9.orig/m4/Makefile.in 2005-03-13 17:37:45.000000000 +0100 ++++ mutt-1.5.9/m4/Makefile.in 2005-04-03 19:58:54.969457936 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am.