Introducing a us-dist target to create a USG-friendly version of

mutt.  Additionally, the NEWS file is prepared for 0.95.

13 files changed, 1832 insertions, 1801 deletions

diff --git a/Makefile.am b/Makefile.am
index 6a9e064e..b22c267f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,11 @@ mutt_LDADD = @MUTT_LIB_OBJECTS@ $(INTLLIBS)
 mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ $(INTLDEPS)
 
 DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+INCLUDES="-I./"
+
+non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
+	gnupgparse.c sha.h sha_locl.h \
+	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes
 
 EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 	gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
@@ -43,7 +48,7 @@ SUBDIRS = doc intl po rx contrib charsets
 
 OPS=$(srcdir)/OPS $(srcdir)/OPS.PGP
 
-keymap_defs.h: $(OPS)
+keymap_defs.h: $(OPS) $(srcdir)/gen_defs
 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
 
 reldate:
@@ -84,3 +89,19 @@ changelog:
 dist-hook:
 	-for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
 	-rm -f $(distdir)/config.h
+
+us-distdir: distdir dist-hook
+	mv $(distdir) $(distdir)-us
+
+us-dist: us-distdir
+	for file in $(distdir)-us/*.c $(distdir)-us/*.h ; do \
+		$(srcdir)/reap.pl < $$file > $$file.n && rm $$file && mv $$file.n $$file ; \
+	done
+	for file in $(non_us_sources) ; do \
+		echo "/* This file is only available in the international mutt version */" \
+			> $(distdir)-us/$$file ; \
+	done
+	echo "This version of mutt may be exported from the US.">  $(distdir)-us/EXPORTABLE
+	-chmod -R a+r $(distdir)-us
+	GZIP=$(GZIP) $(TAR) chozf $(distdir)-us.tar.gz $(distdir)-us
+	-rm -rf $(distdir)-us
diff --git a/Makefile.in b/Makefile.in
index ddb34921..0f36ef0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,6 +119,11 @@ mutt_LDADD = @MUTT_LIB_OBJECTS@ $(INTLLIBS)
 mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ $(INTLDEPS)
 
 DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+INCLUDES="-I./"
+
+non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
+	gnupgparse.c sha.h sha_locl.h \
+	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes
 
 EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 	gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
@@ -527,7 +532,7 @@ maintainer-clean
 mutt_dotlock.c: dotlock.c
 	cp dotlock.c mutt_dotlock.c
 
-keymap_defs.h: $(OPS)
+keymap_defs.h: $(OPS) $(srcdir)/gen_defs
 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
 
 reldate:
@@ -568,6 +573,22 @@ dist-hook:
 	-for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
 	-rm -f $(distdir)/config.h
 
+us-distdir: distdir dist-hook
+	mv $(distdir) $(distdir)-us
+
+us-dist: us-distdir
+	for file in $(distdir)-us/*.c $(distdir)-us/*.h ; do \
+		$(srcdir)/reap.pl < $$file > $$file.n && rm $$file && mv $$file.n $$file ; \
+	done
+	for file in $(non_us_sources) ; do \
+		echo "/* This file is only available in the international mutt version */" \
+			> $(distdir)-us/$$file ; \
+	done
+	echo "This version of mutt may be exported from the US.">  $(distdir)-us/EXPORTABLE
+	-chmod -R a+r $(distdir)-us
+	GZIP=$(GZIP) $(TAR) chozf $(distdir)-us.tar.gz $(distdir)-us
+	-rm -rf $(distdir)-us
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/NEWS b/NEWS
index 2169f9cc..8a0d296e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,112 +1,86 @@
-Major changes since 0.91.1
---------------------------
-
-- additional format for $hdr_format
-  	%L	displays the total size of all visible messages in a
-		limited view
-	%<fmt>	displays current time using strftime(fmt)
-
-- additional operators to the pattern matching lanauge:
-	~B<pattern>	finds pattern anywhere in the message (more
-			efficient than ~h %s | ~b %s
-	~z<size>	finds messages of size <size>
-			E.g. 
-			 ~z<10k #finds messages smaller than 10KB
-			 ~z>10k #finds messages larger than 10KB
-			 ~z10k  #finds messages exactly 10KB in length
-			 
-
-- the $hdr_format variable is renamed to $index_format
-  $hdr_format is still accepted for backwards compatibility
-
-- new variable $folder_format to display entries in the 'browser' menu.
-
-- new variable $followup_to to control generation of Mail-Followup-To
-  field. You can edit this field and Mutt will not overwrite it.
-
-- new variable $sendmail_wait
-
-  Specifies the number of seconds to wait for the ``sendmail'' process
-  to finish before giving up and putting delivery in the background.
-
-  Mutt interprets the value of this variable as follows:
-
-  >0      number of seconds to wait for sendmail to finish before continuing
-  0       wait forever for sendmail to finish
-  <0      always put sendmail in the background without waiting
-
-  Note that if you specify a value other than 0, the output of the child
-  process will be put in a temporary file.  If there is some error, you
-  will be informed as to where to find the output.
-
-- Variable $sendmail_bounce has been removed. Mutt now passes all
-  recipients on the command line for normal sending. 
-
-- new variable $query_command
-  Adds support for querying an external database for email addresses.
-
-- The $forward_decode variable has been removed. This has been split into 2
-  variables
-
-  $forward_decode - used when $mime_fwd is not set
-  $mime_forward_decode - used when $mime_fwd is set
-
-- new variable $wrap_search. This controls whether searches wrap around the
-  end of the mailbox.
-  
-  When set, searches will wrap around the first (or last) message. When
-  unset, searches will not wrap
-
-
-- New command 'reset' to reset variables to their default compile-time
-  definitions. When used with special keyword 'all', all variables are
-  reset to their default values. When used with the 'set' command and the
-  variable name prefixed with '&', this has the same behaviour as the
-  'reset' command.
-
-  Eg. 
-   reset move
-   reset all
-   set &move
-   set &all
-
-- Function key names used in muttrc need to be enclosed in <>. 
-  Function keys can be used in macros also.
-  
-  Eg. 
-   macro index Y *<PageUp>
-   bind index <down> next-entry
-
-- You can now delete a message's attachments by pressing 'd' (delete-entry)
-  on the attachment in the attachment menu.
-  
-- You can now color index menu entries using the pattern matching language.
-  The 'uncolor' command resets the entry to its default color. The '*'
-  token can be used to reset all index entries to their default colors.
-  
-  Eg.
-    color index blue white ~fvikas
-    color index red white ~z>100k
-    uncolor index ~fvikas
-    uncolor index *
-    
-- mailboxes specified in save-hooks can be %-expanded using $header_format
-
-- the default save mailbox no longer looks at defined `lists'. To get the
-  old behaviour, use
-    save-hook ~l %B
-
-- optional strings in format strings have been extended to allow for an
-  `else' clause.  the new syntax is:
-        %?<testchar>?<if-string>&<else-string>?
-  or if no `else' clause is desired (backwards compatibility):
-        %?<testchar>?<if-string>?
-
-- If new mail is delivered to a folder when Mutt is displaying a limited
-  view of the folder, it is added to the limited view only if it satisfies
-  the current limit criteria.
-
-- the <Tab> key on the command-line now completes commands and variable
-  names. The longest non-ambiguous part is put on the command-line.
-  Entering additional text and using <Tab> will perform completion again.
+Major changes since 0.93
+------------------------
+
+- i18n support of various kinds: Mutt now comes with character set
+  definitions, so it is able to convert character sets you encounter
+  in e-mail messagese to your local display's character set as
+  defined by the $charset configuration variable.  This includes a
+  poorly-tested UTF-8 decoder.
+
+  Additionally, mutt includes GNU gettext support, so you can make
+  it speak your own language.  To use this, just set the environment
+  variable "LANG" appropriately.
+
+  (For a list of currently supported languages, have a look at the
+  po files in the po subdirectory.)
+
+- There is support for the POP3 "last" command for just fetching the
+  latest unread messages from your POP server.  To enable use of
+  this feature, set the $pop_last configuration option.
+
+- The IMAP code's handling of server-side EXPUNGE messages was
+  fixed, so mutt should now be able to cope with concurrent access
+  to IMAP folders.  This is, e.g., supported by the CMU and MS
+  Exchange IMAP servers.
+
+- mh_sequences support was _dropped_.  The reason is, on the one
+  hand, a major re-write of the mh and maildir folder
+  resynchronization code, and the fact that there is no locking
+  protocol defined for this file.  If you want to use
+  one-file-per-message folders, you should better rely on maildir.
+
+- The new patterns ~g and ~G in the pattern language match PGP
+  signed and encrypted messages, respectively.
+
+- The $smileys configuration variable defines exceptions from the
+  quote-detecting regular expressions.  This can be used to
+  correctly handle lines beginning with smileys such as ":-)" -
+  these lines were detected as quoted text by the old code.
+
+- The syntax for function keys in key bindings and macro definitions
+  has changed:  Instead of "fN", you have to use "<fN>" now.  This
+  is more consistant with the syntax for the other special keys like
+  "<up>", "<down>", and so on.
+
+- We have a new feature named edit-message.  This enables you to
+  edit a message from one of your mail folders and re-send or
+  re-file it afterwards.
+
+- Thread collapsing is there: To control it, we have the two
+  functions collapse-all and collapse-thread, and the configuration
+  variables $collapse_unread and $collapse_jump.
+
+- We have a new set of functions decrypt-{save,copy}. They strip off
+  the initial layer of PGP/MIME encryption.  For "classical"
+  application/pgp messages, they are equivalent to the decode
+  functions, for unencrypted messages they fall back to the normal
+  save functions.
+
+- The build-time "hidden host" option has gone.  Use the
+  $hidden_host configuration variable instead.
+
+- Unknown major MIME types are recognized properly.
+
+- An option $write_bcc controls whether or not the Bcc header is
+  written out to the mail transport agent or not.  Exim users may
+  wish to use this.
+
+- The compose menu tries to detect and smoothly handle changes to
+  attached files.
+
+- On the compose menu, you can generate a "private" copy of an
+  attached file using the get-attachment function.
+
+- sendmail's exit values are properly interpreted, so you will no
+  longer get a "no such file or directory" error when sending mail
+  to a non-existing local user.
+
+- The variable $attach_format controls the look of the compose and
+  attach menus.
+
+- The file browser permits you to view files before selecting them.
+
+- Bug fixes of all kinds.  Look at the ChangeLog file for details.
+
+
 $Id$
diff --git a/config.h.in b/config.h.in
index 48343cff..89ea96fb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,6 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* $Id$ */
+
 /* Is this the international version? */
 #undef SUBVERSION
 
diff --git a/configure b/configure
index 27a60c51..95d225a0 100755
--- a/configure
+++ b/configure
@@ -1181,14 +1181,16 @@ EOF
 
 
 OPS='$(srcdir)/OPS'
-if test -f $srcdir/pgp.c; then
-	SUBVERSION=i
+if test -f $srcdir/EXPORTABLE ; then
+	SUBVERSION="us"
+else
+	SUBVERSION="i"
 	PGPPATH=no
-	
+
 	# Extract the first word of "gpg", so it can be a program name with args.
 set dummy gpg; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1192: checking for $ac_word" >&5
+echo "configure:1194: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GPG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1228,11 +1230,11 @@ EOF
 EOF
 
 	fi
-	
+
 	# Extract the first word of "pgpk", so it can be a program name with args.
 set dummy pgpk; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1236: checking for $ac_word" >&5
+echo "configure:1238: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PGPK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1277,7 +1279,7 @@ EOF
 	# Extract the first word of "pgp", so it can be a program name with args.
 set dummy pgp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1281: checking for $ac_word" >&5
+echo "configure:1283: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PGP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1341,7 +1343,7 @@ EOF
 # Extract the first word of "ispell", so it can be a program name with args.
 set dummy ispell; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1345: checking for $ac_word" >&5
+echo "configure:1347: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ISPELL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1380,7 @@ EOF
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1382: checking how to run the C preprocessor" >&5
+echo "configure:1384: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1393,13 +1395,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1397 "configure"
+#line 1399 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1410,13 +1412,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1414 "configure"
+#line 1416 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1442,7 +1444,7 @@ echo "$ac_t""$CPP" 1>&6
 if test "${with_slang+set}" = set; then
   withval="$with_slang"
   echo $ac_n "checking if -ltermlib is required""... $ac_c" 1>&6
-echo "configure:1446: checking if -ltermlib is required" >&5
+echo "configure:1448: checking if -ltermlib is required" >&5
 if eval "test \"`echo '$''{'mutt_cv_bsdish'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1450,7 +1452,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1454 "configure"
+#line 1456 "configure"
 #include "confdefs.h"
 #include <sys/param.h>
 
@@ -1463,7 +1465,7 @@ main ()
 #endif
 }
 EOF
-if { (eval echo configure:1467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   mutt_cv_bsdish=yes
 else
@@ -1480,7 +1482,7 @@ fi
 echo "$ac_t""$mutt_cv_bsdish" 1>&6
 	
 	echo $ac_n "checking for S-Lang""... $ac_c" 1>&6
-echo "configure:1484: checking for S-Lang" >&5
+echo "configure:1486: checking for S-Lang" >&5
 	if test $withval = yes; then
 		if test -d $srcdir/../slang; then
 			mutt_cv_slang=$srcdir/../slang/src
@@ -1526,16 +1528,16 @@ EOF
 	
 		
 	echo $ac_n "checking if I can compile a test SLang program""... $ac_c" 1>&6
-echo "configure:1530: checking if I can compile a test SLang program" >&5
+echo "configure:1532: checking if I can compile a test SLang program" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1534 "configure"
 #include "confdefs.h"
 
 int main() {
 SLtt_get_terminfo ();
 ; return 0; }
 EOF
-if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1563,7 +1565,7 @@ fi
 
 
 	echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:1567: checking for initscr in -lncurses" >&5
+echo "configure:1569: checking for initscr in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1571,7 +1573,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1575 "configure"
+#line 1577 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1582,7 +1584,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1605,17 +1607,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1609: checking for $ac_hdr" >&5
+echo "configure:1611: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1614 "configure"
+#line 1616 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1656,12 +1658,12 @@ fi
 
 
 	echo $ac_n "checking for start_color""... $ac_c" 1>&6
-echo "configure:1660: checking for start_color" >&5
+echo "configure:1662: checking for start_color" >&5
 if eval "test \"`echo '$''{'ac_cv_func_start_color'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1665 "configure"
+#line 1667 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char start_color(); below.  */
@@ -1684,7 +1686,7 @@ start_color();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_start_color=yes"
 else
@@ -1709,12 +1711,12 @@ fi
 	for ac_func in typeahead bkgdset curs_set meta use_default_colors
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1713: checking for $ac_func" >&5
+echo "configure:1715: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1718 "configure"
+#line 1720 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1737,7 +1739,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1764,12 +1766,12 @@ done
 	for ac_func in resizeterm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1768: checking for $ac_func" >&5
+echo "configure:1770: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1773 "configure"
+#line 1775 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1792,7 +1794,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1821,12 +1823,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1825: checking for ANSI C header files" >&5
+echo "configure:1827: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
+#line 1832 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1834,7 +1836,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1851,7 +1853,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1855 "configure"
+#line 1857 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1869,7 +1871,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1873 "configure"
+#line 1875 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1890,7 +1892,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1894 "configure"
+#line 1896 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1901,7 +1903,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1929,17 +1931,17 @@ for ac_hdr in stdarg.h sys/ioctl.h sysexits.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1933: checking for $ac_hdr" >&5
+echo "configure:1935: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1938 "configure"
+#line 1940 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1967,12 +1969,12 @@ done
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1971: checking return type of signal handlers" >&5
+echo "configure:1973: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1976 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1989,7 +1991,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:1993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2009,12 +2011,12 @@ EOF
 
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2013: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2015: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2018 "configure"
+#line 2020 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2026,7 +2028,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -2048,7 +2050,7 @@ fi
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2052: checking size of long" >&5
+echo "configure:2054: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2056,7 +2058,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2060 "configure"
+#line 2062 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2067,7 +2069,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -2088,12 +2090,12 @@ EOF
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2092: checking for pid_t" >&5
+echo "configure:2094: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2097 "configure"
+#line 2099 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2124,12 +2126,12 @@ fi
 for ac_func in setegid srand48 strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2128: checking for $ac_func" >&5
+echo "configure:2130: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2133 "configure"
+#line 2135 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2152,7 +2154,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2180,12 +2182,12 @@ done
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2184: checking for $ac_func" >&5
+echo "configure:2186: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2189 "configure"
+#line 2191 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2208,7 +2210,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2238,12 +2240,12 @@ done
 mutt_cv_snprintf=no
 SNPRINTFOBJS=""
 echo $ac_n "checking for snprintf""... $ac_c" 1>&6
-echo "configure:2242: checking for snprintf" >&5
+echo "configure:2244: checking for snprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2247 "configure"
+#line 2249 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char snprintf(); below.  */
@@ -2266,7 +2268,7 @@ snprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_snprintf=yes"
 else
@@ -2290,12 +2292,12 @@ mutt_cv_snprintf=yes
 fi
 
 echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:2294: checking for vsnprintf" >&5
+echo "configure:2296: checking for vsnprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2299 "configure"
+#line 2301 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vsnprintf(); below.  */
@@ -2318,7 +2320,7 @@ vsnprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vsnprintf=yes"
 else
@@ -2350,12 +2352,12 @@ fi
 for ac_func in ftruncate
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2354: checking for $ac_func" >&5
+echo "configure:2356: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2359 "configure"
+#line 2361 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2378,7 +2380,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2400,7 +2402,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for chsize in -lx""... $ac_c" 1>&6
-echo "configure:2404: checking for chsize in -lx" >&5
+echo "configure:2406: checking for chsize in -lx" >&5
 ac_lib_var=`echo x'_'chsize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2408,7 +2410,7 @@ else