X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4d68fdd8eb3666b422a0cab834a4f43d8e5e2706..b4c0283bbf4dfa85adf3df88b21bde4b2a48b11c:/debian/patches/autotools-update diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update index 3e29601..48e81b3 100644 --- a/debian/patches/autotools-update +++ b/debian/patches/autotools-update @@ -1,36 +1,22 @@ -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. +diff -ru mutt-1.5.10.orig/Makefile.in mutt-1.5.10/Makefile.in +--- mutt-1.5.10.orig/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/Makefile.in 2005-08-15 14:04:23.000000000 +0200 +@@ -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, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # 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 @@ +@@ -15,8 +15,6 @@ @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) - +-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 @@ + VPATH = @srcdir@ +@@ -76,10 +74,10 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ @@ -45,30 +31,7 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ handler.$(OBJEXT) hash.$(OBJEXT) hdrline.$(OBJEXT) \ headers.$(OBJEXT) help.$(OBJEXT) hook.$(OBJEXT) \ -@@ -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 @@ +@@ -298,7 +296,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 \ @@ -77,7 +40,7 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/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 +329,7 @@ +@@ -329,7 +327,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 \ @@ -86,17 +49,7 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/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 \ -@@ -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 @@ +@@ -494,6 +492,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@ @@ -104,100 +57,10 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/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@ -@@ -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): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -609,7 +624,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -@@ -617,7 +632,13 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -638,7 +659,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -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 +Only in mutt-1.5.10: autom4te.cache +diff -ru mutt-1.5.10.orig/config.h.in mutt-1.5.10/config.h.in +--- mutt-1.5.10.orig/config.h.in 2005-08-11 23:49:51.000000000 +0200 ++++ mutt-1.5.10/config.h.in 2005-08-15 14:04:19.000000000 +0200 @@ -498,6 +498,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -208,10 +71,10 @@ diff -ru mutt-1.5.9.orig/config.h.in mutt-1.5.9/config.h.in /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK -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 +Only in mutt-1.5.10: config.h.in~ +diff -ru mutt-1.5.10.orig/configure mutt-1.5.10/configure +--- mutt-1.5.10.orig/configure 2005-08-11 23:49:35.000000000 +0200 ++++ mutt-1.5.10/configure 2005-08-15 14:04:24.000000000 +0200 @@ -868,6 +868,7 @@ --enable-buffy-size Use file size attribute instead of access time --enable-mailtool Enable Sun mailtool attachments support @@ -220,7 +83,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure --enable-exact-address Enable regeneration of email addresses --enable-hcache Enable header caching --disable-iconv Disable iconv support -@@ -1001,7 +1002,7 @@ +@@ -1000,7 +1001,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi @@ -229,7 +92,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure done fi -@@ -2432,8 +2433,7 @@ +@@ -2431,8 +2432,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -239,7 +102,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2491,8 +2491,7 @@ +@@ -2490,8 +2490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -249,7 +112,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2608,8 +2607,7 @@ +@@ -2607,8 +2606,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -259,7 +122,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2663,8 +2661,7 @@ +@@ -2662,8 +2660,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -269,7 +132,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2709,8 +2706,7 @@ +@@ -2708,8 +2705,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -279,7 +142,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2754,8 +2750,7 @@ +@@ -2753,8 +2749,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -289,7 +152,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3007,8 +3002,7 @@ +@@ -3006,8 +3001,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -299,7 +162,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3062,8 +3056,7 @@ +@@ -3061,8 +3055,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -309,7 +172,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3398,8 +3391,7 @@ +@@ -3397,8 +3390,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -319,7 +182,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3569,8 +3561,7 @@ +@@ -3568,8 +3560,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -329,7 +192,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3645,8 +3636,7 @@ +@@ -3644,8 +3635,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -339,7 +202,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4299,8 +4289,7 @@ +@@ -4298,8 +4288,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -349,7 +212,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4416,8 +4405,7 @@ +@@ -4415,8 +4404,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -359,7 +222,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4499,8 +4487,7 @@ +@@ -4498,8 +4486,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -369,7 +232,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4529,8 +4516,7 @@ +@@ -4528,8 +4515,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -379,7 +242,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4600,8 +4586,7 @@ +@@ -4599,8 +4585,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -389,7 +252,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4653,8 +4638,7 @@ +@@ -4652,8 +4637,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -399,7 +262,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4725,8 +4709,7 @@ +@@ -4724,8 +4708,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -409,7 +272,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4778,8 +4761,7 @@ +@@ -4777,8 +4760,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -419,7 +282,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5002,8 +4984,7 @@ +@@ -5001,8 +4983,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -429,7 +292,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5150,8 +5131,7 @@ +@@ -5149,8 +5130,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -439,7 +302,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5213,8 +5193,7 @@ +@@ -5212,8 +5192,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -449,7 +312,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5276,8 +5255,7 @@ +@@ -5275,8 +5254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -459,7 +322,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5317,8 +5295,7 @@ +@@ -5316,8 +5294,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -469,7 +332,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5374,8 +5351,7 @@ +@@ -5373,8 +5350,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -479,7 +342,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5415,8 +5391,7 @@ +@@ -5414,8 +5390,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -489,7 +352,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5480,8 +5455,7 @@ +@@ -5479,8 +5454,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -499,7 +362,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5512,10 +5486,8 @@ +@@ -5511,10 +5485,8 @@ esac else if test "$cross_compiling" = yes; then @@ -512,7 +375,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -5627,8 +5599,7 @@ +@@ -5626,8 +5598,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -522,7 +385,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5690,8 +5661,7 @@ +@@ -5689,8 +5660,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -532,7 +395,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5731,8 +5701,7 @@ +@@ -5730,8 +5700,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -542,7 +405,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5788,8 +5757,7 @@ +@@ -5787,8 +5756,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -552,7 +415,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5829,8 +5797,7 @@ +@@ -5828,8 +5796,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -562,7 +425,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5894,8 +5861,7 @@ +@@ -5893,8 +5860,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -572,7 +435,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5926,10 +5892,8 @@ +@@ -5925,10 +5891,8 @@ esac else if test "$cross_compiling" = yes; then @@ -585,7 +448,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6041,8 +6005,7 @@ +@@ -6040,8 +6004,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -595,7 +458,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6104,8 +6067,7 @@ +@@ -6103,8 +6066,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -605,7 +468,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6145,8 +6107,7 @@ +@@ -6144,8 +6106,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -615,7 +478,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6202,8 +6163,7 @@ +@@ -6201,8 +6162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -625,7 +488,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6243,8 +6203,7 @@ +@@ -6242,8 +6202,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -635,7 +498,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6308,8 +6267,7 @@ +@@ -6307,8 +6266,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -645,7 +508,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6340,10 +6298,8 @@ +@@ -6339,10 +6297,8 @@ esac else if test "$cross_compiling" = yes; then @@ -658,7 +521,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6455,8 +6411,7 @@ +@@ -6454,8 +6410,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -668,7 +531,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6518,8 +6473,7 @@ +@@ -6517,8 +6472,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -678,7 +541,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6559,8 +6513,7 @@ +@@ -6558,8 +6512,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -688,7 +551,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6616,8 +6569,7 @@ +@@ -6615,8 +6568,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -698,7 +561,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6657,8 +6609,7 @@ +@@ -6656,8 +6608,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -708,7 +571,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6722,8 +6673,7 @@ +@@ -6721,8 +6672,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -718,7 +581,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6754,10 +6704,8 @@ +@@ -6753,10 +6703,8 @@ esac else if test "$cross_compiling" = yes; then @@ -731,16 +594,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -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 @@ +@@ -7218,8 +7166,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -750,7 +604,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7306,8 +7253,7 @@ +@@ -7305,8 +7252,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -760,7 +614,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7422,8 +7368,7 @@ +@@ -7421,8 +7367,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -770,7 +624,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7493,8 +7438,7 @@ +@@ -7492,8 +7437,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -780,7 +634,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7563,8 +7507,7 @@ +@@ -7562,8 +7506,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -790,7 +644,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7630,8 +7573,7 @@ +@@ -7629,8 +7572,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -800,7 +654,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7781,8 +7723,7 @@ +@@ -7780,8 +7722,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -810,7 +664,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7965,8 +7906,7 @@ +@@ -7964,8 +7905,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -820,7 +674,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8034,8 +7974,7 @@ +@@ -8033,8 +7973,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -830,7 +684,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8104,8 +8043,7 @@ +@@ -8103,8 +8042,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -840,7 +694,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8176,8 +8114,7 @@ +@@ -8175,8 +8113,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -850,7 +704,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8299,8 +8236,7 @@ +@@ -8298,8 +8235,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -860,7 +714,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8369,8 +8305,7 @@ +@@ -8368,8 +8304,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -870,7 +724,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8447,8 +8382,7 @@ +@@ -8446,8 +8381,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -880,7 +734,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8510,8 +8444,7 @@ +@@ -8509,8 +8443,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -890,7 +744,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8564,8 +8497,7 @@ +@@ -8563,8 +8496,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -900,7 +754,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8608,8 +8540,7 @@ +@@ -8607,8 +8539,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -910,7 +764,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8684,8 +8615,7 @@ +@@ -8683,8 +8614,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -920,7 +774,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8724,8 +8654,7 @@ +@@ -8723,8 +8653,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -930,7 +784,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8821,8 +8750,7 @@ +@@ -8820,8 +8749,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -940,7 +794,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8992,8 +8920,7 @@ +@@ -8991,8 +8919,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -950,7 +804,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9143,8 +9070,7 @@ +@@ -9142,8 +9069,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -960,7 +814,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9293,8 +9219,7 @@ +@@ -9292,8 +9218,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -970,7 +824,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9480,8 +9405,7 @@ +@@ -9479,8 +9404,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -980,7 +834,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9553,8 +9477,7 @@ +@@ -9552,8 +9476,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -990,7 +844,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9661,8 +9584,7 @@ +@@ -9660,8 +9583,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1000,7 +854,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9751,8 +9673,7 @@ +@@ -9750,8 +9672,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1010,7 +864,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9825,8 +9746,7 @@ +@@ -9824,8 +9745,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1020,7 +874,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9891,8 +9811,7 @@ +@@ -9890,8 +9810,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1030,7 +884,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9999,8 +9918,7 @@ +@@ -9998,8 +9917,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1040,7 +894,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10103,8 +10021,7 @@ +@@ -10102,8 +10020,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1050,7 +904,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10212,8 +10129,7 @@ +@@ -10211,8 +10128,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1060,7 +914,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10273,8 +10189,7 @@ +@@ -10272,8 +10188,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1070,7 +924,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10462,8 +10377,7 @@ +@@ -10461,8 +10376,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1080,7 +934,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10566,8 +10480,7 @@ +@@ -10565,8 +10479,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1090,7 +944,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10681,8 +10594,7 @@ +@@ -10680,8 +10593,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1100,7 +954,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10751,8 +10663,7 @@ +@@ -10750,8 +10662,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1110,7 +964,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10859,8 +10770,7 @@ +@@ -10858,8 +10769,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1120,7 +974,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10929,8 +10839,7 @@ +@@ -10928,8 +10838,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1130,7 +984,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11037,8 +10946,7 @@ +@@ -11036,8 +10945,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1140,7 +994,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11148,8 +11056,7 @@ +@@ -11147,8 +11055,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1150,7 +1004,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11648,8 +11555,7 @@ +@@ -11647,8 +11554,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1160,7 +1014,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11715,8 +11621,7 @@ +@@ -11714,8 +11620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1170,7 +1024,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11817,8 +11722,7 @@ +@@ -11816,8 +11721,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1180,7 +1034,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11884,8 +11788,7 @@ +@@ -11883,8 +11787,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1190,7 +1044,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11990,8 +11893,7 @@ +@@ -11989,8 +11892,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1200,7 +1054,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12152,8 +12054,7 @@ +@@ -12151,8 +12053,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1210,7 +1064,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12226,8 +12127,7 @@ +@@ -12225,8 +12126,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1220,7 +1074,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12302,8 +12202,7 @@ +@@ -12301,8 +12201,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1230,7 +1084,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12496,8 +12395,7 @@ +@@ -12495,8 +12394,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1240,7 +1094,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12574,8 +12472,7 @@ +@@ -12573,8 +12471,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1250,7 +1104,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12684,8 +12581,7 @@ +@@ -12683,8 +12580,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1260,7 +1114,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12985,8 +12881,7 @@ +@@ -12941,8 +12837,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1270,7 +1124,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13159,8 +13054,7 @@ +@@ -13115,8 +13010,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1280,7 +1134,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13271,8 +13165,7 @@ +@@ -13237,8 +13131,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1290,7 +1144,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13395,8 +13288,7 @@ +@@ -13361,8 +13254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1300,7 +1154,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13518,8 +13410,7 @@ +@@ -13484,8 +13376,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1310,7 +1164,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13623,8 +13514,7 @@ +@@ -13589,8 +13480,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1320,7 +1174,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13726,8 +13616,7 @@ +@@ -13692,8 +13582,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1330,7 +1184,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13829,8 +13718,7 @@ +@@ -13795,8 +13684,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1340,7 +1194,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13981,6 +13869,18 @@ +@@ -13947,6 +13835,18 @@ fi fi; @@ -1359,7 +1213,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure # Check whether --with-exec-shell or --without-exec-shell was given. if test "${with_exec_shell+set}" = set; then -@@ -14073,8 +13973,7 @@ +@@ -14039,8 +13939,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1369,7 +1223,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14159,8 +14058,7 @@ +@@ -14125,8 +14024,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1379,7 +1233,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14276,8 +14174,7 @@ +@@ -14242,8 +14140,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1389,7 +1243,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14342,8 +14239,7 @@ +@@ -14308,8 +14205,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1399,7 +1253,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14407,8 +14303,7 @@ +@@ -14373,8 +14269,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1409,7 +1263,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14489,8 +14384,7 @@ +@@ -14455,8 +14350,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1419,7 +1273,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14631,8 +14525,7 @@ +@@ -14597,8 +14491,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1429,7 +1283,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14770,8 +14663,7 @@ +@@ -14736,8 +14629,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1439,7 +1293,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14955,8 +14847,7 @@ +@@ -14921,8 +14813,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1449,7 +1303,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15246,8 +15137,7 @@ +@@ -15212,8 +15103,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1459,7 +1313,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15453,8 +15343,7 @@ +@@ -15419,8 +15309,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1469,7 +1323,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15536,8 +15425,7 @@ +@@ -15502,8 +15391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1479,7 +1333,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15587,8 +15475,7 @@ +@@ -15553,8 +15441,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1489,7 +1343,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15663,8 +15550,7 @@ +@@ -15629,8 +15516,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1499,7 +1353,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15734,8 +15620,7 @@ +@@ -15700,8 +15586,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1509,7 +1363,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15798,8 +15683,7 @@ +@@ -15764,8 +15649,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1519,7 +1373,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15904,8 +15788,7 @@ +@@ -15870,8 +15754,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1529,7 +1383,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16043,8 +15926,7 @@ +@@ -16009,8 +15892,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1539,7 +1393,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16103,8 +15985,7 @@ +@@ -16069,8 +15951,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1549,7 +1403,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16215,8 +16096,7 @@ +@@ -16181,8 +16062,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1559,7 +1413,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16701,8 +16581,7 @@ +@@ -16667,8 +16547,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1569,7 +1423,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17056,8 +16935,7 @@ +@@ -17022,8 +16901,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1579,7 +1433,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17128,8 +17006,7 @@ +@@ -17094,8 +16972,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1589,7 +1443,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17280,8 +17157,7 @@ +@@ -17246,8 +17123,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1599,7 +1453,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17348,8 +17224,7 @@ +@@ -17314,8 +17190,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1609,7 +1463,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17415,8 +17290,7 @@ +@@ -17381,8 +17256,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1619,7 +1473,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17603,8 +17477,7 @@ +@@ -17569,8 +17443,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1629,7 +1483,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17710,8 +17583,7 @@ +@@ -17676,8 +17549,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1639,7 +1493,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17814,8 +17686,7 @@ +@@ -17780,8 +17652,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1649,7 +1503,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17883,8 +17754,7 @@ +@@ -17849,8 +17720,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1659,7 +1513,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17965,8 +17835,7 @@ +@@ -17931,8 +17801,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1669,7 +1523,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18029,8 +17898,7 @@ +@@ -17995,8 +17864,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1679,7 +1533,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18091,8 +17959,7 @@ +@@ -18057,8 +17925,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1689,7 +1543,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19085,11 +18952,6 @@ +@@ -19051,11 +18918,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1701,7 +1555,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/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. */ -@@ -19128,6 +18990,12 @@ +@@ -19094,6 +18956,12 @@ fi;; esac done` || { (exit 1); exit 1; } @@ -1714,34 +1568,33 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -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. +diff -ru mutt-1.5.10.orig/imap/Makefile.in mutt-1.5.10/imap/Makefile.in +--- mutt-1.5.10.orig/imap/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/imap/Makefile.in 2005-08-15 14:04:22.000000000 +0200 +@@ -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, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # 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. -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. +@@ -15,8 +15,6 @@ + @SET_MAKE@ + + +-SOURCES = $(libimap_a_SOURCES) +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +diff -ru mutt-1.5.10.orig/m4/Makefile.in mutt-1.5.10/m4/Makefile.in +--- mutt-1.5.10.orig/m4/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/m4/Makefile.in 2005-08-15 14:04:22.000000000 +0200 +@@ -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, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # 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. @@ -217,9 +217,9 @@ exit 1;; \ esac; \