X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4c13acfc45a942f5f481ce6a3dfcea461da505ad..01dedc5b5343971850798011534f5f2fb2a3e8ba:/debian/patches/autotools-update diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update index eeccd6c..6f56066 100644 --- a/debian/patches/autotools-update +++ b/debian/patches/autotools-update @@ -1,18 +1,32 @@ -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 -@@ -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.11.orig/Makefile.in mutt-1.5.11/Makefile.in +--- mutt-1.5.11.orig/Makefile.in 2005-09-15 16:22:50.000000000 +0200 ++++ mutt-1.5.11/Makefile.in 2005-11-11 02:43:14.000000000 +0100 +@@ -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. -@@ -76,10 +76,10 @@ +@@ -15,8 +15,6 @@ + @SET_MAKE@ + + +-SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -49,7 +47,8 @@ + $(top_srcdir)/doc/Makefile.in $(top_srcdir)/doc/instdoc.sh.in \ + $(top_srcdir)/intl/Makefile.in ABOUT-NLS ChangeLog INSTALL \ + NEWS TODO config.guess config.sub depcomp install-sh missing \ +- mkinstalldirs regex.c snprintf.c strcasecmp.c strdup.c ++ mkinstalldirs regex.c setenv.c snprintf.c strcasecmp.c \ ++ strdup.c + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ +@@ -76,10 +75,10 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ @@ -27,16 +41,16 @@ 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 @@ +@@ -159,7 +158,7 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ ++CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ + + # $(makedoc_OBJECTS): $(makedoc_SOURCES) + # $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $< +@@ -300,7 +299,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 +59,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 @@ +@@ -331,7 +330,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 +68,15 @@ 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 @@ +@@ -480,6 +479,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@ +@@ -496,6 +496,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,59 +84,69 @@ 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 @@ - # (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 +616,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 +624,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 +651,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 \ -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 -@@ -498,6 +498,9 @@ +@@ -1054,15 +1055,15 @@ + commit-changelog: + (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog) + +-commit: pclean check-security commit-real changelog commit-changelog ++commit: pclean check-security commit-real update-changelog commit-changelog + +-changelog: ++update-changelog: + (cd $(top_srcdir); \ + cvs update ChangeLog; \ + sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \ + $${VISUAL:-vi} ChangeLog) + +-ChangeLog: changelog ++#ChangeLog: changelog + + # kluge around automake problems. + +Only in mutt-1.5.11: autom4te.cache +diff -ru mutt-1.5.11.orig/config.h.in mutt-1.5.11/config.h.in +--- mutt-1.5.11.orig/config.h.in 2005-09-15 16:21:55.000000000 +0200 ++++ mutt-1.5.11/config.h.in 2005-11-11 02:43:10.000000000 +0100 +@@ -87,6 +87,9 @@ + /* Define to 1 if you have the `fgets_unlocked' function. */ + #undef HAVE_FGETS_UNLOCKED + ++/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ ++#undef HAVE_FSEEKO ++ + /* Define to 1 if you have the `ftruncate' function. */ + #undef HAVE_FTRUNCATE + +@@ -264,12 +267,18 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_NCURSES_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NCURSES_NCURSES_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_NL_TYPES_H + + /* Define to 1 if you have the `putenv' function. */ + #undef HAVE_PUTENV + ++/* QDBM Support */ ++#undef HAVE_QDBM ++ + /* Define to 1 if you have the `RAND_egd' function. */ + #undef HAVE_RAND_EGD + +@@ -475,6 +484,9 @@ + /* The size of a `long long', as computed by sizeof. */ + #undef SIZEOF_LONG_LONG + ++/* The size of a `off_t', as computed by sizeof. */ ++#undef SIZEOF_OFF_T ++ + /* The size of a `short', as computed by sizeof. */ + #undef SIZEOF_SHORT + +@@ -492,6 +504,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -133,108 +156,66 @@ 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 +@@ -568,6 +583,9 @@ + # undef _GNU_SOURCE + #endif + ++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ ++#undef _LARGEFILE_SOURCE ++ + /* Define for large files, on AIX-style hosts. */ + #undef _LARGE_FILES + +@@ -609,3 +627,19 @@ + + /* Define to 'int' if system headers don't define. */ + #undef wint_t ++ ++/* fseeko portability defines */ ++#ifdef HAVE_FSEEKO ++# define LOFF_T off_t ++# if SIZEOF_OFF_T == 8 ++# define OFF_T_FMT "%lld" ++# else ++# define OFF_T_FMT "%ld" ++# endif ++#else ++# define LOFF_T long ++# define fseeko fseek ++# define ftello ftell ++# define OFF_T_FMT "%ld" ++#endif ++ +Only in mutt-1.5.11: config.h.in~ +diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure +--- mutt-1.5.11.orig/configure 2005-09-15 16:21:34.000000000 +0200 ++++ mutt-1.5.11/configure 2005-11-11 02:43:15.000000000 +0100 +@@ -309,7 +309,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CONFIGURE_DEPENDENCIES build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB AR ac_ct_AR DBX GDB SDB DEBUGGER SENDMAIL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS OPS PGPAUX_TARGET SMIMEAUX_TARGET ISPELL LIBOBJS DOTLOCK_TARGET docdir DOTLOCK_GROUP DOTLOCK_PERMISSION BUILD_IMAP_TRUE BUILD_IMAP_FALSE KRB5CFGPATH USE_GSS_TRUE USE_GSS_FALSE LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS USE_SSL_TRUE USE_SSL_FALSE USE_SASL_TRUE USE_SASL_FALSE MUTTLIBS MUTT_LIB_OBJECTS LIBIMAP LIBIMAPDEPS ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX OSPCAT DSLROOT LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CONFIG_STATUS_DEPENDENCIES build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB AR ac_ct_AR DBX GDB SDB DEBUGGER SENDMAIL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS OPS PGPAUX_TARGET SMIMEAUX_TARGET ISPELL LIBOBJS DOTLOCK_TARGET docdir DOTLOCK_GROUP DOTLOCK_PERMISSION BUILD_IMAP_TRUE BUILD_IMAP_FALSE KRB5CFGPATH USE_GSS_TRUE USE_GSS_FALSE LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS USE_SSL_TRUE USE_SSL_FALSE USE_SASL_TRUE USE_SASL_FALSE MUTTLIBS MUTT_LIB_OBJECTS LIBIMAP LIBIMAPDEPS ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX OSPCAT DSLROOT LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -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 +@@ -891,6 +892,7 @@ + --with-sasl=PFX Use Cyrus SASL 2 network security library + --with-idn=PFX Use GNU libidn for domain names + --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) ++ --without-qdbm Don't use qdbm even if it is available + --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 +@@ -998,7 +1000,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi @@ -243,7 +224,25 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure done fi -@@ -2429,8 +2433,7 @@ +@@ -1786,7 +1788,7 @@ + + + +-CONFIGURE_DEPENDENCIES='$(top_srcdir)/VERSION' ++CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/VERSION' + + + +@@ -1796,7 +1798,7 @@ + + + +-ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg" ++ALL_LINGUAS="de eu ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg ga" + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +@@ -2431,8 +2433,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -253,7 +252,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 @@ +@@ -2490,8 +2491,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -263,7 +262,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 @@ +@@ -2607,8 +2607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -273,7 +272,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 @@ +@@ -2662,8 +2661,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -283,7 +282,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 @@ +@@ -2708,8 +2706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -293,7 +292,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 @@ +@@ -2753,8 +2750,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -303,7 +302,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 @@ +@@ -3006,8 +3002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -313,7 +312,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 @@ +@@ -3061,8 +3056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -323,7 +322,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 @@ +@@ -3397,8 +3391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -333,7 +332,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 @@ +@@ -3568,8 +3561,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -343,7 +342,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 @@ +@@ -3644,8 +3636,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -353,7 +352,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 @@ +@@ -4298,8 +4289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -363,7 +362,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 @@ +@@ -4415,8 +4405,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -373,7 +372,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 @@ +@@ -4498,8 +4487,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -383,7 +382,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 @@ +@@ -4528,8 +4516,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -393,7 +392,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 @@ +@@ -4599,8 +4586,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -403,7 +402,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 @@ +@@ -4652,8 +4638,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -413,7 +412,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 @@ +@@ -4724,8 +4709,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -423,7 +422,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 @@ +@@ -4777,8 +4761,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -433,7 +432,601 @@ 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 @@ +@@ -4812,6 +4795,584 @@ + rm -f conftest* + fi + ++echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 ++if test "${ac_cv_sys_largefile_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ while :; do ++ ac_cv_sys_largefile_source=no ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++return !fseeko; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _LARGEFILE_SOURCE 1 ++#include ++int ++main () ++{ ++return !fseeko; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_largefile_source=1; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ break ++done ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 ++if test "$ac_cv_sys_largefile_source" != no; then ++ ++cat >>confdefs.h <<_ACEOF ++#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source ++_ACEOF ++ ++fi ++rm -f conftest* ++ ++# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug ++# in glibc 2.1.3, but that breaks too many other things. ++# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. ++echo "$as_me:$LINENO: checking for fseeko" >&5 ++echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 ++if test "${ac_cv_func_fseeko+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++return fseeko && fseeko (stdin, 0, 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_fseeko=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_func_fseeko=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 ++echo "${ECHO_T}$ac_cv_func_fseeko" >&6 ++if test $ac_cv_func_fseeko = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_FSEEKO 1 ++_ACEOF ++ ++fi ++ ++echo "$as_me:$LINENO: checking for off_t" >&5 ++echo $ECHO_N "checking for off_t... $ECHO_C" >&6 ++if test "${ac_cv_type_off_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((off_t *) 0) ++ return 0; ++if (sizeof (off_t)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_off_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_off_t=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 ++echo "${ECHO_T}$ac_cv_type_off_t" >&6 ++ ++echo "$as_me:$LINENO: checking size of off_t" >&5 ++echo $ECHO_N "checking size of off_t... $ECHO_C" >&6 ++if test "${ac_cv_sizeof_off_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$ac_cv_type_off_t" = yes; then ++ # The cast to unsigned long works around a bug in the HP C Compiler ++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++ # This bug is HP SR number 8606223364. ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_lo=`expr $ac_mid + 1` ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid + 1` ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=$ac_mid; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_hi=`expr '(' $ac_mid ')' - 1` ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid` ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_lo= ac_hi= ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_lo=`expr '(' $ac_mid ')' + 1` ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in ++?*) ac_cv_sizeof_off_t=$ac_lo;; ++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77 ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (off_t), 77 ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ;; ++esac ++else ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} ++ { (exit 1); exit 1; }; } ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++long longval () { return (long) (sizeof (off_t)); } ++unsigned long ulongval () { return (long) (sizeof (off_t)); } ++#include ++#include ++int ++main () ++{ ++ ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ exit (1); ++ if (((long) (sizeof (off_t))) < 0) ++ { ++ long i = longval (); ++ if (i != ((long) (sizeof (off_t)))) ++ exit (1); ++ fprintf (f, "%ld\n", i); ++ } ++ else ++ { ++ unsigned long i = ulongval (); ++ if (i != ((long) (sizeof (off_t)))) ++ exit (1); ++ fprintf (f, "%lu\n", i); ++ } ++ exit (ferror (f) || fclose (f) != 0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sizeof_off_t=`cat conftest.val` ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77 ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (off_t), 77 ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++rm -f conftest.val ++else ++ ac_cv_sizeof_off_t=0 ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5 ++echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6 ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_OFF_T $ac_cv_sizeof_off_t ++_ACEOF ++ ++ + + # Extract the first word of "dbx", so it can be a program name with args. + set dummy dbx; ac_word=$2 +@@ -4968,6 +5529,8 @@ + + + ++ ++ + for ac_header in inttypes.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +@@ -5001,8 +5564,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -443,7 +1036,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 @@ +@@ -5149,8 +5711,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -453,7 +1046,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 @@ +@@ -5212,8 +5773,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -463,7 +1056,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 @@ +@@ -5275,8 +5835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -473,7 +1066,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 @@ +@@ -5316,8 +5875,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -483,7 +1076,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 @@ +@@ -5373,8 +5931,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -493,7 +1086,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 @@ +@@ -5414,8 +5971,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -503,7 +1096,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 @@ +@@ -5479,8 +6035,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -513,7 +1106,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 @@ +@@ -5511,10 +6066,8 @@ esac else if test "$cross_compiling" = yes; then @@ -526,7 +1119,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 @@ +@@ -5626,8 +6179,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -536,7 +1129,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 @@ +@@ -5689,8 +6241,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -546,7 +1139,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 @@ +@@ -5730,8 +6281,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -556,7 +1149,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 @@ +@@ -5787,8 +6337,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -566,7 +1159,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 @@ +@@ -5828,8 +6377,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -576,7 +1169,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 @@ +@@ -5893,8 +6441,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -586,7 +1179,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 @@ +@@ -5925,10 +6472,8 @@ esac else if test "$cross_compiling" = yes; then @@ -599,7 +1192,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 @@ +@@ -6040,8 +6585,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -609,7 +1202,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 @@ +@@ -6103,8 +6647,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -619,7 +1212,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 @@ +@@ -6144,8 +6687,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -629,7 +1222,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 @@ +@@ -6201,8 +6743,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -639,7 +1232,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 @@ +@@ -6242,8 +6783,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -649,7 +1242,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 @@ +@@ -6307,8 +6847,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -659,7 +1252,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 @@ +@@ -6339,10 +6878,8 @@ esac else if test "$cross_compiling" = yes; then @@ -672,7 +1265,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 @@ +@@ -6454,8 +6991,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -682,7 +1275,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 @@ +@@ -6517,8 +7053,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -692,7 +1285,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 @@ +@@ -6558,8 +7093,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -702,7 +1295,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 @@ +@@ -6615,8 +7149,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -712,7 +1305,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 @@ +@@ -6656,8 +7189,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -722,7 +1315,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 @@ +@@ -6721,8 +7253,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -732,7 +1325,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 @@ +@@ -6753,10 +7284,8 @@ esac else if test "$cross_compiling" = yes; then @@ -745,7 +1338,7 @@ 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 @@ +@@ -7205,8 +7734,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -755,7 +1348,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 @@ +@@ -7292,8 +7820,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -765,7 +1358,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 @@ +@@ -7408,8 +7935,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -775,7 +1368,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 @@ +@@ -7479,8 +8005,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -785,7 +1378,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 @@ +@@ -7549,8 +8074,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -795,17 +1388,17 @@ 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 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7778,8 +7723,7 @@ +@@ -7577,9 +8101,6 @@ + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + MUTTLIBS="$MUTTLIBS -l$cf_ncurses" +- if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" +- fi + + if test "$cf_ncurses" = ncursesw; then + +@@ -7616,8 +8137,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -815,7 +1408,160 @@ 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 @@ +@@ -7734,6 +8254,152 @@ + + else + ++for ac_header in ncurses/ncurses.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ cf_cv_ncurses_header="ncurses/ncurses.h" ++else ++ + for ac_header in ncurses.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +@@ -7767,8 +8433,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -825,7 +1571,18 @@ 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 @@ +@@ -7883,6 +8548,10 @@ + + done + ++fi ++ ++done ++ + fi + else + +@@ -7951,8 +8620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -835,7 +1592,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 @@ +@@ -8020,8 +8688,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -845,7 +1602,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 @@ +@@ -8090,8 +8757,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -855,7 +1612,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 @@ +@@ -8162,8 +8828,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -865,7 +1622,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 @@ +@@ -8285,8 +8950,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -875,7 +1632,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 @@ +@@ -8355,8 +9019,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -885,7 +1642,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 @@ +@@ -8433,8 +9096,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -895,7 +1652,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 @@ +@@ -8496,8 +9158,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -905,7 +1662,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 @@ +@@ -8550,8 +9211,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -915,7 +1672,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 @@ +@@ -8594,8 +9254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -925,7 +1682,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 @@ +@@ -8670,8 +9329,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -935,7 +1692,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 @@ +@@ -8710,8 +9368,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -945,7 +1702,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 @@ +@@ -8807,8 +9464,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -955,7 +1712,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 @@ +@@ -8978,8 +9634,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -965,7 +1722,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 @@ +@@ -9129,8 +9784,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -975,7 +1732,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 @@ +@@ -9279,8 +9933,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -985,7 +1742,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 @@ +@@ -9466,8 +10119,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -995,7 +1752,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 @@ +@@ -9539,8 +10191,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1005,7 +1762,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 @@ +@@ -9647,8 +10298,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1015,7 +1772,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 @@ +@@ -9737,8 +10387,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1025,7 +1782,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 @@ +@@ -9811,8 +10460,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1035,7 +1792,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 @@ +@@ -9877,8 +10525,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1045,7 +1802,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 @@ +@@ -9985,8 +10632,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1055,7 +1812,17 @@ 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 @@ +@@ -10021,7 +10667,8 @@ + + + +-for ac_func in strcasecmp strdup ++ ++for ac_func in setenv strcasecmp strdup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -10089,8 +10736,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1065,7 +1832,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 @@ +@@ -10198,8 +10844,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1075,7 +1842,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 @@ +@@ -10259,8 +10904,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1085,7 +1852,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 @@ +@@ -10448,8 +11092,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1095,7 +1862,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 @@ +@@ -10552,8 +11195,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1105,7 +1872,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 @@ +@@ -10667,8 +11309,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1115,7 +1882,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 @@ +@@ -10737,8 +11378,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1125,7 +1892,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 @@ +@@ -10845,8 +11485,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1135,7 +1902,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 @@ +@@ -10915,8 +11554,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1145,7 +1912,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 @@ +@@ -11023,8 +11661,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1155,7 +1922,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 @@ +@@ -11134,8 +11771,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1165,7 +1932,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 @@ +@@ -11636,8 +12272,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1175,7 +1942,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 @@ +@@ -11703,8 +12338,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1185,7 +1952,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 @@ +@@ -11805,8 +12439,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1195,7 +1962,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 @@ +@@ -11872,8 +12505,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1205,7 +1972,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 @@ +@@ -11978,8 +12610,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1215,7 +1982,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 @@ +@@ -12140,8 +12771,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1225,7 +1992,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 @@ +@@ -12214,8 +12844,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1235,7 +2002,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 @@ +@@ -12290,8 +12919,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1245,7 +2012,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 @@ +@@ -12484,8 +13112,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1255,7 +2022,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 @@ +@@ -12562,8 +13189,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1265,7 +2032,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 @@ +@@ -12672,8 +13298,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1275,7 +2042,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 @@ +@@ -12930,8 +13555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1285,7 +2052,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 @@ +@@ -13104,8 +13728,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1295,7 +2062,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 @@ +@@ -13226,8 +13849,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1305,7 +2072,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 @@ +@@ -13344,8 +13966,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1315,7 +2082,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 @@ +@@ -13449,8 +14070,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1325,7 +2092,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 @@ +@@ -13552,8 +14172,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1335,7 +2102,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 @@ +@@ -13655,8 +14274,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1345,7 +2112,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 @@ +@@ -13807,6 +14425,18 @@ fi fi; @@ -1364,7 +2131,91 @@ 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 @@ +@@ -13858,6 +14488,74 @@ + OLDLIBS="$LIBS" + + need_md5="yes" ++ ++ ac_prefer_qdbm=yes ++ ++# Check whether --with-qdbm or --without-qdbm was given. ++if test "${with_qdbm+set}" = set; then ++ withval="$with_qdbm" ++ ac_prefer_qdbm=$withval ++fi; ++ if test x$ac_prefer_qdbm != xno; then ++ CPPFLAGS="$OLDCPPFLAGS" ++ LIBS="$OLDLIBS -lqdbm"; ++ echo "$as_me:$LINENO: checking for vlopen" >&5 ++echo $ECHO_N "checking for vlopen... $ECHO_C" >&6 ++if test "${ac_cv_vlopen+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ ac_cv_vlopen=no ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++vlopen(0,0,0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_vlopen=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++echo "$as_me:$LINENO: result: $ac_cv_vlopen" >&5 ++echo "${ECHO_T}$ac_cv_vlopen" >&6 ++ fi ++ + ac_prefer_gdbm=yes + + # Check whether --with-gdbm or --without-gdbm was given. +@@ -13865,7 +14563,7 @@ + withval="$with_gdbm" + ac_prefer_gdbm=$withval + fi; +- if test x$ac_prefer_gdbm != xno; then ++ if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then + CPPFLAGS="$OLDCPPFLAGS" + LIBS="$OLDLIBS -lgdbm"; + echo "$as_me:$LINENO: checking for gdbm_open" >&5 +@@ -13899,8 +14597,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1374,7 +2225,16 @@ 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 @@ +@@ -13933,7 +14630,7 @@ + withval="$with_bdb" + ac_bdb_prefix=$withval + fi; +- if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then ++ if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then + test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + for d in $ac_bdb_prefix; do + bdbpfx="$bdbpfx $d" +@@ -13985,8 +14682,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1384,7 +2244,35 @@ 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 @@ +@@ -14026,7 +14722,15 @@ + fi + fi + +- if test x$ac_cv_gdbmopen = xyes; then ++ if test x$ac_cv_vlopen = xyes; then ++ CPPFLAGS="$OLDCPPFLAGS" ++ LIBS="$OLDLIBS -lqdbm"; ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_QDBM 1 ++_ACEOF ++ ++ elif test x$ac_cv_gdbmopen = xyes; then + CPPFLAGS="$OLDCPPFLAGS" + LIBS="$OLDLIBS -lgdbm"; + +@@ -14043,8 +14747,8 @@ + _ACEOF + + else +- { { echo "$as_me:$LINENO: error: You need Sleepycat DB4 or GDBM for --enable-hcache" >&5 +-echo "$as_me: error: You need Sleepycat DB4 or GDBM for --enable-hcache" >&2;} ++ { { echo "$as_me:$LINENO: error: You need QDBM, GDBM or Sleepycat DB4 for hcache" >&5 ++echo "$as_me: error: You need QDBM, GDBM or Sleepycat DB4 for hcache" >&2;} + { (exit 1); exit 1; }; } + fi + fi +@@ -14102,8 +14806,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1394,7 +2282,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 @@ +@@ -14168,8 +14871,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1404,7 +2292,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 @@ +@@ -14233,8 +14935,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1414,7 +2302,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 @@ +@@ -14315,8 +15016,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1424,7 +2312,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 @@ +@@ -14457,8 +15157,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1434,7 +2322,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 @@ +@@ -14596,8 +15295,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1444,7 +2332,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 @@ +@@ -14781,8 +15479,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1454,7 +2342,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 @@ +@@ -15072,8 +15769,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1464,7 +2352,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 @@ +@@ -15279,8 +15975,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1474,7 +2362,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 @@ +@@ -15362,8 +16057,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1484,7 +2372,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 @@ +@@ -15413,8 +16107,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1494,7 +2382,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 @@ +@@ -15489,8 +16182,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1504,7 +2392,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 @@ +@@ -15560,8 +16252,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1514,7 +2402,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 @@ +@@ -15624,8 +16315,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1524,7 +2412,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 @@ +@@ -15730,8 +16420,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1534,7 +2422,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 @@ +@@ -15869,8 +16558,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1544,7 +2432,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 @@ +@@ -15929,8 +16617,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1554,7 +2442,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 @@ +@@ -16041,8 +16728,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1564,7 +2452,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 @@ +@@ -16527,8 +17213,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1574,7 +2462,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 @@ +@@ -16882,8 +17567,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1584,7 +2472,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 @@ +@@ -16954,8 +17638,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1594,7 +2482,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 @@ +@@ -17106,8 +17789,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1604,7 +2492,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 @@ +@@ -17174,8 +17856,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1614,7 +2502,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 @@ +@@ -17241,8 +17922,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1624,7 +2512,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 @@ +@@ -17429,8 +18109,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1634,7 +2522,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 @@ +@@ -17536,8 +18215,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1644,7 +2532,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 @@ +@@ -17640,8 +18318,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1654,7 +2542,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 @@ +@@ -17709,8 +18386,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1664,7 +2552,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 @@ +@@ -17791,8 +18467,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1674,7 +2562,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 @@ +@@ -17855,8 +18530,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1684,7 +2572,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 @@ +@@ -17917,8 +18591,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1694,7 +2582,16 @@ 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 @@ +@@ -18713,7 +19386,7 @@ + s,@AMTAR@,$AMTAR,;t t + s,@am__tar@,$am__tar,;t t + s,@am__untar@,$am__untar,;t t +-s,@CONFIGURE_DEPENDENCIES@,$CONFIGURE_DEPENDENCIES,;t t ++s,@CONFIG_STATUS_DEPENDENCIES@,$CONFIG_STATUS_DEPENDENCIES,;t t + s,@build@,$build,;t t + s,@build_cpu@,$build_cpu,;t t + s,@build_vendor@,$build_vendor,;t t +@@ -18970,11 +19643,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1706,7 +2603,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 @@ +@@ -19013,6 +19681,12 @@ fi;; esac done` || { (exit 1); exit 1; } @@ -1719,44 +2616,52 @@ 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 -@@ -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.11.orig/imap/Makefile.in mutt-1.5.11/imap/Makefile.in +--- mutt-1.5.11.orig/imap/Makefile.in 2005-09-15 16:22:49.000000000 +0200 ++++ mutt-1.5.11/imap/Makefile.in 2005-11-11 02:43:13.000000000 +0100 +@@ -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. -@@ -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 -@@ -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@ +@@ -102,7 +100,7 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ ++CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ +diff -ru mutt-1.5.11.orig/m4/Makefile.in mutt-1.5.11/m4/Makefile.in +--- mutt-1.5.11.orig/m4/Makefile.in 2005-09-15 16:22:50.000000000 +0200 ++++ mutt-1.5.11/m4/Makefile.in 2005-11-11 02:43:14.000000000 +0100 +@@ -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 @@ +@@ -71,7 +71,7 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ ++CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ +@@ -219,9 +219,9 @@ exit 1;; \ esac; \ done; \