* new version 2.11.8

  * Fix in configure script for recognition of SSL files in Ubuntu 12.04
  * Alpine does not attempt to automatically reopen a collection that
    was not opened due to cancellation by the user. Instead, the user
    must try to open it explicitly.
  * few improvements on new /tls1, /tls1_1, etc. options.

32 files changed, 912 insertions, 560 deletions

diff --git a/VERSION b/VERSION
index 03b7bd69..9462efac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.6
+2.11.8
diff --git a/alpine/folder.c b/alpine/folder.c
index 2d49ace2..191a5142 100644
--- a/alpine/folder.c
+++ b/alpine/folder.c
@@ -1736,7 +1736,7 @@ folder_list_text(struct pine *ps, FPROC_S *fp, gf_io_t pc, HANDLE_S **handlesp,
 	    color_write_for_folder(pc, CLR_NORMAL);
 	}
 
-	if(shown){
+	if(shown && LUU_YES(c_list->update)){
 	    /* Run thru list formatting as necessary */
 	    if((ftotal = folder_total(FOLDERS(c_list))) != 0){
 		int use_color;
@@ -2808,6 +2808,18 @@ folder_lister_choice(SCROLL_S *sparms)
 	
 	FPROC(sparms)->fs->context = cntxt;
 
+	if(!LUU_YES(cntxt->update)){
+	  cntxt->update = LUU_INIT;
+	  refresh_folder_list(cntxt, FPROC(sparms)->fs->no_dirs, TRUE, 
+						FPROC(sparms)->fs->cache_streamp);
+	  if(!LUU_YES(cntxt->update))
+	    q_status_message(SM_ORDER | SM_DING, 3, 3, _("Collection not updated"));
+	  else
+	    rv = 1;
+
+	  return rv;
+	}
+
 	if(cntxt->dir->status & CNTXT_NOFIND){
 	    rv = 1;		/* leave scrolltool to rebuild screen */
 	    FPROC(sparms)->fs->context = cntxt;
diff --git a/alpine/smime.c b/alpine/smime.c
index bcf88acb..b0bf16de 100644
--- a/alpine/smime.c
+++ b/alpine/smime.c
@@ -71,7 +71,7 @@ smime_get_passphrase(void)
 
     assert(ps_global->smime != NULL);
     snprintf(prompt, sizeof(prompt),
-            _("Enter passphrase for <%s>: "), (ps_global->smime && ps_global->smime->passphrase_emailaddr) ? ps_global->smime->passphrase_emailaddr : "unknown");
+            _("Enter passphrase for <%s>: "), (ps_global->smime && ps_global->smime->passphrase_emailaddr) ? ps_global->smime->passphrase_emailaddr[0] : "unknown");
 
     do {
         flags = OE_PASSWD | OE_DISALLOW_HELP;
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 13522c88..c2b22ed5 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
-@%:@ From configure.ac Rev:4 by chappa@washington.edu.
+@%:@ From configure.ac Rev:5 by chappa@washington.edu.
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.6.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.8.
 @%:@
 @%:@ Report bugs to <chappa@washington.edu>.
 @%:@ 
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.6'
-PACKAGE_STRING='alpine 2.11.6'
+PACKAGE_VERSION='2.11.8'
+PACKAGE_STRING='alpine 2.11.8'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures alpine 2.11.6 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1664,7 +1664,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.11.6:";;
+     short | recursive ) echo "Configuration of alpine 2.11.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1948,7 +1948,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.11.6
+alpine configure 2.11.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by alpine $as_me 2.11.6, which was
+It was created by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3375,7 +3375,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.11.6'
+ VERSION='2.11.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15569,7 +15569,7 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
 	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/debian_release -o -f /etc/debian_version ; then
-        if test !-d /etc/osso-af-init ; then
+        if test ! -d /etc/osso-af-init ; then
 	   alpine_SSLDIR="/etc/ssl"
 	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
 	   alpine_SSLKEYS="$alpine_SSLDIR/private"
@@ -16749,6 +16749,66 @@ fi
 	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
 	exit 1
     fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing TLSv1_2_client_method" >&5
+$as_echo_n "checking for library containing TLSv1_2_client_method... " >&6; }
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TLSv1_2_client_method ();
+int
+main ()
+{
+return TLSv1_2_client_method ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ssl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_TLSv1_2_client_method=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  
+else
+  ac_cv_search_TLSv1_2_client_method=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_TLSv1_2_client_method" >&5
+$as_echo "$ac_cv_search_TLSv1_2_client_method" >&6; }
+ac_res=$ac_cv_search_TLSv1_2_client_method
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2"
+	  
+$as_echo "@%:@define SSL_SUPPORTS_TLSV1_2 1" >>confdefs.h
+
+	
+fi
+
 fi
 
 if test "$alpine_with_ldap" = "yes" ; then
@@ -20161,7 +20221,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by alpine $as_me 2.11.6, which was
+This file was extended by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20227,7 +20287,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-alpine config.status 2.11.6
+alpine config.status 2.11.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2
index 13522c88..c2b22ed5 100644
--- a/autom4te.cache/output.2
+++ b/autom4te.cache/output.2
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
-@%:@ From configure.ac Rev:4 by chappa@washington.edu.
+@%:@ From configure.ac Rev:5 by chappa@washington.edu.
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.6.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.8.
 @%:@
 @%:@ Report bugs to <chappa@washington.edu>.
 @%:@ 
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.6'
-PACKAGE_STRING='alpine 2.11.6'
+PACKAGE_VERSION='2.11.8'
+PACKAGE_STRING='alpine 2.11.8'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures alpine 2.11.6 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1664,7 +1664,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.11.6:";;
+     short | recursive ) echo "Configuration of alpine 2.11.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1948,7 +1948,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.11.6
+alpine configure 2.11.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by alpine $as_me 2.11.6, which was
+It was created by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3375,7 +3375,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.11.6'
+ VERSION='2.11.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15569,7 +15569,7 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
 	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/debian_release -o -f /etc/debian_version ; then
-        if test !-d /etc/osso-af-init ; then
+        if test ! -d /etc/osso-af-init ; then
 	   alpine_SSLDIR="/etc/ssl"
 	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
 	   alpine_SSLKEYS="$alpine_SSLDIR/private"
@@ -16749,6 +16749,66 @@ fi
 	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
 	exit 1
     fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing TLSv1_2_client_method" >&5
+$as_echo_n "checking for library containing TLSv1_2_client_method... " >&6; }
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TLSv1_2_client_method ();
+int
+main ()
+{
+return TLSv1_2_client_method ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ssl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_TLSv1_2_client_method=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  
+else
+  ac_cv_search_TLSv1_2_client_method=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_TLSv1_2_client_method" >&5
+$as_echo "$ac_cv_search_TLSv1_2_client_method" >&6; }
+ac_res=$ac_cv_search_TLSv1_2_client_method
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2"
+	  
+$as_echo "@%:@define SSL_SUPPORTS_TLSV1_2 1" >>confdefs.h
+
+	
+fi
+
 fi
 
 if test "$alpine_with_ldap" = "yes" ; then
@@ -20161,7 +20221,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by alpine $as_me 2.11.6, which was
+This file was extended by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20227,7 +20287,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-alpine config.status 2.11.6
+alpine config.status 2.11.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index 42e3dda0..e7cca951 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -994,494 +994,498 @@ m4trace:configure.ac:1256: -1- AH_OUTPUT([HAS_TERMCAP], [/* Define if systems us
 @%:@undef HAS_TERMCAP])
 m4trace:configure.ac:1286: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2748: AC_RUN_IFELSE is expanded from...
 configure.ac:1286: the top level])
-m4trace:configure.ac:1328: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LDAP])
-m4trace:configure.ac:1328: -1- m4_pattern_allow([^ENABLE_LDAP$])
-m4trace:configure.ac:1328: -1- AH_OUTPUT([ENABLE_LDAP], [/* Enable LDAP query support */
+m4trace:configure.ac:1306: -1- AC_DEFINE_TRACE_LITERAL([SSL_SUPPORTS_TLSV1_2])
+m4trace:configure.ac:1306: -1- m4_pattern_allow([^SSL_SUPPORTS_TLSV1_2$])
+m4trace:configure.ac:1306: -1- AH_OUTPUT([SSL_SUPPORTS_TLSV1_2], [/* SSL Supports TLSV1.2 */
+@%:@undef SSL_SUPPORTS_TLSV1_2])
+m4trace:configure.ac:1332: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LDAP])
+m4trace:configure.ac:1332: -1- m4_pattern_allow([^ENABLE_LDAP$])
+m4trace:configure.ac:1332: -1- AH_OUTPUT([ENABLE_LDAP], [/* Enable LDAP query support */
 @%:@undef ENABLE_LDAP])
-m4trace:configure.ac:1333: -1- AC_DEFINE_TRACE_LITERAL([LDAP_DEPRECATED])
-m4trace:configure.ac:1333: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
-m4trace:configure.ac:1333: -1- AH_OUTPUT([LDAP_DEPRECATED], [/* Define if you use OpenLDAP 2.3.x deprecated functions */
+m4trace:configure.ac:1337: -1- AC_DEFINE_TRACE_LITERAL([LDAP_DEPRECATED])
+m4trace:configure.ac:1337: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
+m4trace:configure.ac:1337: -1- AH_OUTPUT([LDAP_DEPRECATED], [/* Define if you use OpenLDAP 2.3.x deprecated functions */
 @%:@undef LDAP_DEPRECATED])
-m4trace:configure.ac:1442: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
+m4trace:configure.ac:1446: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
 ../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-configure.ac:1442: the top level])
-m4trace:configure.ac:1488: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGEX_H])
-m4trace:configure.ac:1488: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1488: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Regular expression header file exists */
+configure.ac:1446: the top level])
+m4trace:configure.ac:1492: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGEX_H])
+m4trace:configure.ac:1492: -1- m4_pattern_allow([^HAVE_REGEX_H$])
+m4trace:configure.ac:1492: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Regular expression header file exists */
 @%:@undef HAVE_REGEX_H])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:125: AC_LANG_SAVE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/c.m4:72: AC_LANG_C is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- AC_SUBST([acx_pthread_config])
-m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([acx_pthread_config])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- AC_SUBST([acx_pthread_config])
+m4trace:configure.ac:1502: -1- AC_SUBST_TRACE([acx_pthread_config])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1498: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1502: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 @%:@undef PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_LIBS])
-m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_CFLAGS])
-m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1498: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1498: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1498: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
+m4trace:configure.ac:1502: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1502: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1502: -1- AC_SUBST([PTHREAD_LIBS])
+m4trace:configure.ac:1502: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1502: -1- AC_SUBST([PTHREAD_CFLAGS])
+m4trace:configure.ac:1502: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1502: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1502: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1502: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1502: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1502: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
 @%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1498: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1498: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
+m4trace:configure.ac:1502: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1502: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
 @%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:134: AC_LANG_RESTORE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1516: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
-m4trace:configure.ac:1516: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1516: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
+configure.ac:1502: the top level])
+m4trace:configure.ac:1520: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
+m4trace:configure.ac:1520: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1520: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
 @%:@undef HAVE_NANOSLEEP])
-m4trace:configure.ac:1526: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:1526: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1526: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:1530: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:1530: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1530: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
 @%:@undef STDC_HEADERS])
-m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1531: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
    */
 @%:@undef HAVE_DIRENT_H])
-m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1531: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
    */
 @%:@undef HAVE_SYS_NDIR_H])
-m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1531: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
    */
 @%:@undef HAVE_SYS_DIR_H])
-m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
+m4trace:configure.ac:1531: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
 @%:@undef HAVE_NDIR_H])
-m4trace:configure.ac:1528: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
-m4trace:configure.ac:1528: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1528: -1- AH_OUTPUT([STAT_MACROS_BROKEN], [/* Define to 1 if the `S_IS*\' macros in <sys/stat.h> do not work properly. */
+m4trace:configure.ac:1532: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
+m4trace:configure.ac:1532: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1532: -1- AH_OUTPUT([STAT_MACROS_BROKEN], [/* Define to 1 if the `S_IS*\' macros in <sys/stat.h> do not work properly. */
 @%:@undef STAT_MACROS_BROKEN])
-m4trace:configure.ac:1529: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1529: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+m4trace:configure.ac:1533: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
+m4trace:configure.ac:1533: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1533: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 @%:@undef HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1530: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1530: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+m4trace:configure.ac:1534: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
+m4trace:configure.ac:1534: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1534: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 @%:@undef TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1531: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1531: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1531: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
+m4trace:configure.ac:1535: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
+m4trace:configure.ac:1535: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1535: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
 @%:@undef GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1533: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:1537: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:1533: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
-m4trace:configure.ac:1533: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
+m4trace:configure.ac:1537: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
+m4trace:configure.ac:1537: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
 @%:@undef HAVE_ERRNO_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
 @%:@undef HAVE_CTYPE_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
 @%:@undef HAVE_FCNTL_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
 @%:@undef HAVE_SIGNAL_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
 @%:@undef HAVE_SETJMP_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
 @%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
 @%:@undef HAVE_SYS_PARAM_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
 @%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
 @%:@undef HAVE_SYS_UIO_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
 @%:@undef HAVE_SYS_UN_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
 @%:@undef HAVE_LIMITS_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
 @%:@undef HAVE_WCHAR_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
 @%:@undef HAVE_SYS_POLL_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
 @%:@undef HAVE_STROPTS_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
 @%:@undef HAVE_NETDB_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
 @%:@undef HAVE_SYSLOG_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
 @%:@undef HAVE_SYS_SYSLOG_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
 @%:@undef HAVE_LOCALE_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
 @%:@undef HAVE_LANGINFO_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
 @%:@undef HAVE_UTIME_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
 @%:@undef HAVE_SYS_UTIME_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
 @%:@undef HAVE_PTHREAD_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
 @%:@undef HAVE_PWD_H])
-m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
+m4trace:configure.ac:1539: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
 @%:@undef HAVE_ASSERT_H])
-m4trace:configure.ac:1562: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
-m4trace:configure.ac:1562: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1562: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
+m4trace:configure.ac:1566: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
+m4trace:configure.ac:1566: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1566: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
 @%:@undef HAS_TERMIOS])
-m4trace:configure.ac:1561: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
-m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1561: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
+m4trace:configure.ac:1565: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
+m4trace:configure.ac:1565: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1565: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
 @%:@undef HAS_TERMIO])
-m4trace:configure.ac:1561: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
-m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1561: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
+m4trace:configure.ac:1565: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
+m4trace:configure.ac:1565: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1565: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
 @%:@undef HAS_SGTTY])
-m4trace:configure.ac:1578: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+m4trace:configure.ac:1582: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
 Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.], [])
-m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1587: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
+m4trace:configure.ac:1591: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1591: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
 @%:@undef RETSIGTYPE])
-m4trace:configure.ac:1590: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:1590: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1590: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1594: -1- AC_DEFINE_TRACE_LITERAL([size_t])
+m4trace:configure.ac:1594: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1594: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
 @%:@undef size_t])
-m4trace:configure.ac:1591: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
-m4trace:configure.ac:1591: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1591: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1595: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
+m4trace:configure.ac:1595: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1595: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef mode_t])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1596: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
+m4trace:configure.ac:1596: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1596: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef pid_t])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1597: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef uid_t])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1597: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef gid_t])
-m4trace:configure.ac:1594: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
-m4trace:configure.ac:1594: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1594: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
+m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1598: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
 @%:@undef TM_IN_SYS_TIME])
-m4trace:configure.ac:1596: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
-m4trace:configure.ac:1596: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1596: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
+m4trace:configure.ac:1600: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
+m4trace:configure.ac:1600: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1600: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
 @%:@undef HAVE_UNION_WAIT])
-m4trace:configure.ac:1598: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1602: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1598: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1602: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1602: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1598: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1602: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1602: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1598: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
+m4trace:configure.ac:1602: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1602: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1602: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1598: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1602: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1602: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1615: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
-m4trace:configure.ac:1615: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1615: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
+m4trace:configure.ac:1619: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
+m4trace:configure.ac:1619: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1619: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
 @%:@undef UINT16])
-m4trace:configure.ac:1617: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1621: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1617: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1621: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1621: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1617: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1621: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1621: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1617: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1621: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1621: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1621: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1617: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
+m4trace:configure.ac:1621: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1621: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1634: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
-m4trace:configure.ac:1634: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1634: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
+m4trace:configure.ac:1638: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
+m4trace:configure.ac:1638: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1638: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
 @%:@undef UINT32])
-m4trace:configure.ac:1652: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
-m4trace:configure.ac:1652: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1652: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
+m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1656: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
 @%:@undef qsort_t])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
+m4trace:configure.ac:1660: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
 @%:@undef HAVE_SYS_SELECT_H])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1660: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
 @%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
+m4trace:configure.ac:1660: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1660: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
 @%:@undef SELECT_TYPE_ARG1])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
+m4trace:configure.ac:1660: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1660: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
 @%:@undef SELECT_TYPE_ARG234])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
+m4trace:configure.ac:1660: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1660: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
 @%:@undef SELECT_TYPE_ARG5])
-m4trace:configure.ac:1658: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
-m4trace:configure.ac:1658: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
+m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
    */
 @%:@undef HAVE_STRCOLL])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
+m4trace:configure.ac:1666: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
 @%:@undef HAVE_VFORK_H])
-m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
+m4trace:configure.ac:1666: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1666: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
 @%:@undef HAVE_FORK])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
+m4trace:configure.ac:1666: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
 @%:@undef HAVE_VFORK])
-m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
+m4trace:configure.ac:1666: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1666: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
 @%:@undef HAVE_WORKING_VFORK])
-m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([vfork])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
+m4trace:configure.ac:1666: -1- AC_DEFINE_TRACE_LITERAL([vfork])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1666: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
 @%:@undef vfork])
-m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
+m4trace:configure.ac:1666: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1666: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
 @%:@undef HAVE_WORKING_FORK])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
 @%:@undef HAVE_STRCHR])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
 @%:@undef HAVE_MEMCPY])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
 @%:@undef HAVE_STRTOL])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
 @%:@undef HAVE_STRTOUL])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
 @%:@undef HAVE_SELECT])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
 @%:@undef HAVE_POLL])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
 @%:@undef HAVE_QSORT])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
 @%:@undef HAVE_GETUID])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
 @%:@undef HAVE_GETPWUID])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
 @%:@undef HAVE_GETPWNAM])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
 @%:@undef HAVE_GETTIMEOFDAY])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
 @%:@undef HAVE_TMPFILE])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
 @%:@undef HAVE_UNAME])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
 @%:@undef HAVE_RENAME])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
 @%:@undef HAVE_READ])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
 @%:@undef HAVE_SIGNAL])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
 @%:@undef HAVE_SETJMP])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
 @%:@undef HAVE_CHOWN])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
 @%:@undef HAVE_WAIT4])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
 @%:@undef HAVE_WAITPID])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
 @%:@undef HAVE_WAIT])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
 @%:@undef HAVE_SRANDOM])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
 @%:@undef HAVE_POPEN])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
 @%:@undef HAVE_PCLOSE])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
 @%:@undef HAVE_FSYNC])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
 @%:@undef HAVE_TRUNCATE])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
 @%:@undef HAVE_LISTEN])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
 @%:@undef HAVE_WCWIDTH])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
 @%:@undef HAVE_MBSTOWCS])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
 @%:@undef HAVE_WCRTOMB])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
 @%:@undef HAVE_PUTENV])
-m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
+m4trace:configure.ac:1667: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
 @%:@undef HAVE_SETENV])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
+m4trace:configure.ac:1713: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
 @%:@undef HAVE_SIGACTION])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
+m4trace:configure.ac:1713: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
 @%:@undef HAVE_SIGEMPTYSET])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
+m4trace:configure.ac:1713: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
 @%:@undef HAVE_SIGADDSET])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
+m4trace:configure.ac:1713: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
 @%:@undef HAVE_SIGPROCMASK])
-m4trace:configure.ac:1709: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
-m4trace:configure.ac:1709: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
+m4trace:configure.ac:1713: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
+m4trace:configure.ac:1713: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1713: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
 @%:@undef POSIX_SIGNALS])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
+m4trace:configure.ac:1713: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
 @%:@undef HAVE_SIGSET])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
+m4trace:configure.ac:1713: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
 @%:@undef HAVE_SIGRELSE])
-m4trace:configure.ac:1709: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
-m4trace:configure.ac:1709: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1709: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
+m4trace:configure.ac:1713: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
+m4trace:configure.ac:1713: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1713: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
 @%:@undef SYSV_SIGNALS])
-m4trace:configure.ac:1720: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
-m4trace:configure.ac:1720: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1720: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
+m4trace:configure.ac:1724: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
+m4trace:configure.ac:1724: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1724: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
 @%:@undef HAVE_SYSLOG])
-m4trace:configure.ac:1742: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
-m4trace:configure.ac:1742: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1742: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
+m4trace:configure.ac:1746: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
+m4trace:configure.ac:1746: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1746: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
 @%:@undef SYSTYPE])
-m4trace:configure.ac:1743: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
-m4trace:configure.ac:1743: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1743: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
+m4trace:configure.ac:1747: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
+m4trace:configure.ac:1747: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1747: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
 @%:@undef C_FILESEP])
-m4trace:configure.ac:1744: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1744: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
+m4trace:configure.ac:1748: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
+m4trace:configure.ac:1748: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1748: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
 @%:@undef S_FILESEP])
-m4trace:configure.ac:1745: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
-m4trace:configure.ac:1745: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1745: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
+m4trace:configure.ac:1749: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
+m4trace:configure.ac:1749: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1749: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
 @%:@undef MAILDIR])
-m4trace:configure.ac:1746: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
-m4trace:configure.ac:1746: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1746: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
+m4trace:configure.ac:1750: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
+m4trace:configure.ac:1750: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1750: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
 @%:@undef MODE_READONLY])
-m4trace:configure.ac:1749: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
-m4trace:configure.ac:1749: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
-m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1750: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
-m4trace:configure.ac:1750: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
-m4trace:configure.ac:1750: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1769: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
-m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1769: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
+m4trace:configure.ac:1753: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
+m4trace:configure.ac:1753: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
+m4trace:configure.ac:1753: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1754: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
+m4trace:configure.ac:1754: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
+m4trace:configure.ac:1754: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1773: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
+m4trace:configure.ac:1773: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1773: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
 @%:@undef SMIME])
-m4trace:configure.ac:1770: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
-m4trace:configure.ac:1770: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1770: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
+m4trace:configure.ac:1774: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
+m4trace:configure.ac:1774: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1774: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
 @%:@undef SMIME_SSLCERTS])
-m4trace:configure.ac:1822: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
-m4trace:configure.ac:1822: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
-m4trace:configure.ac:1822: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1833: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
-m4trace:configure.ac:1833: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
-m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1837: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
-m4trace:configure.ac:1837: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
-m4trace:configure.ac:1837: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1840: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
-m4trace:configure.ac:1840: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
-m4trace:configure.ac:1840: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1860: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
-m4trace:configure.ac:1860: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1860: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
+m4trace:configure.ac:1826: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
+m4trace:configure.ac:1826: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
+m4trace:configure.ac:1826: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1837: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
+m4trace:configure.ac:1837: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
+m4trace:configure.ac:1837: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1841: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
+m4trace:configure.ac:1841: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
+m4trace:configure.ac:1841: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1844: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
+m4trace:configure.ac:1844: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
+m4trace:configure.ac:1844: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1864: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
+m4trace:configure.ac:1864: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1864: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
 @%:@undef PUBCOOKIE])
-m4trace:configure.ac:1867: -1- AC_SUBST([REGEX_BUILD])
-m4trace:configure.ac:1867: -1- AC_SUBST_TRACE([REGEX_BUILD])
-m4trace:configure.ac:1867: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1869: -1- AC_SUBST([WEB_BUILD])
-m4trace:configure.ac:1869: -1- AC_SUBST_TRACE([WEB_BUILD])
-m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1870: -1- AC_SUBST([WEB_BINDIR])
-m4trace:configure.ac:1870: -1- AC_SUBST_TRACE([WEB_BINDIR])
-m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1871: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1871: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1872: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1872: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1873: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1873: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1873: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1875: -1- AC_SUBST([AM_CFLAGS])
-m4trace:configure.ac:1875: -1- AC_SUBST_TRACE([AM_CFLAGS])
-m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1876: -1- AC_SUBST([AM_LDFLAGS])
-m4trace:configure.ac:1876: -1- AC_SUBST_TRACE([AM_LDFLAGS])
-m4trace:configure.ac:1876: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1878: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in $REGEX_MAKEFILE \
+m4trace:configure.ac:1871: -1- AC_SUBST([REGEX_BUILD])
+m4trace:configure.ac:1871: -1- AC_SUBST_TRACE([REGEX_BUILD])
+m4trace:configure.ac:1871: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1873: -1- AC_SUBST([WEB_BUILD])
+m4trace:configure.ac:1873: -1- AC_SUBST_TRACE([WEB_BUILD])
+m4trace:configure.ac:1873: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1874: -1- AC_SUBST([WEB_BINDIR])
+m4trace:configure.ac:1874: -1- AC_SUBST_TRACE([WEB_BINDIR])
+m4trace:configure.ac:1874: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1875: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1875: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1875: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1876: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1876: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1876: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1877: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1877: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1879: -1- AC_SUBST([AM_CFLAGS])
+m4trace:configure.ac:1879: -1- AC_SUBST_TRACE([AM_CFLAGS])
+m4trace:configure.ac:1879: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1880: -1- AC_SUBST([AM_LDFLAGS])
+m4trace:configure.ac:1880: -1- AC_SUBST_TRACE([AM_LDFLAGS])
+m4trace:configure.ac:1880: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1882: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in $REGEX_MAKEFILE \
 	  pith/osdep/Makefile pith/charconv/Makefile pith/Makefile \
 	  pico/osdep/Makefile pico/Makefile \
 	  alpine/osdep/Makefile alpine/Makefile \
 	  web/src/Makefile web/src/pubcookie/Makefile \
 	  web/src/alpined.d/Makefile \
 	  Makefile])
-m4trace:configure.ac:1885: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1885: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1885: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1885: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1885: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1885: -2- m4_include([VERSION])
-m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1885: -2- m4_include([VERSION])
-m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:1885: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:1889: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1889: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1889: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1889: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1889: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1889: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1889: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1889: -2- m4_include([VERSION])
+m4trace:configure.ac:1889: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1889: -2- m4_include([VERSION])
+m4trace:configure.ac:1889: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:1889: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:1889: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2
index f94b38d0..3f10ef2c 100644
--- a/autom4te.cache/traces.2
+++ b/autom4te.cache/traces.2
@@ -5471,15 +5471,16 @@ m4trace:configure.ac:1253: -1- m4_pattern_allow([^HAS_TERMINFO$])
 m4trace:configure.ac:1256: -1- m4_pattern_allow([^HAS_TERMCAP$])
 m4trace:configure.ac:1286: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2748: AC_RUN_IFELSE is expanded from...
 configure.ac:1286: the top level])
-m4trace:configure.ac:1328: -1- m4_pattern_allow([^ENABLE_LDAP$])
-m4trace:configure.ac:1333: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
-m4trace:configure.ac:1442: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
+m4trace:configure.ac:1306: -1- m4_pattern_allow([^SSL_SUPPORTS_TLSV1_2$])
+m4trace:configure.ac:1332: -1- m4_pattern_allow([^ENABLE_LDAP$])
+m4trace:configure.ac:1337: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
+m4trace:configure.ac:1446: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
 ../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-configure.ac:1442: the top level])
-m4trace:configure.ac:1488: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1498: -1- ACX_PTHREAD([
+configure.ac:1446: the top level])
+m4trace:configure.ac:1492: -1- m4_pattern_allow([^HAVE_REGEX_H$])
+m4trace:configure.ac:1502: -1- ACX_PTHREAD([
       AC_MSG_RESULT([yes])
       case "$target" in
 	  *openbsd*)
@@ -5494,111 +5495,111 @@ m4trace:configure.ac:1498: -1- ACX_PTHREAD([
     ], [
       AC_MSG_RESULT([no])
     ])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:125: AC_LANG_SAVE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/c.m4:72: AC_LANG_C is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1498: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1498: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1502: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1502: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1502: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:134: AC_LANG_RESTORE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1498: the top level])
-m4trace:configure.ac:1516: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1526: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1528: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1529: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1530: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1531: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1533: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1562: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1578: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+configure.ac:1502: the top level])
+m4trace:configure.ac:1520: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1530: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1532: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1533: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1534: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1535: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1537: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1566: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1565: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1565: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1582: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
 Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.], [])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1590: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1591: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1594: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1596: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1615: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1634: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1652: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1658: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1709: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1709: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1720: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1742: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1743: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1745: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1746: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1750: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1770: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1822: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1837: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1840: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1860: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1867: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1873: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1876: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1885: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1885: -2- m4_include([VERSION])
-m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1885: -2- m4_include([VERSION])
-m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1885: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:1885: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:1885: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1594: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1595: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1596: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1600: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1602: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1619: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1621: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1638: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1660: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1666: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1713: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1713: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1724: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1746: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1747: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1748: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1749: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1750: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1753: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1754: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1773: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1774: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1826: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1837: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1841: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1844: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1864: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1871: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1873: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1874: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1875: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1876: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1877: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1879: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1880: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1889: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1889: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1889: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1889: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1889: -2- m4_include([VERSION])
+m4trace:configure.ac:1889: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1889: -2- m4_include([VERSION])
+m4trace:configure.ac:1889: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1889: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:1889: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:1889: -1- _LT_PROG_LTMAIN
diff --git a/configure b/configure
index 3f9d5929..8a27618f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Rev:4 by chappa@washington.edu.
+# From configure.ac Rev:5 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.11.6.
+# Generated by GNU Autoconf 2.69 for alpine 2.11.8.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.6'
-PACKAGE_STRING='alpine 2.11.6'
+PACKAGE_VERSION='2.11.8'
+PACKAGE_STRING='alpine 2.11.8'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures alpine 2.11.6 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1664,7 +1664,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.11.6:";;
+     short | recursive ) echo "Configuration of alpine 2.11.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1948,7 +1948,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.11.6
+alpine configure 2.11.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by alpine $as_me 2.11.6, which was
+It was created by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3375,7 +3375,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.11.6'
+ VERSION='2.11.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15569,7 +15569,7 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
 	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/debian_release -o -f /etc/debian_version ; then
-        if test !-d /etc/osso-af-init ; then
+        if test ! -d /etc/osso-af-init ; then
 	   alpine_SSLDIR="/etc/ssl"
 	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
 	   alpine_SSLKEYS="$alpine_SSLDIR/private"
@@ -16749,6 +16749,66 @@ fi
 	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
 	exit 1
     fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing TLSv1_2_client_method" >&5
+$as_echo_n "checking for library containing TLSv1_2_client_method... " >&6; }
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TLSv1_2_client_method ();
+int
+main ()
+{
+return TLSv1_2_client_method ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ssl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_TLSv1_2_client_method=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_TLSv1_2_client_method+:} false; then :
+
+else
+  ac_cv_search_TLSv1_2_client_method=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_TLSv1_2_client_method" >&5
+$as_echo "$ac_cv_search_TLSv1_2_client_method" >&6; }
+ac_res=$ac_cv_search_TLSv1_2_client_method
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2"
+
+$as_echo "#define SSL_SUPPORTS_TLSV1_2 1" >>confdefs.h
+
+
+fi
+
 fi
 
 if test "$alpine_with_ldap" = "yes" ; then
@@ -20161,7 +20221,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by alpine $as_me 2.11.6, which was
+This file was extended by alpine $as_me 2.11.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20227,7 +20287,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-alpine config.status 2.11.6
+alpine config.status 2.11.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b47cb081..a281da4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl  */
 
 AC_PREREQ([2.69])
 
-AC_REVISION([Rev:4 by chappa@washington.edu])
+AC_REVISION([Rev:5 by chappa@washington.edu])
 
 dnl Alpine Version Number is in $srcdir/VERSION
 AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu])
@@ -696,7 +696,7 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
 	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/debian_release -o -f /etc/debian_version ; then
-        if test !-d /etc/osso-af-init ; then
+        if test ! -d /etc/osso-af-init ; then
 	   alpine_SSLDIR="/etc/ssl"
 	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
 	   alpine_SSLKEYS="$alpine_SSLDIR/private"
@@ -1303,6 +1303,10 @@ int main(void) {
 	AC_MSG_ERROR(Install openssl version >= 1.0.0c)
 	exit 1
     fi
+    AC_SEARCH_LIBS(TLSv1_2_client_method,ssl,
+	[ alpine_c_client_cflags="$alpine_c_client_cflags -DTLSV1_2"
+	  AC_DEFINE([SSL_SUPPORTS_TLSV1_2], [1], [SSL Supports TLSV1.2])
+	])
 fi
 
 dnl provide LDAP support?
diff --git a/imap/Makefile b/imap/Makefile
index e8805435..81e63ef2 100644
--- a/imap/Makefile
+++ b/imap/Makefile
@@ -419,13 +419,13 @@ oxp:	an
 	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
 	PASSWDTYPE=pam \
 	EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
-	SPECIALS="GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
+	SPECIALS="GSSLIB=/usr/lib PAMLDFLAGS=-lpam"
 
 oxs:	an
 	$(TOUCH) ip6
 	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
 	PASSWDTYPE=pam \
-	SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
+	SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMLDFLAGS=-lpam"
 
 osx:	osxok an
 	$(TOUCH) ip6
diff --git a/imap/src/c-client/imap4r1.c b/imap/src/c-client/imap4r1.c
index 8c1d326a..48017cab 100644
--- a/imap/src/c-client/imap4r1.c
+++ b/imap/src/c-client/imap4r1.c
@@ -81,6 +81,10 @@ typedef struct imap_local {
   unsigned int tlssslv23 : 1;	/* TLS using SSLv23 client method */
   unsigned int notlsflag : 1;	/* TLS not used in session */
   unsigned int sslflag : 1;	/* SSL session */
+  unsigned int tls1 : 1;	/* using TLSv1 over SSL */
+  unsigned int tls1_1 : 1;	/* using TLSv1_1 over SSL */
+  unsigned int tls1_2 : 1;	/* using TLSv1_2 over SSL */
+  unsigned int dtls1 : 1;	/* using DTLSv1 over SSL */
   unsigned int novalidate : 1;	/* certificate not validated */
   unsigned int filter : 1;	/* filter SEARCH/SORT/THREAD results */
   unsigned int loser : 1;	/* server is a loser */
@@ -885,7 +889,7 @@ MAILSTREAM *imap_open (MAILSTREAM *stream)
 	LOCAL->netstream->dtb = ssld;
 	if (!(LOCAL->netstream->stream =
 	      (*stls) (LOCAL->netstream->stream,mb.host,
-		       SSL_METHOD(mb) | (mb.novalidate ? NET_NOVALIDATECERT : NIL)))) {
+		       SSL_MTHD(mb) | (mb.novalidate ? NET_NOVALIDATECERT : NIL)))) {
 				/* drat, drop this connection */
 	  if (LOCAL->netstream) net_close (LOCAL->netstream);
 	  LOCAL->netstream = NIL;
@@ -911,6 +915,7 @@ MAILSTREAM *imap_open (MAILSTREAM *stream)
 	      (LOCAL->cap.auth ? imap_auth (stream,&mb,tmp,usr) :
 	       imap_login (stream,&mb,tmp,usr)))) {
 				/* failed, is there a referral? */
+    if (mb.tlsflag) LOCAL->tlsflag = T;
 	  if (ir && LOCAL->referral &&
 	      (s = (*ir) (stream,LOCAL->referral,REFAUTHFAILED))) {
 	    imap_close (stream,NIL);
@@ -935,6 +940,10 @@ MAILSTREAM *imap_open (MAILSTREAM *stream)
     if (LOCAL->netstream && !LOCAL->gotcapability) imap_capability (stream);
 				/* save state for future recycling */
     if (mb.tlsflag) LOCAL->tlsflag = T;
+    if (mb.tls1) LOCAL->tls1 = T;
+    if (mb.dtls1) LOCAL->dtls1 = T;
+    if (mb.tls1_1) LOCAL->tls1_1 = T;
+    if (mb.tls1_2) LOCAL->tls1_2 = T;
     if (mb.tlssslv23) LOCAL->tlssslv23 = T;
     if (mb.notlsflag) LOCAL->notlsflag = T;
     if (mb.sslflag) LOCAL->sslflag = T;
@@ -953,6 +962,10 @@ MAILSTREAM *imap_open (MAILSTREAM *stream)
       sprintf (tmp + strlen (tmp),":%lu",i);
     strcat (tmp,"/imap");
     if (LOCAL->tlsflag) strcat (tmp,"/tls");
+    if (LOCAL->tls1) strcat (tmp,"/tls1");
+    if (LOCAL->tls1_1) strcat (tmp,"/tls1_1");
+    if (LOCAL->tls1_2) strcat (tmp,"/tls1_2");
+    if (LOCAL->dtls1) strcat (tmp,"/dtls");
     if (LOCAL->tlssslv23) strcat (tmp,"/tls-sslv23");
     if (LOCAL->notlsflag) strcat (tmp,"/notls");
     if (LOCAL->sslflag) strcat (tmp,"/ssl");
diff --git a/imap/src/c-client/mail.c b/imap/src/c-client/mail.c
index 9b5526b4..0b479a1c 100644
--- a/imap/src/c-client/mail.c
+++ b/imap/src/c-client/mail.c
@@ -815,17 +815,19 @@ long mail_valid_net_parse_work (char *name,NETMBX *mb,char *service)
 	else if (mailssldriver && !compare_cstring (s,"ssl") && !mb->tlsflag)
 	  mb->sslflag = mb->notlsflag = T;
 	else if (!compare_cstring(s, "tls1") 
-			&& !mb->tls1_1flag && !mb->tls1_2flag && !mb->dtls1flag)
-	  mb->sslflag = mb->notlsflag = mb->tls1_1flag = T;
+			&& !mb->tls1_1 && !mb->tls1_2 && !mb->dtls1)
+	  mb->sslflag = mb->notlsflag = mb->tls1 = T;
+#ifdef TLSV1_2
 	else if (!compare_cstring(s, "tls1_1") 
-			&& !mb->tls1flag && !mb->tls1_2flag && !mb->dtls1flag)
-	  mb->sslflag = mb->notlsflag = mb->tls1_1flag = T;
+			&& !mb->tls1 && !mb->tls1_2 && !mb->dtls1)
+	  mb->sslflag = mb->notlsflag = mb->tls1_1 = T;
 	else if (!compare_cstring(s, "tls1_2") 
-			&& !mb->tls1flag && !mb->tls1_1flag && !mb->dtls1flag)
-	  mb->sslflag = mb->notlsflag = mb->tls1_2flag = T;
+			&& !mb->tls1 && !mb->tls1_1 && !mb->dtls1)
+	  mb->sslflag = mb->notlsflag = mb->tls1_2 = T;
+#endif
 	else if (!compare_cstring(s, "dtls1")
-			&& !mb->tls1flag && !mb->tls1_1flag && !mb->tls1_2flag)
-	  mb->sslflag = mb->notlsflag = mb->dtls1flag = T;
+			&& !mb->tls1 && !mb->tls1_1 && !mb->tls1_2)
+	  mb->sslflag = mb->notlsflag = mb->dtls1 = T;
 	else if (mailssldriver && !compare_cstring (s,"novalidate-cert"))
 	  mb->novalidate = T;
 				/* hack for compatibility with the past */
@@ -1234,9 +1236,10 @@ MAILSTREAM *mail_open (MAILSTREAM *stream,char *name,long options)
 	if (mb.tlsflag) strcat (tmp,"/tls");
 	if (mb.notlsflag) strcat (tmp,"/notls");
 	if (mb.sslflag) strcat (tmp,"/ssl");
-	if (mb.tls1_1flag) strcat (tmp,"/tls1_1");
-	if (mb.tls1_2flag) strcat (tmp,"/tls1_2");
-	if (mb.dtls1flag) strcat (tmp,"/dtls1");
+	if (mb.tls1) strcat (tmp,"/tls1");
+	if (mb.tls1_1) strcat (tmp,"/tls1_1");
+	if (mb.tls1_2) strcat (tmp,"/tls1_2");
+	if (mb.dtls1) strcat (tmp,"/dtls1");
 	if (mb.trysslflag) strcat (tmp,"/tryssl");
 	if (mb.novalidate) strcat (tmp,"/novalidate-cert");
 	strcat (tmp,"/pop3/loser}");
@@ -6170,6 +6173,10 @@ NETSTREAM *net_open (NETMBX *mb,NETDRIVER *dv,unsigned long port,
   NETSTREAM *stream = NIL;
   char tmp[MAILTMPLEN];
   unsigned long flags = mb->novalidate ? NET_NOVALIDATECERT : 0;
+  flags |= mb->tls1 || mb->tlsflag ? NET_TRYTLS1   : 0;
+  flags |= mb->tls1_1 ? NET_TRYTLS1_1 : 0;
+  flags |= mb->tls1_2 ? NET_TRYTLS1_2 : 0;
+  flags |= mb->dtls1  ? NET_TRYDTLS1  : 0;
   if (strlen (mb->host) >= NETMAXHOST) {
     sprintf (tmp,"Invalid host name: %.80s",mb->host);
     MM_LOG (tmp,ERROR);
diff --git a/imap/src/c-client/mail.h b/imap/src/c-client/mail.h
index 2c3f92d2..ad63fa2d 100644
--- a/imap/src/c-client/mail.h
+++ b/imap/src/c-client/mail.h
@@ -662,10 +662,10 @@ typedef struct net_mailbox {
   unsigned int dbgflag : 1;	/* debug flag */
   unsigned int secflag : 1;	/* secure flag */
   unsigned int sslflag : 1;	/* SSL driver flag */
-  unsigned int tls1flag : 1;	/* Use TLSv1 */
-  unsigned int tls1_1flag : 1;	/* Use TLSv1.1 */
-  unsigned int tls1_2flag : 1;	/* Use TLSV1.2 */
-  unsigned int dtls1flag : 1;	/* Use DTLSv1 */
+  unsigned int tls1    : 1;	/* Use TLSv1 */
+  unsigned int tls1_1  : 1;	/* Use TLSv1.1 */
+  unsigned int tls1_2  : 1;	/* Use TLSV1.2 */
+  unsigned int dtls1   : 1;	/* Use DTLSv1 */
   unsigned int trysslflag : 1;	/* try SSL driver first flag */
   unsigned int novalidate : 1;	/* don't validate certificates */
   unsigned int tlsflag : 1;	/* TLS flag */
@@ -676,11 +676,11 @@ typedef struct net_mailbox {
   unsigned int tlssslv23 : 1;	/* force SSLv23 client method over TLS */
 } NETMBX;
 
-#define SSL_METHOD(M)  ((M).tlssslv23	 ? NIL 		\
-			: (M).tls1flag	 ? NET_TRYTLS1	\
-			: (M).tls1_1flag ? NET_TRYTLS1_1	\
-			: (M).tls1_2flag ? NET_TRYTLS1_2	\
-			: (M).dtls1flag	 ? NET_TRYDTLS1	\
+#define SSL_MTHD(M)  ((M).tlssslv23	? NIL		\
+			: (M).tls1	? NET_TRYTLS1	\
+			: (M).tls1_1	? NET_TRYTLS1_1	\
+			: (M).tls1_2	? NET_TRYTLS1_2	\
+			: (M).dtls1	? NET_TRYDTLS1	\
 			: NET_TLSCLIENT)
 
 
diff --git a/imap/src/c-client/nntp.c b/imap/src/c-client/nntp.c
index 8a9d00a8..5a805e86 100644
--- a/imap/src/c-client/nntp.c
+++ b/imap/src/c-client/nntp.c
@@ -71,6 +71,10 @@ typedef struct nntp_local {
   unsigned int tlssslv23 : 1;	/* TLS using SSLv23 client method */
   unsigned int notlsflag : 1;	/* TLS not used in session */
   unsigned int sslflag : 1;	/* SSL session */
+  unsigned int tls1 : 1;	/* TLSv1 on SSL port */
+  unsigned int dtls1 : 1;	/* DTLSv1 on SSL port */
+  unsigned int tls1_1 : 1;	/* TLSv1_1 on SSL port */
+  unsigned int tls1_2 : 1;	/* TLSv1_2 on SSL port */
   unsigned int novalidate : 1;	/* certificate not validated */
   unsigned int xover : 1;	/* supports XOVER */
   unsigned int xhdr : 1;	/* supports XHDR */
@@ -663,6 +667,10 @@ MAILSTREAM *nntp_mopen (MAILSTREAM *stream)
     if (LOCAL->tlssslv23) mb.tlssslv23 = T;
     if (LOCAL->notlsflag) mb.notlsflag = T;
     if (LOCAL->sslflag) mb.sslflag = T;
+    if (LOCAL->tls1) mb.tls1 = T;
+    if (LOCAL->dtls1) mb.dtls1 = T;
+    if (LOCAL->tls1_1) mb.tls1_1 = T;
+    if (LOCAL->tls1_2) mb.tls1_2 = T;
     if (LOCAL->novalidate) mb.novalidate = T;
     if (LOCAL->nntpstream->loser) mb.loser = T;
     if (stream->secure) mb.secflag = T;
@@ -684,6 +692,10 @@ MAILSTREAM *nntp_mopen (MAILSTREAM *stream)
     if (mb.tlssslv23) strcat (tmp,"/tls-sslv23");
     if (mb.notlsflag) strcat (tmp,"/notls");
     if (mb.sslflag) strcat (tmp,"/ssl");
+    if (mb.tls1) strcat (tmp,"/tls1");
+    if (mb.tls1_1) strcat (tmp,"/tls1_1");
+    if (mb.tls1_2) strcat (tmp,"/tls1_2");
+    if (mb.dtls1) strcat (tmp,"/dtls1");
     if (mb.novalidate) strcat (tmp,"/novalidate-cert");
     if (mb.loser) strcat (tmp,"/loser");
     if (mb.secflag) strcat (tmp,"/secure");
@@ -1719,7 +1731,7 @@ SENDSTREAM *nntp_open_full (NETDRIVER *dv,char **hostlist,char *service,
 				/* negotiate TLS */
     if (stream->netstream->stream =
 	(*stls) (stream->netstream->stream,mb.host,
-		 SSL_METHOD(mb) | (mb.novalidate ? NET_NOVALIDATECERT:NIL)))
+		 SSL_MTHD(mb) | (mb.novalidate ? NET_NOVALIDATECERT:NIL)))
       extok = nntp_extensions (stream,(mb.secflag ? AU_SECURE : NIL) |
 			       (mb.authuser[0] ? AU_AUTHUSER : NIL));
     else {
diff --git a/imap/src/c-client/pop3.c b/imap/src/c-client/pop3.c
index 5065fed2..123abd9d 100644
--- a/imap/src/c-client/pop3.c
+++ b/imap/src/c-client/pop3.c
@@ -423,6 +423,10 @@ MAILSTREAM *pop3_open (MAILSTREAM *stream)
 	       net_port (LOCAL->netstream));
       if (mb.tlsflag) strcat (tmp,"/tls");
       if (mb.tlssslv23) strcat (tmp,"/tls-sslv23");
+      if (mb.tls1) strcat (tmp,"/tls1");
+      if (mb.tls1_1) strcat (tmp,"/tls1_1");
+      if (mb.tls1_2) strcat (tmp,"/tls1_1");
+      if (mb.dtls1) strcat (tmp,"/dtls1");
       if (mb.notlsflag) strcat (tmp,"/notls");
       if (mb.sslflag) strcat (tmp,"/ssl");
       if (mb.novalidate) strcat (tmp,"/novalidate-cert");
@@ -567,7 +571,7 @@ long pop3_auth (MAILSTREAM *stream,NETMBX *mb,char *pwd,char *usr)
     LOCAL->netstream->dtb = ssld;
     if (!(LOCAL->netstream->stream =
 	  (*stls) (LOCAL->netstream->stream,mb->host,
-		   SSL_METHOD(*mb) | (mb->novalidate ? NET_NOVALIDATECERT : NIL)))) {
+		   SSL_MTHD(*mb) | (mb->novalidate ? NET_NOVALIDATECERT : NIL)))) {
 				/* drat, drop this connection */
       if (LOCAL->netstream) net_close (LOCAL->netstream);
       LOCAL->netstream= NIL;
diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c
index 1cba3357..fe38cad0 100644
--- a/imap/src/c-client/smtp.c
+++ b/imap/src/c-client/smtp.c
@@ -210,7 +210,7 @@ SENDSTREAM *smtp_open_full (NETDRIVER *dv,char **hostlist,char *service,
 				/* TLS started, negotiate it */
 	    if (!(stream->netstream->stream = (*stls)
 		  (stream->netstream->stream,mb.host,
-		   SSL_METHOD(mb) | (mb.novalidate ? NET_NOVALIDATECERT:NIL)))){
+		   SSL_MTHD(mb) | (mb.novalidate ? NET_NOVALIDATECERT:NIL)))){
 				/* TLS negotiation failed after STARTTLS */
 	      sprintf (tmp,"Unable to negotiate TLS with this server: %.80s",
 		       mb.host);
diff --git a/imap/src/mtest/mtest.c b/imap/src/mtest/mtest.c
index 69af568b..12a05e33 100644
--- a/imap/src/mtest/mtest.c
+++ b/imap/src/mtest/mtest.c
@@ -81,7 +81,7 @@ void overview_header (MAILSTREAM *stream,unsigned long uid,OVERVIEW *ov,
 void header (MAILSTREAM *stream,long msgno);
 void display_body (BODY *body,char *pfx,long i);
 void status (MAILSTREAM *stream);
-void prompt (char *msg,char *txt);
+void prompt (char *msg,char *txt, int buflen);
 void smtptest (long debug);
 
 /* Main program - initialization */
@@ -118,13 +118,13 @@ int main ()
 #endif
   curhst = cpystr (mylocalhost ());
   puts ("MTest -- C client test program");
-  if (!*personalname) prompt ("Personal name: ",personalname);
+  if (!*personalname) prompt ("Personal name: ",personalname, sizeof(personalname));
 				/* user wants protocol telemetry? */
-  prompt ("Debug protocol (y/n)?",tmp);
+  prompt ("Debug protocol (y/n)?",tmp, sizeof(tmp));
   ucase (tmp);
   debug = (tmp[0] == 'Y') ? T : NIL;
   do {
-    prompt ("Mailbox ('?' for help): ",tmp);
+    prompt ("Mailbox ('?' for help): ",tmp, sizeof(tmp));
     if (!strcmp (tmp,"?")) {
       puts ("Enter INBOX, mailbox name, or IMAP mailbox as {host}mailbox");
       puts ("Known local mailboxes:");
@@ -154,13 +154,13 @@ void mm (MAILSTREAM *stream,long debug)
 {
   void *sdb = NIL;
   char cmd[MAILTMPLEN];
-  char *s,*arg;
+  char *s, *arg;
   unsigned long i;
   unsigned long last = 0;
   BODY *body;
   status (stream);		/* first report message status */
   while (stream) {
-    prompt ("MTest>",cmd);	/* prompt user, get command */
+    prompt ("MTest> ",cmd, sizeof(cmd));	/* prompt user, get command */
 				/* get argument */
     if (arg = strchr (cmd,' ')) *arg++ = '\0';
     switch (*ucase (cmd)) {	/* dispatch based on command */
@@ -255,7 +255,7 @@ void mm (MAILSTREAM *stream,long debug)
       }
 				/* get the new mailbox */
       while (!(stream = mail_open (stream,arg,debug))) {
-	prompt ("Mailbox: ",arg);
+	prompt ("Mailbox: ",arg, sizeof(arg));
 	if (!arg[0]) break;
       }
       last = 0;
@@ -592,10 +592,14 @@ void status (MAILSTREAM *stream)
  *          pointer to input buffer
  */
 
-void prompt (char *msg,char *txt)
+void prompt (char *msg,char *txt, int buflen)
 {
   printf ("%s",msg);
-  gets (txt);
+  fgets (txt, buflen-1, stdin);
+  if(txt[strlen(txt)-1] == '\012')
+      txt[strlen(txt)-1] = '\0';
+  if(txt[strlen(txt)-1] == '\015')
+      txt[strlen(txt)-1] = '\0';
 }
 
 /* Interfaces to C-client */
@@ -758,14 +762,14 @@ void smtptest (long debug)
   msg->return_path = mail_newaddr ();
   msg->return_path->mailbox = cpystr (curusr);
   msg->return_path->host = cpystr (curhst);
-  prompt ("To: ",line);
+  prompt ("To: ",line, sizeof(line));
   rfc822_parse_adrlist (&msg->to,line,curhst);
   if (msg->to) {
-    prompt ("cc: ",line);
+    prompt ("cc: ",line, sizeof(line));
     rfc822_parse_adrlist (&msg->cc,line,curhst);
   }
   else {
-    prompt ("Newsgroups: ",line);
+    prompt ("Newsgroups: ",line, sizeof(line));
     if (*line) msg->newsgroups = cpystr (line);
     else {
       mail_free_body (&body);
@@ -774,12 +778,16 @@ void smtptest (long debug)
       return;
     }
   }
-  prompt ("Subject: ",line);
+  prompt ("Subject: ",line, sizeof(line));
   msg->subject = cpystr (line);
   puts (" Msg (end with a line with only a '.'):");
   body->type = TYPETEXT;
   *text = '\0';
-  while (gets (line)) {
+  while (fgets(line, sizeof(line)-1, stdin)){
+    if(line[strlen(line)-1] == '\012')
+      line[strlen(line)-1] = '\0';
+    if(line[strlen(line)-1] == '\015')
+      line[strlen(line)-1] = '\0';
     if (line[0] == '.') {
       if (line[1] == '\0') break;
       else strcat (text,".");
diff --git a/imap/src/osdep/unix/ssl_unix.c b/imap/src/osdep/unix/ssl_unix.c
index 5a7d0bc0..3f6bcce9 100644
--- a/imap/src/osdep/unix/ssl_unix.c
+++ b/imap/src/osdep/unix/ssl_unix.c
@@ -55,7 +55,7 @@ typedef struct ssl_stream {
 #include "sslio.h"
 
 /* Function prototypes */
-
+const SSL_METHOD *ssl_connect_mthd(int flag);
 static SSLSTREAM *ssl_start(TCPSTREAM *tstream,char *host,unsigned long flags);
 static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags);
 static int ssl_open_verify (int ok,X509_STORE_CTX *ctx);
@@ -98,8 +98,8 @@ void ssl_onceonlyinit (void)
     struct stat sbuf;
 				/* if system doesn't have /dev/urandom */
     if (stat ("/dev/urandom",&sbuf)) {
-      while ((fd = open (tmpnam (tmp),O_WRONLY|O_CREAT|O_EXCL,0600)) < 0)
-	sleep (1);
+      strcpy(tmp, "SSLXXXXXX");
+      while ((fd = mkstemp(tmp)) < 0) sleep (1);
       unlink (tmp);		/* don't need the file */
       fstat (fd,&sbuf);		/* get information about the file */
       close (fd);		/* flush descriptor */
@@ -143,7 +143,25 @@ SSLSTREAM *ssl_aopen (NETMBX *mb,char *service,char *usrbuf)
 {
   return NIL;			/* don't use this mechanism with SSL */
 }
-
+
+/* ssl_connect_mthd: returns a context pointer to the connection to
+ * a ssl server
+ */
+const SSL_METHOD *ssl_connect_mthd(int flag)
+{
+  if(flag & NET_TRYTLS1)
+   return TLSv1_client_method(); 
+#ifdef TLSV1_2
+  else if(flag & NET_TRYTLS1_1) 
+	return TLSv1_1_client_method();
+  else if(flag & NET_TRYTLS1_2) 
+	return TLSv1_2_client_method();
+#endif
+  else if(flag & NET_TRYDTLS1)
+	return DTLSv1_client_method();
+  else return SSLv23_client_method();
+}
+
 /* Start SSL/TLS negotiations
  * Accepts: open TCP stream of session
  *	    user's host name
@@ -219,9 +237,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags)
     (sslclientkey_t) mail_parameters (NIL,GET_SSLCLIENTKEY,NIL);
   if (ssl_last_error) fs_give ((void **) &ssl_last_error);
   ssl_last_host = host;
-  if (!(stream->context = SSL_CTX_new ((flags & NET_TLSCLIENT) ?
-				       TLSv1_client_method () :
-				       SSLv23_client_method ())))
+  if (!(stream->context = SSL_CTX_new (ssl_connect_mthd(flags))))
     return "SSL context failed";
   SSL_CTX_set_options (stream->context,0);
 				/* disable certificate validation? */
diff --git a/include/config.h.in b/include/config.h.in
index f4ad936d..79d9f817 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -579,6 +579,9 @@
 /* Simple spell checker: reads stdin, emits misspellings on stdout */
 #undef SPELLER
 
+/* SSL Supports TLSV1.2 */
+#undef SSL_SUPPORTS_TLSV1_2
+
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
diff --git a/pith/conf.c b/pith/conf.c
index 10c64cfa..7cd1f83d 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -8041,14 +8041,14 @@ get_supported_options(void)
     /*
      * Line count:
      *   Title + blank			= 2
-     *   SSL Title + SSL lines + blank	= 4
+     *   SSL Title + SSL lines + blank	= 5
      *   Auth title + blank		= 2
      *   Driver title + blank		= 2
      *   LDAP title + LDAP line 	= 2
      *   Disabled explanation + blank line = 4
      *   end				= 1
      */
-    cnt = 17;
+    cnt = 18;
     for(a = mail_lookup_auth(1); a; a = a->next)
       cnt++;
     for(d = (DRIVER *)mail_parameters(NIL, GET_DRIVERS, NIL);
@@ -8078,6 +8078,10 @@ get_supported_options(void)
       config[cnt] = cpystr(_("  TLS and SSL"));
     else
       config[cnt] = cpystr(_("  None (no TLS or SSL)"));
+#ifdef SSL_SUPPORTS_TLSV1_2
+    if(++cnt < alcnt)
+      config[cnt] = cpystr("  TLSv1.1, TLSv1.2, and DTLSv1");
+#endif
 #ifdef SMIME
     if(++cnt < alcnt)
       config[cnt] = cpystr("  S/MIME");
diff --git a/pith/conftype.h b/pith/conftype.h
index c654f6c5..61472105 100644
--- a/pith/conftype.h
+++ b/pith/conftype.h
@@ -683,7 +683,7 @@ typedef struct smime_stuff {
     unsigned entered_passphrase:1;	/* user entered a passphrase */
     unsigned already_auto_asked:1;	/* asked for passphrase automatically, not again */
     volatile char passphrase[100];	/* storage for the entered passphrase */
-    char    *passphrase_emailaddr;	/* pointer to allocated storage */
+    char   **passphrase_emailaddr;	/* pointer to allocated storage */
 
     /*
      * If we are using the Container type it is easiest if we
diff --git a/pith/folder.c b/pith/folder.c
index 4536400e..e4ddcfc0 100644
--- a/pith/folder.c
+++ b/pith/folder.c
@@ -966,7 +966,8 @@ build_folder_list(MAILSTREAM **stream, CONTEXT_S *context, char *pat, char *cont
 	  ldata.stream = sp_stream_get(context->context, SP_SAME);
 
 	/* gotta open a new one? */
-	if(!ldata.stream){
+	if((F_OFF(F_CMBND_FOLDER_DISP, ps_global) 
+		|| context->update == LUU_INIT) && !ldata.stream){
 	    ldata.stream = mail_cmd_stream(context, &local_open);
 	    if(stream)
 	      *stream = ldata.stream;
@@ -978,6 +979,7 @@ build_folder_list(MAILSTREAM **stream, CONTEXT_S *context, char *pat, char *cont
 
 	if(!ldata.stream){
 	    context->use &= ~CNTXT_PARTFIND;	/* unset partial find bit */
+	    context->update = LUU_NOMORECHK;
 	    if(we_cancel)
 	      cancel_busy_cue(-1);
 
@@ -1021,6 +1023,7 @@ build_folder_list(MAILSTREAM **stream, CONTEXT_S *context, char *pat, char *cont
       set_read_predicted(0);
     }
 
+    context->update = LUU_INIT;
     if(context->dir && response.response.delim)
       context->dir->delim = response.response.delim;
 
diff --git a/pith/foldertype.h b/pith/foldertype.h
index 95d8b14a..509b07a3 100644
--- a/pith/foldertype.h
+++ b/pith/foldertype.h
@@ -123,6 +123,7 @@ typedef struct context {
 	short		 i;			/* index into config list  */
     } var;
 
+    time_t	     update;			/* update state		   */
     unsigned short   use,			/* use flags (see below)   */
 		     d_line;			/* display line for labels */
     SELECTED_S       selected;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 964389f2..8e0feacb 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 31 2013-09-15 20:38:27
+Alpine Commit 33 2013-10-05 22:46:52
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -179,6 +179,13 @@ Additions include:
 <P>
 
 <UL>
+  <LI> Alpine does not attempt to automatically reopen a collection that 
+       was not opened due to cancellation by the user. Instead, the user
+       must try to open it explicitly.
+  <LI> Alpine searches for a certificate that matches an email address in
+       all addresses in a certificate (instead of just the first one) but 
+       when it tries to unlock the certificate, it asks for the password 
+       for the first email address in that certificate.
   <LI> Add /tls1, /tls1_1, /tls1_2 and /dtls1 to the definition of a 
        server to use different ways to connect using ssl, for example 
        {server.com/tls1} will attempt to connect to server.com at the ssl 
@@ -19832,6 +19839,59 @@ Alpine must be linked with an SSL library for this option to be operational.
 
 </DD>
 
+<DT>TLS1</DT>
+<DD>
+This parameter indicates that the connection to the server will be made
+over the SSL port, but using the TLSv1 protocol, instead of the usual
+SSLv3 or SSLv2 protocols.
+Alpine must be linked with an SSL library for this option to be operational.
+
+<P>
+<CENTER><SAMP>/tls1</SAMP></CENTER>
+<P>
+
+</DD>
+
+<DT>DTLS1</DT>
+<DD>
+This parameter indicates that the connection to the server will be made
+over the SSL port, but using the DTLSv1 protocol, instead of the usual
+SSLv3 or SSLv2 protocols.
+Alpine must be linked with an SSL library for this option to be operational.
+
+<P>
+<CENTER><SAMP>/dtls1</SAMP></CENTER>
+<P>
+
+</DD>
+
+<DT>TLS1_1</DT>
+<DD>
+This parameter indicates that the connection to the server will be made
+over the SSL port, but using the TLSv1.1 protocol, instead of the usual
+SSLv3 or SSLv2 protocols.
+Alpine must be linked with an SSL library for this option to be operational.
+
+<P>
+<CENTER><SAMP>/tls1_1</SAMP></CENTER>
+<P>
+
+</DD>
+
+<DT>TLS1_2</DT>
+<DD>
+This parameter indicates that the connection to the server will be made
+over the SSL port, but using the TLSv1.2 protocol, instead of the usual
+SSLv3 or SSLv2 protocols.
+Alpine must be linked with an SSL library for this option to be operational.
+
+<P>
+<CENTER><SAMP>/tls1_2</SAMP></CENTER>
+<P>
+
+</DD>
+
+
 <DT>NoValidate-Cert</DT>
 <DD>Do not validate certificates (for TLS or SSL connections) from the server.
 This is needed if the server uses self-signed certificates or if Alpine
diff --git a/pith/smime.c b/pith/smime.c
index d212b233..532948bf 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -1166,8 +1166,12 @@ load_private_key(PERSONAL_CERT *pcert)
 	      ps_global->smime->need_passphrase = 1;
 	    
 	    if(ps_global->smime){
-		if(ps_global->smime->passphrase_emailaddr)
-		  fs_give((void **) &ps_global->smime->passphrase_emailaddr);
+		if(ps_global->smime->passphrase_emailaddr){
+		  int i;
+		  for(i = 0; ps_global->smime->passphrase_emailaddr[i] != NULL; i++)
+		     fs_give((void **)&ps_global->smime->passphrase_emailaddr[i]);
+		  fs_give((void **) ps_global->smime->passphrase_emailaddr);
+		}
 
 		ps_global->smime->passphrase_emailaddr = get_x509_subject_email(pcert->cert);
 	    }
@@ -1213,7 +1217,8 @@ match_personal_cert_to_email(ADDRESS *a)
 {
     PERSONAL_CERT   *pcert = NULL;
     char	buf[MAXPATH];
-    char    	*email;
+    char    	**email;
+    int i, done;
 
     if(!a || !a->mailbox || !a->host)
       return NULL;
@@ -1230,12 +1235,17 @@ match_personal_cert_to_email(ADDRESS *a)
 	
 	    email = get_x509_subject_email(pcert->cert);
 
-	    if(email && strucmp(email,buf)==0){
-		fs_give((void**) &email);
-		break;
+	    done = 0;
+	    if(email != NULL){
+		for(i = 0; email[i] && strucmp(email[i], buf) != 0; i++);
+		if(email[i] != NULL) done++;
+		for(i = 0; email[i] != NULL; i++)
+		   fs_give((void **)&email[i]);
+		fs_give((void **)email);
 	    }
 
-	    fs_give((void**) &email);
+	    if(done > 0)
+	      break;
 	}
     }
     
@@ -1634,7 +1644,7 @@ do_signature_verify(PKCS7 *p7, BIO *in, BIO *out)
 
         if(signers)
             for(i=0; i<sk_X509_num(signers); i++){
-		char	*email;
+		char	**email;
                 X509	*x = sk_X509_value(signers,i);
 		X509	*cert;
 		
@@ -1644,13 +1654,16 @@ do_signature_verify(PKCS7 *p7, BIO *in, BIO *out)
     	    	email = get_x509_subject_email(x);
     	    	
 		if(email){
-		    cert = get_cert_for(email);
-		    if(cert)
-		      X509_free(cert);
-		    else
-    	    	      save_cert_for(email, x);
-
-		    fs_give((void**) &email);
+		    int i;
+		    for(i = 0; email[i] != NULL; i++){
+			cert = get_cert_for(email[i]);
+			if(cert)
+			  X509_free(cert);
+			else
+			  save_cert_for(email[i], x);
+			fs_give((void **) &email[i]);
+		    }
+		    fs_give((void **) email);
     	    	}
             }
 
@@ -2338,8 +2351,12 @@ static void
 free_smime_struct(SMIME_STUFF_S **smime)
 {
     if(smime && *smime){
-	if((*smime)->passphrase_emailaddr)
-	  fs_give((void **) &(*smime)->passphrase_emailaddr);
+	if((*smime)->passphrase_emailaddr){
+	  int i;
+	  for(i = 0; (*smime)->passphrase_emailaddr[i] != NULL; i++)
+	     fs_give((void **) &(*smime)->passphrase_emailaddr[i]);
+	  fs_give((void **) (*smime)->passphrase_emailaddr);
+	}
 
 	if((*smime)->publicpath)
 	  fs_give((void **) &(*smime)->publicpath);
diff --git a/pith/smkeys.c b/pith/smkeys.c
index 5a827070..e815a59a 100644
--- a/pith/smkeys.c
+++ b/pith/smkeys.c
@@ -273,14 +273,17 @@ get_x509_subject_email(X509 *x)
  * address not only in the email address field, but also in an
  * X509v3 extension field, Subject Altenative Name.
  */
-char *
+char **
 get_x509_subject_email(X509 *x)
 {
-    char *result = NULL;
+    char **result = NULL;
+    int i, n;
     STACK_OF(OPENSSL_STRING) *emails = X509_get1_email(x);
-    if (sk_OPENSSL_STRING_num(emails) > 0) {
-	/* take the first one on the stack */
-	result = cpystr(sk_OPENSSL_STRING_value(emails, 0));
+    if ((n = sk_OPENSSL_STRING_num(emails)) > 0) {
+	result = fs_get((n+1)*sizeof(char *));
+	for(i = 0; i < n; i++)
+	  result[i] = cpystr(sk_OPENSSL_STRING_value(emails, i));
+	result[i] = NULL;
     }
     X509_email_free(emails);
     return result;
diff --git a/pith/smkeys.h b/pith/smkeys.h
index 0c6db8eb..d3c9031f 100644
--- a/pith/smkeys.h
+++ b/pith/smkeys.h
@@ -48,7 +48,7 @@ X509_STORE    *get_ca_store(void);
 PERSONAL_CERT *get_personal_certs(char *d);
 X509          *get_cert_for(char *email);
 void           save_cert_for(char *email, X509 *cert);
-char          *get_x509_subject_email(X509 *x);
+char         **get_x509_subject_email(X509 *x);
 EVP_PKEY      *load_key(PERSONAL_CERT *pc, char *pass);
 CertList      *mem_to_certlist(char *contents);
 void           add_to_end_of_certlist(CertList **cl, char *name, X509 *cert);
diff --git a/po/Makefile.in b/po/Makefile.in
index b4682559..67baf6d6 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.16
 
 PACKAGE = alpine
-VERSION = 2.11.5
+VERSION = 2.11.8
 PACKAGE_BUGREPORT = chappa@washington.edu
 
 SHELL = /bin/sh
diff --git a/web/src/pubcookie/wp_gssapi_proxy b/web/src/pubcookie/wp_gssapi_proxy
deleted file mode 100755
index c0c2f33f..00000000
--- a/web/src/pubcookie/wp_gssapi_proxy
+++ /dev/null
diff --git a/web/src/pubcookie/wp_tclsh b/web/src/pubcookie/wp_tclsh
deleted file mode 100755
index 99528161..00000000
--- a/web/src/pubcookie/wp_tclsh
+++ /dev/null
diff --git a/web/src/pubcookie/wp_uidmapper b/web/src/pubcookie/wp_uidmapper
deleted file mode 100755
index 8f806e5b..00000000
--- a/web/src/pubcookie/wp_uidmapper
+++ /dev/null
diff --git a/web/src/pubcookie/wp_umc b/web/src/pubcookie/wp_umc
deleted file mode 100755
index 6fe5cd36..00000000
--- a/web/src/pubcookie/wp_umc
+++ /dev/null