* Save command did not warn of existence of a message with a deleted

    attachment in an aggregate save, unless cursor was positioned on a message with
    a deleted attachment. Reported by Florian Herzig.

  * Rewrite of configure script: ldap is checked for after ssl, which is checked
    after crypto, which is checked for after dl library. Set defaults for include
    and lib directories based on SSLDIR. Joint work with Florian Herzig.

  * Update contact information (remove alpine-contact@u.washington.edu and
    add chappa@gmx.com)

18 files changed, 1506 insertions, 1304 deletions

diff --git a/VERSION b/VERSION
index 7cd5929f..497a78c5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.4
+2.11.5
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index 17da8ec8..57716e4e 100644
--- a/alpine/mailcmd.c
+++ b/alpine/mailcmd.c
@@ -2370,18 +2370,19 @@ cmd_save(struct pine *state, MAILSTREAM *stream, MSGNO_S *msgmap, int aopt, CmdW
 
     dprint((4, "\n - saving message -\n"));
 
+    if(MCMD_ISAGG(aopt) && !pseudo_selected(stream, msgmap))
+      return rv;
+
     state->ugly_consider_advancing_bit = 0;
     if(F_OFF(F_SAVE_PARTIAL_WO_CONFIRM, state)
        && msgno_any_deletedparts(stream, msgmap)
        && want_to(_("Saved copy will NOT include entire message!  Continue"),
 		  'y', 'n', NO_HELP, WT_FLUSH_IN | WT_SEQ_SENSITIVE) != 'y'){
+	restore_selected(msgmap);
 	cmd_cancelled("Save message");
 	return rv;
     }
 
-    if(MCMD_ISAGG(aopt) && !pseudo_selected(stream, msgmap))
-      return rv;
-
     raw = mn_m2raw(msgmap, mn_get_cur(msgmap));
 
     if(mn_total_cur(msgmap) <= 1L){
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index ec107ab8..9edfe27e 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
-@%:@ From configure.ac Rev:2 by chappa@washington.edu.
+@%:@ From configure.ac Rev:3 by chappa@washington.edu.
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.4.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.5.
 @%:@
 @%:@ 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.4'
-PACKAGE_STRING='alpine 2.11.4'
+PACKAGE_VERSION='2.11.5'
+PACKAGE_STRING='alpine 2.11.5'
 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.4 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.5 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.4:";;
+     short | recursive ) echo "Configuration of alpine 2.11.5:";;
    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.4
+alpine configure 2.11.5
 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.4, which was
+It was created by alpine $as_me 2.11.5, 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.4'
+ VERSION='2.11.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15542,13 +15542,19 @@ else
         alpine_SSLTYPE="nopwd"
 	if test -d /etc/pki/tls ; then  
 	  alpine_SSLDIR="/etc/pki/tls"
-	  alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	  alpine_SSLKEYS="$alpine_SSLDIR/private"
-	  alpine_SSLINCLUDE="/usr/include/openssl" 
-	  alpine_SSLLIB="/usr/lib"
 	else
 	  alpine_SSLDIR="/usr/share/ssl"
 	fi
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
+      elif test -f /etc/mandrake-release ; then
+	alpine_SSLDIR="/usr/lib/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs" 
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/SuSE-release ; then
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/etc/ssl"
@@ -15562,6 +15568,14 @@ else
         alpine_SSLCERTS="/usr/share/certs"
 	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
+	   alpine_SSLDIR="/etc/ssl"
+	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	   alpine_SSLKEYS="$alpine_SSLDIR/private"
+	   alpine_SSLINCLUDE="/usr/include/openssl" 
+	   alpine_SSLLIB="/usr/lib"
+        fi
       else
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/usr"
@@ -15584,14 +15598,49 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
       fi
       ;;
+    *-*-netbsd*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-dragonfly*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
     *-openbsd*)
-      alpine_SSLTYPE="nopwd"
-      alpine_SSLDIR="/usr"
-      alpine_SSLCERTS="/etc/ssl/certs"
+	alpine_SSLTYPE="nopwd"
+	alpine_SSLDIR="/usr"
+	alpine_SSLCERTS="/etc/ssl/certs"
+      ;;
+    *-*-freebsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-openbsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+	alpine_SSLCERTS="/etc/ssl" 
+	alpine_SSLKEYS="/etc/ssl/private"
+      ;;
+    *-*-cygwin)
+	alpine_SSLDIR="/usr/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs" 
+	alpine_SSLKEYS="$alpine_SSLDIR/certs"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
       ;;
     *-sco-sysv* | *-sysv*UnixWare | *-sysv*OpenUNIX)
-      alpine_SSLTYPE="sco.nopwd"
-      alpine_SSLDIR="/usr/local/ssl"
+	alpine_SSLTYPE="sco.nopwd"
+	alpine_SSLDIR="/usr/local/ssl"
       ;;
     *-*-solaris*)
       if test -d /usr/sfw/include/openssl ; then
@@ -15618,6 +15667,8 @@ if test "${with_ssl_dir+set}" = set; then :
   withval=$with_ssl_dir; 
       if test "x$withval" != "xno" ; then
 	alpine_SSLDIR=$withval
+	alpine_SSLINCLUDE=$alpine_SSLDIR/include
+	alpine_SSLLIB=$alpine_SSLDIR/lib
       fi
     
 fi
@@ -15860,11 +15911,6 @@ case "$host" in
       systype="LMD"
       alpine_c_client_target="lmd"
       alpine_PAM="yes"
-      alpine_SSLDIR="/usr/lib/ssl"
-      alpine_SSLCERTS="$alpine_SSLDIR/certs" 
-      alpine_SSLKEYS="$alpine_SSLDIR/private"
-      alpine_SSLINCLUDE="/usr/include/openssl" 
-      alpine_SSLLIB="/usr/lib"
     elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then
       systype="LRH"
       alpine_PAM="yes"
@@ -15872,11 +15918,6 @@ case "$host" in
 	alpine_c_client_target="lr5"
       else
 	alpine_c_client_target="lrh"
-	alpine_SSLDIR="/usr/share/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl"
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/debian_release -o -f /etc/debian_version ; then
       if test -d /etc/osso-af-init ; then
@@ -15886,11 +15927,6 @@ case "$host" in
         systype="DEB"
         alpine_c_client_target="ldb"
 	alpine_PAM="yes"
-	alpine_SSLDIR="/etc/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl" 
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/SuSE-release ; then
       systype="LSU"
@@ -16082,22 +16118,12 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-dragonfly*)
     systype="DFB"
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-bsdi*)
     systype="BSI"
@@ -16110,11 +16136,6 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bsf"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl" 
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-openbsd*)
@@ -16122,11 +16143,6 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bso"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
-    alpine_SSLCERTS="/etc/ssl" 
-    alpine_SSLKEYS="/etc/ssl/private"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-aix5*)
@@ -16164,11 +16180,6 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(S_IREAD | S_IWRITE)"
     alpine_c_client_target="cyg"
-    alpine_SSLDIR="/usr/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs" 
-    alpine_SSLKEYS="$alpine_SSLDIR/certs"
-    alpine_SSLINCLUDE="/usr/include/openssl" 
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   windows* | *-*-pw32*)
@@ -16507,15 +16518,12 @@ $as_echo "@%:@define HAS_TERMCAP 1" >>confdefs.h
     ;;
 esac
 
-if test "$alpine_with_ldap" = "yes" ; then
-  alpine_has_ldap=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5
-$as_echo_n "checking for ber_alloc in -llber... " >&6; }
-if ${ac_cv_lib_lber_ber_alloc+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llber  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16525,35 +16533,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ber_alloc ();
+char dlopen ();
 int
 main ()
 {
-return ber_alloc ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lber_ber_alloc=yes
-else
-  ac_cv_lib_lber_ber_alloc=no
+for ac_lib in '' dl dld; 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_dlopen=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5
-$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; }
-if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
+done
+if ${ac_cv_search_dlopen+:} false; then :
   
-      LIBS="$LIBS -llber"
-    
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  
+else
+   alpine_DL="none" 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
-$as_echo_n "checking for library containing ldap_init... " >&6; }
-if ${ac_cv_search_ldap_init+:} false; then :
+if test "x$alpine_DL" = "xnone" ; then
+    as_fn_error $? "No library containing dlopen found" "$LINENO" 5
+    exit 1	
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
+$as_echo_n "checking for library containing SSLeay... " >&6; }
+if ${ac_cv_search_SSLeay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16566,16 +16597,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_init ();
+char SSLeay ();
 int
 main ()
 {
-return ldap_init ();
+return SSLeay ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' crypto; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16583,35 +16614,42 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_init=$ac_res
+  ac_cv_search_SSLeay=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_init+:} false; then :
+  if ${ac_cv_search_SSLeay+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_init+:} false; then :
+if ${ac_cv_search_SSLeay+:} false; then :
   
 else
-  ac_cv_search_ldap_init=no
+  ac_cv_search_SSLeay=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
-$as_echo "$ac_cv_search_ldap_init" >&6; }
-ac_res=$ac_cv_search_ldap_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
+$as_echo "$ac_cv_search_SSLeay" >&6; }
+ac_res=$ac_cv_search_SSLeay
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-      alpine_has_ldap=yes
-    
 else
-  
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5
-$as_echo_n "checking for library containing ldap_open... " >&6; }
-if ${ac_cv_search_ldap_open+:} false; then :
+   alpine_CRYPTO="none" 
+fi
+
+  if test "x$alpine_CRYPTO" = "xnone" ; then
+     as_fn_error $? "crypto library NOT found" "$LINENO" 5
+     exit 1
+  fi
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
+$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+if ${ac_cv_search_SSL_library_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16624,16 +16662,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_open ();
+char SSL_library_init ();
 int
 main ()
 {
-return ldap_open ();
+return SSL_library_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' ssl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16641,61 +16679,55 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_open=$ac_res
+  ac_cv_search_SSL_library_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_open+:} false; then :
+  if ${ac_cv_search_SSL_library_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_open+:} false; then :
+if ${ac_cv_search_SSL_library_init+:} false; then :
   
 else
-  ac_cv_search_ldap_open=no
+  ac_cv_search_SSL_library_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5
-$as_echo "$ac_cv_search_ldap_open" >&6; }
-ac_res=$ac_cv_search_ldap_open
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
+$as_echo "$ac_cv_search_SSL_library_init" >&6; }
+ac_res=$ac_cv_search_SSL_library_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-	  alpine_has_ldap=yes
-	
-fi
-
-    
+else
+   alpine_SSLTYPE="none" 
 fi
 
 
-  if test "$alpine_has_ldap" = "yes" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5
-$as_echo "$as_me: Including LDAP Support" >&6;}
-    
-$as_echo "@%:@define ENABLE_LDAP /**/" >>confdefs.h
-
+  if test "x$alpine_SSLTYPE" = "xnone" ; then
+     as_fn_error $? "No library containing SSL_library_init found in your path" "$LINENO" 5
+     exit 1
+  fi
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5
-$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
-	
-    
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
+$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
+  if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#include <string.h>
-#include <ldap.h>
+#include <stdlib.h>
+#include <openssl/ssl.h>
 int main(void) {
 
-	if (LDAP_VENDOR_VERSION >= 20300)
+	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
 		exit(0);
 
 	exit(2);
@@ -16703,35 +16735,69 @@ int main(void) {
 	
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		
-$as_echo "@%:@define LDAP_DEPRECATED 1" >>confdefs.h
-
-
-	
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } 
 else
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	
+   alpine_SSLTYPE="none" 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions!  Excluding LDAP support." >&5
-$as_echo "$as_me: Cannot find LDAP functions!  Excluding LDAP support." >&6;}
-  fi
+    if test "x$alpine_SSLTYPE" = "xnone" ; then
+	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
+	exit 1
+    fi
 fi
 
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if test "$alpine_with_ldap" = "yes" ; then
+  alpine_has_ldap=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5
+$as_echo_n "checking for ber_alloc in -llber... " >&6; }
+if ${ac_cv_lib_lber_ber_alloc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llber  $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 ber_alloc ();
+int
+main ()
+{
+return ber_alloc ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lber_ber_alloc=yes
+else
+  ac_cv_lib_lber_ber_alloc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5
+$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; }
+if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
+  
+      LIBS="$LIBS -llber"
+    
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
+$as_echo_n "checking for library containing ldap_init... " >&6; }
+if ${ac_cv_search_ldap_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16744,16 +16810,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char ldap_init ();
 int
 main ()
 {
-return SSL_library_init ();
+return ldap_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ssl; do
+for ac_lib in '' ldap; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16761,86 +16827,35 @@ for ac_lib in '' ssl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSL_library_init=$ac_res
+  ac_cv_search_ldap_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSL_library_init+:} false; then :
+  if ${ac_cv_search_ldap_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if ${ac_cv_search_ldap_init+:} false; then :
   
 else
-  ac_cv_search_SSL_library_init=no
+  ac_cv_search_ldap_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
-$as_echo "$ac_cv_search_SSL_library_init" >&6; }
-ac_res=$ac_cv_search_SSL_library_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
+$as_echo "$ac_cv_search_ldap_init" >&6; }
+ac_res=$ac_cv_search_ldap_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-      LIBS="$LIBS -lssl"
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
-$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
-     if test "$cross_compiling" = yes; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
-	
+      alpine_has_ldap=yes
     
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <openssl/ssl.h>
-int main(void) {
-
-	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
-		exit(0);
-
-	exit(2);
-}
-	
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	
-else
   
-		as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
-		exit 1
-	
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    
-else
-  alpine_SSLTYPE="none"
-fi
-
-  if test "x$alpine_SSLTYPE" = "xnone" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries NOT found" >&5
-$as_echo "$as_me: OpenSSL libraries NOT found" >&6;}
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries FOUND" >&5
-$as_echo "$as_me: OpenSSL libraries FOUND" >&6;}
-  fi
-fi
-
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
-$as_echo_n "checking for library containing SSLeay... " >&6; }
-if ${ac_cv_search_SSLeay+:} false; then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5
+$as_echo_n "checking for library containing ldap_open... " >&6; }
+if ${ac_cv_search_ldap_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16853,16 +16868,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSLeay ();
+char ldap_open ();
 int
 main ()
 {
-return SSLeay ();
+return ldap_open ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypto; do
+for ac_lib in '' ldap; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16870,41 +16885,90 @@ for ac_lib in '' crypto; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSLeay=$ac_res
+  ac_cv_search_ldap_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSLeay+:} false; then :
+  if ${ac_cv_search_ldap_open+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSLeay+:} false; then :
+if ${ac_cv_search_ldap_open+:} false; then :
   
 else
-  ac_cv_search_SSLeay=no
+  ac_cv_search_ldap_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
-$as_echo "$ac_cv_search_SSLeay" >&6; }
-ac_res=$ac_cv_search_SSLeay
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5
+$as_echo "$ac_cv_search_ldap_open" >&6; }
+ac_res=$ac_cv_search_ldap_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-      LIBS="$LIBS -lcrypto"
+	  alpine_has_ldap=yes
+	
+fi
+
     
-else
+fi
+
+
+  if test "$alpine_has_ldap" = "yes" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5
+$as_echo "$as_me: Including LDAP Support" >&6;}
+    
+$as_echo "@%:@define ENABLE_LDAP /**/" >>confdefs.h
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5
+$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; }
+    if test "$cross_compiling" = yes; then :
   
-      alpine_CRYPTO = "none"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+	
     
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ldap.h>
+int main(void) {
+
+	if (LDAP_VENDOR_VERSION >= 20300)
+		exit(0);
+
+	exit(2);
+}
+	
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		
+$as_echo "@%:@define LDAP_DEPRECATED 1" >>confdefs.h
+
+
+	
+else
+  
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-  if test "x$alpine_CRYPTO" = "xnone" ; then
-    as_fn_error $? "crypto library NOT found" "$LINENO" 5
+
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: crypto library found" >&5
-$as_echo "$as_me: crypto library found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions!  Excluding LDAP support." >&5
+$as_echo "$as_me: Cannot find LDAP functions!  Excluding LDAP support." >&6;}
   fi
 fi
 
@@ -17221,7 +17285,7 @@ fi
   fi
 fi
 
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
 $as_echo_n "checking for library containing regcomp... " >&6; }
 if ${ac_cv_search_regcomp+:} false; then :
@@ -17287,7 +17351,7 @@ else
 fi
 
 fi
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
 if test "x$ac_cv_header_regex_h" = xyes; then :
   
@@ -17306,7 +17370,7 @@ fi
 
 $as_echo "@%:@define HAVE_REGEX_H 1" >>confdefs.h
 
-if test x$alpine_REGEX = "xyes" ; then
+if test "x$alpine_REGEX" = "xyes" ; then
   CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
   LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
   REGEX_BUILD=regex
@@ -19425,6 +19489,8 @@ else
     certdir="$alpine_SSLCERTS"
   elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then
     certdir="${alpine_SSLDIR}/certs"
+  elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/ssl/certs" ; then
+    certdir="${alpine_SSLDIR}/ssl/certs"
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: SSL Problem: certificate directory not found" >&5
 $as_echo "$as_me: SSL Problem: certificate directory not found" >&6;}
@@ -20094,7 +20160,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.4, which was
+This file was extended by alpine $as_me 2.11.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20160,7 +20226,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.4
+alpine config.status 2.11.5
 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 ec107ab8..9edfe27e 100644
--- a/autom4te.cache/output.2
+++ b/autom4te.cache/output.2
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
-@%:@ From configure.ac Rev:2 by chappa@washington.edu.
+@%:@ From configure.ac Rev:3 by chappa@washington.edu.
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.4.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.5.
 @%:@
 @%:@ 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.4'
-PACKAGE_STRING='alpine 2.11.4'
+PACKAGE_VERSION='2.11.5'
+PACKAGE_STRING='alpine 2.11.5'
 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.4 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.5 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.4:";;
+     short | recursive ) echo "Configuration of alpine 2.11.5:";;
    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.4
+alpine configure 2.11.5
 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.4, which was
+It was created by alpine $as_me 2.11.5, 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.4'
+ VERSION='2.11.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15542,13 +15542,19 @@ else
         alpine_SSLTYPE="nopwd"
 	if test -d /etc/pki/tls ; then  
 	  alpine_SSLDIR="/etc/pki/tls"
-	  alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	  alpine_SSLKEYS="$alpine_SSLDIR/private"
-	  alpine_SSLINCLUDE="/usr/include/openssl" 
-	  alpine_SSLLIB="/usr/lib"
 	else
 	  alpine_SSLDIR="/usr/share/ssl"
 	fi
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
+      elif test -f /etc/mandrake-release ; then
+	alpine_SSLDIR="/usr/lib/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs" 
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/SuSE-release ; then
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/etc/ssl"
@@ -15562,6 +15568,14 @@ else
         alpine_SSLCERTS="/usr/share/certs"
 	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
+	   alpine_SSLDIR="/etc/ssl"
+	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	   alpine_SSLKEYS="$alpine_SSLDIR/private"
+	   alpine_SSLINCLUDE="/usr/include/openssl" 
+	   alpine_SSLLIB="/usr/lib"
+        fi
       else
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/usr"
@@ -15584,14 +15598,49 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
       fi
       ;;
+    *-*-netbsd*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-dragonfly*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
     *-openbsd*)
-      alpine_SSLTYPE="nopwd"
-      alpine_SSLDIR="/usr"
-      alpine_SSLCERTS="/etc/ssl/certs"
+	alpine_SSLTYPE="nopwd"
+	alpine_SSLDIR="/usr"
+	alpine_SSLCERTS="/etc/ssl/certs"
+      ;;
+    *-*-freebsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-openbsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+	alpine_SSLCERTS="/etc/ssl" 
+	alpine_SSLKEYS="/etc/ssl/private"
+      ;;
+    *-*-cygwin)
+	alpine_SSLDIR="/usr/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs" 
+	alpine_SSLKEYS="$alpine_SSLDIR/certs"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
       ;;
     *-sco-sysv* | *-sysv*UnixWare | *-sysv*OpenUNIX)
-      alpine_SSLTYPE="sco.nopwd"
-      alpine_SSLDIR="/usr/local/ssl"
+	alpine_SSLTYPE="sco.nopwd"
+	alpine_SSLDIR="/usr/local/ssl"
       ;;
     *-*-solaris*)
       if test -d /usr/sfw/include/openssl ; then
@@ -15618,6 +15667,8 @@ if test "${with_ssl_dir+set}" = set; then :
   withval=$with_ssl_dir; 
       if test "x$withval" != "xno" ; then
 	alpine_SSLDIR=$withval
+	alpine_SSLINCLUDE=$alpine_SSLDIR/include
+	alpine_SSLLIB=$alpine_SSLDIR/lib
       fi
     
 fi
@@ -15860,11 +15911,6 @@ case "$host" in
       systype="LMD"
       alpine_c_client_target="lmd"
       alpine_PAM="yes"
-      alpine_SSLDIR="/usr/lib/ssl"
-      alpine_SSLCERTS="$alpine_SSLDIR/certs" 
-      alpine_SSLKEYS="$alpine_SSLDIR/private"
-      alpine_SSLINCLUDE="/usr/include/openssl" 
-      alpine_SSLLIB="/usr/lib"
     elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then
       systype="LRH"
       alpine_PAM="yes"
@@ -15872,11 +15918,6 @@ case "$host" in
 	alpine_c_client_target="lr5"
       else
 	alpine_c_client_target="lrh"
-	alpine_SSLDIR="/usr/share/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl"
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/debian_release -o -f /etc/debian_version ; then
       if test -d /etc/osso-af-init ; then
@@ -15886,11 +15927,6 @@ case "$host" in
         systype="DEB"
         alpine_c_client_target="ldb"
 	alpine_PAM="yes"
-	alpine_SSLDIR="/etc/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl" 
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/SuSE-release ; then
       systype="LSU"
@@ -16082,22 +16118,12 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-dragonfly*)
     systype="DFB"
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-bsdi*)
     systype="BSI"
@@ -16110,11 +16136,6 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bsf"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl" 
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-openbsd*)
@@ -16122,11 +16143,6 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bso"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
-    alpine_SSLCERTS="/etc/ssl" 
-    alpine_SSLKEYS="/etc/ssl/private"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-aix5*)
@@ -16164,11 +16180,6 @@ $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(S_IREAD | S_IWRITE)"
     alpine_c_client_target="cyg"
-    alpine_SSLDIR="/usr/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs" 
-    alpine_SSLKEYS="$alpine_SSLDIR/certs"
-    alpine_SSLINCLUDE="/usr/include/openssl" 
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   windows* | *-*-pw32*)
@@ -16507,15 +16518,12 @@ $as_echo "@%:@define HAS_TERMCAP 1" >>confdefs.h
     ;;
 esac
 
-if test "$alpine_with_ldap" = "yes" ; then
-  alpine_has_ldap=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5
-$as_echo_n "checking for ber_alloc in -llber... " >&6; }
-if ${ac_cv_lib_lber_ber_alloc+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llber  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16525,35 +16533,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ber_alloc ();
+char dlopen ();
 int
 main ()
 {
-return ber_alloc ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lber_ber_alloc=yes
-else
-  ac_cv_lib_lber_ber_alloc=no
+for ac_lib in '' dl dld; 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_dlopen=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5
-$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; }
-if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
+done
+if ${ac_cv_search_dlopen+:} false; then :
   
-      LIBS="$LIBS -llber"
-    
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  
+else
+   alpine_DL="none" 
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
-$as_echo_n "checking for library containing ldap_init... " >&6; }
-if ${ac_cv_search_ldap_init+:} false; then :
+if test "x$alpine_DL" = "xnone" ; then
+    as_fn_error $? "No library containing dlopen found" "$LINENO" 5
+    exit 1	
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
+$as_echo_n "checking for library containing SSLeay... " >&6; }
+if ${ac_cv_search_SSLeay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16566,16 +16597,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_init ();
+char SSLeay ();
 int
 main ()
 {
-return ldap_init ();
+return SSLeay ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' crypto; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16583,35 +16614,42 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_init=$ac_res
+  ac_cv_search_SSLeay=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_init+:} false; then :
+  if ${ac_cv_search_SSLeay+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_init+:} false; then :
+if ${ac_cv_search_SSLeay+:} false; then :
   
 else
-  ac_cv_search_ldap_init=no
+  ac_cv_search_SSLeay=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
-$as_echo "$ac_cv_search_ldap_init" >&6; }
-ac_res=$ac_cv_search_ldap_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
+$as_echo "$ac_cv_search_SSLeay" >&6; }
+ac_res=$ac_cv_search_SSLeay
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-      alpine_has_ldap=yes
-    
 else
-  
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5
-$as_echo_n "checking for library containing ldap_open... " >&6; }
-if ${ac_cv_search_ldap_open+:} false; then :
+   alpine_CRYPTO="none" 
+fi
+
+  if test "x$alpine_CRYPTO" = "xnone" ; then
+     as_fn_error $? "crypto library NOT found" "$LINENO" 5
+     exit 1
+  fi
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
+$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+if ${ac_cv_search_SSL_library_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16624,16 +16662,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_open ();
+char SSL_library_init ();
 int
 main ()
 {
-return ldap_open ();
+return SSL_library_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' ssl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16641,61 +16679,55 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_open=$ac_res
+  ac_cv_search_SSL_library_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_open+:} false; then :
+  if ${ac_cv_search_SSL_library_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_open+:} false; then :
+if ${ac_cv_search_SSL_library_init+:} false; then :
   
 else
-  ac_cv_search_ldap_open=no
+  ac_cv_search_SSL_library_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5
-$as_echo "$ac_cv_search_ldap_open" >&6; }
-ac_res=$ac_cv_search_ldap_open
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
+$as_echo "$ac_cv_search_SSL_library_init" >&6; }
+ac_res=$ac_cv_search_SSL_library_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-	  alpine_has_ldap=yes
-	
-fi
-
-    
+else
+   alpine_SSLTYPE="none" 
 fi
 
 
-  if test "$alpine_has_ldap" = "yes" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5
-$as_echo "$as_me: Including LDAP Support" >&6;}
-    
-$as_echo "@%:@define ENABLE_LDAP /**/" >>confdefs.h
-
+  if test "x$alpine_SSLTYPE" = "xnone" ; then
+     as_fn_error $? "No library containing SSL_library_init found in your path" "$LINENO" 5
+     exit 1
+  fi
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5
-$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
-	
-    
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
+$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
+  if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#include <string.h>
-#include <ldap.h>
+#include <stdlib.h>
+#include <openssl/ssl.h>
 int main(void) {
 
-	if (LDAP_VENDOR_VERSION >= 20300)
+	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
 		exit(0);
 
 	exit(2);
@@ -16703,35 +16735,69 @@ int main(void) {
 	
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-		
-$as_echo "@%:@define LDAP_DEPRECATED 1" >>confdefs.h
-
-
-	
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } 
 else
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	
+   alpine_SSLTYPE="none" 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions!  Excluding LDAP support." >&5
-$as_echo "$as_me: Cannot find LDAP functions!  Excluding LDAP support." >&6;}
-  fi
+    if test "x$alpine_SSLTYPE" = "xnone" ; then
+	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
+	exit 1
+    fi
 fi
 
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if test "$alpine_with_ldap" = "yes" ; then
+  alpine_has_ldap=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5
+$as_echo_n "checking for ber_alloc in -llber... " >&6; }
+if ${ac_cv_lib_lber_ber_alloc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llber  $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 ber_alloc ();
+int
+main ()
+{
+return ber_alloc ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lber_ber_alloc=yes
+else
+  ac_cv_lib_lber_ber_alloc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5
+$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; }
+if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
+  
+      LIBS="$LIBS -llber"
+    
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
+$as_echo_n "checking for library containing ldap_init... " >&6; }
+if ${ac_cv_search_ldap_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16744,16 +16810,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char ldap_init ();
 int
 main ()
 {
-return SSL_library_init ();
+return ldap_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ssl; do
+for ac_lib in '' ldap; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16761,86 +16827,35 @@ for ac_lib in '' ssl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSL_library_init=$ac_res
+  ac_cv_search_ldap_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSL_library_init+:} false; then :
+  if ${ac_cv_search_ldap_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if ${ac_cv_search_ldap_init+:} false; then :
   
 else
-  ac_cv_search_SSL_library_init=no
+  ac_cv_search_ldap_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
-$as_echo "$ac_cv_search_SSL_library_init" >&6; }
-ac_res=$ac_cv_search_SSL_library_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
+$as_echo "$ac_cv_search_ldap_init" >&6; }
+ac_res=$ac_cv_search_ldap_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-      LIBS="$LIBS -lssl"
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
-$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
-     if test "$cross_compiling" = yes; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
-	
+      alpine_has_ldap=yes
     
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <openssl/ssl.h>
-int main(void) {
-
-	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
-		exit(0);
-
-	exit(2);
-}
-	
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	
-else
   
-		as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
-		exit 1
-	
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    
-else
-  alpine_SSLTYPE="none"
-fi
-
-  if test "x$alpine_SSLTYPE" = "xnone" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries NOT found" >&5
-$as_echo "$as_me: OpenSSL libraries NOT found" >&6;}
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries FOUND" >&5
-$as_echo "$as_me: OpenSSL libraries FOUND" >&6;}
-  fi
-fi
-
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
-$as_echo_n "checking for library containing SSLeay... " >&6; }
-if ${ac_cv_search_SSLeay+:} false; then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5
+$as_echo_n "checking for library containing ldap_open... " >&6; }
+if ${ac_cv_search_ldap_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16853,16 +16868,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSLeay ();
+char ldap_open ();
 int
 main ()
 {
-return SSLeay ();
+return ldap_open ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypto; do
+for ac_lib in '' ldap; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16870,41 +16885,90 @@ for ac_lib in '' crypto; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSLeay=$ac_res
+  ac_cv_search_ldap_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSLeay+:} false; then :
+  if ${ac_cv_search_ldap_open+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSLeay+:} false; then :
+if ${ac_cv_search_ldap_open+:} false; then :
   
 else
-  ac_cv_search_SSLeay=no
+  ac_cv_search_ldap_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
-$as_echo "$ac_cv_search_SSLeay" >&6; }
-ac_res=$ac_cv_search_SSLeay
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5
+$as_echo "$ac_cv_search_ldap_open" >&6; }
+ac_res=$ac_cv_search_ldap_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   
-      LIBS="$LIBS -lcrypto"
+	  alpine_has_ldap=yes
+	
+fi
+
     
-else
+fi
+
+
+  if test "$alpine_has_ldap" = "yes" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5
+$as_echo "$as_me: Including LDAP Support" >&6;}
+    
+$as_echo "@%:@define ENABLE_LDAP /**/" >>confdefs.h
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5
+$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; }
+    if test "$cross_compiling" = yes; then :
   
-      alpine_CRYPTO = "none"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+	
     
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ldap.h>
+int main(void) {
+
+	if (LDAP_VENDOR_VERSION >= 20300)
+		exit(0);
+
+	exit(2);
+}
+	
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		
+$as_echo "@%:@define LDAP_DEPRECATED 1" >>confdefs.h
+
+
+	
+else
+  
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-  if test "x$alpine_CRYPTO" = "xnone" ; then
-    as_fn_error $? "crypto library NOT found" "$LINENO" 5
+
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: crypto library found" >&5
-$as_echo "$as_me: crypto library found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions!  Excluding LDAP support." >&5
+$as_echo "$as_me: Cannot find LDAP functions!  Excluding LDAP support." >&6;}
   fi
 fi
 
@@ -17221,7 +17285,7 @@ fi
   fi
 fi
 
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
 $as_echo_n "checking for library containing regcomp... " >&6; }
 if ${ac_cv_search_regcomp+:} false; then :
@@ -17287,7 +17351,7 @@ else
 fi
 
 fi
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
 if test "x$ac_cv_header_regex_h" = xyes; then :
   
@@ -17306,7 +17370,7 @@ fi
 
 $as_echo "@%:@define HAVE_REGEX_H 1" >>confdefs.h
 
-if test x$alpine_REGEX = "xyes" ; then
+if test "x$alpine_REGEX" = "xyes" ; then
   CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
   LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
   REGEX_BUILD=regex
@@ -19425,6 +19489,8 @@ else
     certdir="$alpine_SSLCERTS"
   elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then
     certdir="${alpine_SSLDIR}/certs"
+  elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/ssl/certs" ; then
+    certdir="${alpine_SSLDIR}/ssl/certs"
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: SSL Problem: certificate directory not found" >&5
 $as_echo "$as_me: SSL Problem: certificate directory not found" >&6;}
@@ -20094,7 +20160,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.4, which was
+This file was extended by alpine $as_me 2.11.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20160,7 +20226,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.4
+alpine config.status 2.11.5
 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 bb898165..4529ece4 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -968,518 +968,520 @@ m4trace:configure.ac:642: -1- m4_pattern_allow([^DF_SSHCMD$])
 m4trace:configure.ac:642: -1- AH_OUTPUT([DF_SSHCMD], [/* set default value of ssh command string (usually "%s %s -l %s exec
    /etc/r%sd") */
 @%:@undef DF_SSHCMD])
-m4trace:configure.ac:999: -1- AC_DEFINE_TRACE_LITERAL([OSX_TARGET])
-m4trace:configure.ac:999: -1- m4_pattern_allow([^OSX_TARGET$])
-m4trace:configure.ac:999: -1- AH_OUTPUT([OSX_TARGET], [/* OSX TARGET */
+m4trace:configure.ac:1035: -1- AC_DEFINE_TRACE_LITERAL([OSX_TARGET])
+m4trace:configure.ac:1035: -1- m4_pattern_allow([^OSX_TARGET$])
+m4trace:configure.ac:1035: -1- AH_OUTPUT([OSX_TARGET], [/* OSX TARGET */
 @%:@undef OSX_TARGET])
-m4trace:configure.ac:1004: -1- AC_DEFINE_TRACE_LITERAL([APPLEKEYCHAIN])
-m4trace:configure.ac:1004: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
-m4trace:configure.ac:1004: -1- AH_OUTPUT([APPLEKEYCHAIN], [/* Use Apple OS X key chain for credential caching */
+m4trace:configure.ac:1040: -1- AC_DEFINE_TRACE_LITERAL([APPLEKEYCHAIN])
+m4trace:configure.ac:1040: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
+m4trace:configure.ac:1040: -1- AH_OUTPUT([APPLEKEYCHAIN], [/* Use Apple OS X key chain for credential caching */
 @%:@undef APPLEKEYCHAIN])
-m4trace:configure.ac:1036: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
-m4trace:configure.ac:1036: -1- m4_pattern_allow([^__EXTENSIONS__$])
-m4trace:configure.ac:1036: -1- AH_OUTPUT([__EXTENSIONS__], [/* Enable extended pthread features on Solaris */
+m4trace:configure.ac:1072: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
+m4trace:configure.ac:1072: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:1072: -1- AH_OUTPUT([__EXTENSIONS__], [/* Enable extended pthread features on Solaris */
 @%:@undef __EXTENSIONS__])
-m4trace:configure.ac:1167: -1- AC_DEFINE_TRACE_LITERAL([_WINDOWS])
-m4trace:configure.ac:1167: -1- m4_pattern_allow([^_WINDOWS$])
-m4trace:configure.ac:1167: -1- AH_OUTPUT([_WINDOWS], [/* Windows is just too different */
+m4trace:configure.ac:1178: -1- AC_DEFINE_TRACE_LITERAL([_WINDOWS])
+m4trace:configure.ac:1178: -1- m4_pattern_allow([^_WINDOWS$])
+m4trace:configure.ac:1178: -1- AH_OUTPUT([_WINDOWS], [/* Windows is just too different */
 @%:@undef _WINDOWS])
-m4trace:configure.ac:1242: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMINFO])
-m4trace:configure.ac:1242: -1- m4_pattern_allow([^HAS_TERMINFO$])
-m4trace:configure.ac:1242: -1- AH_OUTPUT([HAS_TERMINFO], [/* Define if systems uses terminfo terminal database */
+m4trace:configure.ac:1253: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMINFO])
+m4trace:configure.ac:1253: -1- m4_pattern_allow([^HAS_TERMINFO$])
+m4trace:configure.ac:1253: -1- AH_OUTPUT([HAS_TERMINFO], [/* Define if systems uses terminfo terminal database */
 @%:@undef HAS_TERMINFO])
-m4trace:configure.ac:1245: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMCAP])
-m4trace:configure.ac:1245: -1- m4_pattern_allow([^HAS_TERMCAP$])
-m4trace:configure.ac:1245: -1- AH_OUTPUT([HAS_TERMCAP], [/* Define if systems uses termcap terminal database */
+m4trace:configure.ac:1256: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMCAP])
+m4trace:configure.ac:1256: -1- m4_pattern_allow([^HAS_TERMCAP$])
+m4trace:configure.ac:1256: -1- AH_OUTPUT([HAS_TERMCAP], [/* Define if systems uses termcap terminal database */
 @%:@undef HAS_TERMCAP])
-m4trace:configure.ac:1269: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LDAP])
-m4trace:configure.ac:1269: -1- m4_pattern_allow([^ENABLE_LDAP$])
-m4trace:configure.ac:1269: -1- AH_OUTPUT([ENABLE_LDAP], [/* Enable LDAP query support */
+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 */
 @%:@undef ENABLE_LDAP])
-m4trace:configure.ac:1274: -1- AC_DEFINE_TRACE_LITERAL([LDAP_DEPRECATED])
-m4trace:configure.ac:1274: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
-m4trace:configure.ac:1274: -1- AH_OUTPUT([LDAP_DEPRECATED], [/* Define if you use OpenLDAP 2.3.x deprecated functions */
+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 */
 @%:@undef LDAP_DEPRECATED])
-m4trace:configure.ac:1438: -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:1442: -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:1438: the top level])
-m4trace:configure.ac:1484: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGEX_H])
-m4trace:configure.ac:1484: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1484: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Regular expression header file exists */
+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 */
 @%:@undef HAVE_REGEX_H])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- AC_SUBST([acx_pthread_config])
-m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([acx_pthread_config])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -1- AC_SUBST([acx_pthread_config])
+m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([acx_pthread_config])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1493: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1497: -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:1493: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_LIBS])
-m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_CFLAGS])
-m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1493: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1493: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1493: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
+m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_LIBS])
+m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_CFLAGS])
+m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1497: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1497: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1497: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
 @%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1493: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1493: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
+m4trace:configure.ac:1497: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1497: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
 @%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1511: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
-m4trace:configure.ac:1511: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1511: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
+configure.ac:1497: the top level])
+m4trace:configure.ac:1515: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
+m4trace:configure.ac:1515: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1515: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
 @%:@undef HAVE_NANOSLEEP])
-m4trace:configure.ac:1521: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:1521: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1521: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:1525: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:1525: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1525: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
 @%:@undef STDC_HEADERS])
-m4trace:configure.ac:1522: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1526: -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:1522: -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:1526: -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:1522: -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:1526: -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:1522: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
+m4trace:configure.ac:1526: -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:1523: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
-m4trace:configure.ac:1523: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1523: -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:1527: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
+m4trace:configure.ac:1527: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1527: -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:1524: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1524: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1524: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+m4trace:configure.ac:1528: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
+m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1528: -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:1525: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1525: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1525: -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:1529: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
+m4trace:configure.ac:1529: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1529: -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:1526: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1526: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1526: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
+m4trace:configure.ac:1530: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
+m4trace:configure.ac:1530: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1530: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
 @%:@undef GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1528: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:1532: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:1528: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
-m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
+m4trace:configure.ac:1532: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
+m4trace:configure.ac:1532: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
 @%:@undef HAVE_ERRNO_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
 @%:@undef HAVE_CTYPE_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
 @%:@undef HAVE_FCNTL_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
 @%:@undef HAVE_SIGNAL_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
 @%:@undef HAVE_SETJMP_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
 @%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
 @%:@undef HAVE_LIMITS_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
 @%:@undef HAVE_WCHAR_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
 @%:@undef HAVE_STROPTS_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
 @%:@undef HAVE_NETDB_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
 @%:@undef HAVE_SYSLOG_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
 @%:@undef HAVE_LOCALE_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
 @%:@undef HAVE_LANGINFO_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
 @%:@undef HAVE_UTIME_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
+m4trace:configure.ac:1534: -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:1530: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
 @%:@undef HAVE_PTHREAD_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
 @%:@undef HAVE_PWD_H])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
+m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
 @%:@undef HAVE_ASSERT_H])
-m4trace:configure.ac:1557: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
-m4trace:configure.ac:1557: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1557: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
+m4trace:configure.ac:1561: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
+m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1561: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
 @%:@undef HAS_TERMIOS])
-m4trace:configure.ac:1556: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
-m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1556: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
+m4trace:configure.ac:1560: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
+m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1560: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
 @%:@undef HAS_TERMIO])
-m4trace:configure.ac:1556: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
-m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1556: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
+m4trace:configure.ac:1560: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
+m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1560: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
 @%:@undef HAS_SGTTY])
-m4trace:configure.ac:1573: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+m4trace:configure.ac:1577: -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:1582: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
-m4trace:configure.ac:1582: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1582: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
+m4trace:configure.ac:1586: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
+m4trace:configure.ac:1586: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1586: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
 @%:@undef RETSIGTYPE])
-m4trace:configure.ac:1585: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:1585: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1585: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1589: -1- AC_DEFINE_TRACE_LITERAL([size_t])
+m4trace:configure.ac:1589: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1589: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
 @%:@undef size_t])
-m4trace:configure.ac:1586: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
-m4trace:configure.ac:1586: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1586: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1590: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
+m4trace:configure.ac:1590: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1590: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef mode_t])
-m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1587: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1591: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1591: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef pid_t])
-m4trace:configure.ac:1588: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
-m4trace:configure.ac:1588: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1588: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
+m4trace:configure.ac:1592: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1592: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef uid_t])
-m4trace:configure.ac:1588: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
-m4trace:configure.ac:1588: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1588: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
+m4trace:configure.ac:1592: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1592: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef gid_t])
-m4trace:configure.ac:1589: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
-m4trace:configure.ac:1589: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1589: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1593: -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:1591: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
-m4trace:configure.ac:1591: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1591: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
+m4trace:configure.ac:1595: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
+m4trace:configure.ac:1595: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1595: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
 @%:@undef HAVE_UNION_WAIT])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1597: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1597: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1597: -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:1593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1597: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1597: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1610: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
-m4trace:configure.ac:1610: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1610: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
+m4trace:configure.ac:1614: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
+m4trace:configure.ac:1614: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1614: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
 @%:@undef UINT16])
-m4trace:configure.ac:1612: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1616: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1612: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1616: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1612: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1616: -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:1612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1612: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1616: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1612: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
+m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1616: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1629: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
-m4trace:configure.ac:1629: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1629: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
+m4trace:configure.ac:1633: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
+m4trace:configure.ac:1633: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1633: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
 @%:@undef UINT32])
-m4trace:configure.ac:1647: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
-m4trace:configure.ac:1647: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1647: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
+m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1651: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
 @%:@undef qsort_t])
-m4trace:configure.ac:1651: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
+m4trace:configure.ac:1655: -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:1651: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1655: -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:1651: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1651: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
+m4trace:configure.ac:1655: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
+m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1655: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
 @%:@undef SELECT_TYPE_ARG1])
-m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1651: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
+m4trace:configure.ac:1655: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
+m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1655: -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:1651: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1651: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
+m4trace:configure.ac:1655: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
+m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1655: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
 @%:@undef SELECT_TYPE_ARG5])
-m4trace:configure.ac:1653: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
-m4trace:configure.ac:1653: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1653: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
+m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1657: -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:1657: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
+m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
 @%:@undef HAVE_VFORK_H])
-m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
+m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
 @%:@undef HAVE_FORK])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
+m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
 @%:@undef HAVE_VFORK])
-m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
+m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
 @%:@undef HAVE_WORKING_VFORK])
-m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([vfork])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
+m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([vfork])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1661: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
 @%:@undef vfork])
-m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
+m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
 @%:@undef HAVE_WORKING_FORK])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
 @%:@undef HAVE_STRCHR])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
 @%:@undef HAVE_MEMCPY])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
 @%:@undef HAVE_STRTOL])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
 @%:@undef HAVE_STRTOUL])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
 @%:@undef HAVE_SELECT])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
 @%:@undef HAVE_POLL])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
 @%:@undef HAVE_QSORT])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
 @%:@undef HAVE_GETUID])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
 @%:@undef HAVE_GETPWUID])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
 @%:@undef HAVE_GETPWNAM])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
 @%:@undef HAVE_GETTIMEOFDAY])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
 @%:@undef HAVE_TMPFILE])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
 @%:@undef HAVE_UNAME])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
 @%:@undef HAVE_RENAME])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
 @%:@undef HAVE_READ])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
 @%:@undef HAVE_SIGNAL])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
 @%:@undef HAVE_SETJMP])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
 @%:@undef HAVE_CHOWN])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
 @%:@undef HAVE_WAIT4])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
 @%:@undef HAVE_WAITPID])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
 @%:@undef HAVE_WAIT])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
 @%:@undef HAVE_SRANDOM])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
 @%:@undef HAVE_POPEN])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
 @%:@undef HAVE_PCLOSE])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
 @%:@undef HAVE_FSYNC])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
 @%:@undef HAVE_TRUNCATE])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
 @%:@undef HAVE_LISTEN])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
 @%:@undef HAVE_WCWIDTH])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
 @%:@undef HAVE_MBSTOWCS])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
 @%:@undef HAVE_WCRTOMB])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
 @%:@undef HAVE_PUTENV])
-m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
 @%:@undef HAVE_SETENV])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
+m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
 @%:@undef HAVE_SIGACTION])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
+m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
 @%:@undef HAVE_SIGEMPTYSET])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
+m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
 @%:@undef HAVE_SIGADDSET])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
+m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
 @%:@undef HAVE_SIGPROCMASK])
-m4trace:configure.ac:1704: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
-m4trace:configure.ac:1704: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
+m4trace:configure.ac:1708: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
+m4trace:configure.ac:1708: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1708: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
 @%:@undef POSIX_SIGNALS])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
+m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
 @%:@undef HAVE_SIGSET])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
+m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
 @%:@undef HAVE_SIGRELSE])
-m4trace:configure.ac:1704: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
-m4trace:configure.ac:1704: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1704: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
+m4trace:configure.ac:1708: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
+m4trace:configure.ac:1708: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1708: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
 @%:@undef SYSV_SIGNALS])
-m4trace:configure.ac:1715: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
-m4trace:configure.ac:1715: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1715: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
+m4trace:configure.ac:1719: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
+m4trace:configure.ac:1719: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1719: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
 @%:@undef HAVE_SYSLOG])
-m4trace:configure.ac:1737: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
-m4trace:configure.ac:1737: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1737: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
+m4trace:configure.ac:1741: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
+m4trace:configure.ac:1741: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1741: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
 @%:@undef SYSTYPE])
-m4trace:configure.ac:1738: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
-m4trace:configure.ac:1738: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1738: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
+m4trace:configure.ac:1742: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
+m4trace:configure.ac:1742: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1742: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
 @%:@undef C_FILESEP])
-m4trace:configure.ac:1739: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
-m4trace:configure.ac:1739: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1739: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
+m4trace:configure.ac:1743: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
+m4trace:configure.ac:1743: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1743: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
 @%:@undef S_FILESEP])
-m4trace:configure.ac:1740: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
-m4trace:configure.ac:1740: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1740: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
+m4trace:configure.ac:1744: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
+m4trace:configure.ac:1744: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1744: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
 @%:@undef MAILDIR])
-m4trace:configure.ac:1741: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
-m4trace:configure.ac:1741: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1741: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
+m4trace:configure.ac:1745: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
+m4trace:configure.ac:1745: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1745: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
 @%:@undef MODE_READONLY])
-m4trace:configure.ac:1744: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
-m4trace:configure.ac:1744: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1745: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
-m4trace:configure.ac:1745: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
-m4trace:configure.ac:1745: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1762: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
-m4trace:configure.ac:1762: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1762: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
+m4trace:configure.ac:1748: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
+m4trace:configure.ac:1748: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
+m4trace:configure.ac:1748: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1749: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
+m4trace:configure.ac:1749: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
+m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1768: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
+m4trace:configure.ac:1768: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1768: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
 @%:@undef SMIME])
-m4trace:configure.ac:1763: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
-m4trace:configure.ac:1763: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1763: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
+m4trace:configure.ac:1769: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
+m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1769: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
 @%:@undef SMIME_SSLCERTS])
-m4trace:configure.ac:1815: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
-m4trace:configure.ac:1815: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
-m4trace:configure.ac:1815: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1826: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
-m4trace:configure.ac:1826: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
-m4trace:configure.ac:1826: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1830: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
-m4trace:configure.ac:1830: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
-m4trace:configure.ac:1830: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1833: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
-m4trace:configure.ac:1833: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
-m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1853: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
-m4trace:configure.ac:1853: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1853: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
+m4trace:configure.ac:1821: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
+m4trace:configure.ac:1821: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
+m4trace:configure.ac:1821: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1832: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
+m4trace:configure.ac:1832: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
+m4trace:configure.ac:1832: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1836: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
+m4trace:configure.ac:1836: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
+m4trace:configure.ac:1836: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1839: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
+m4trace:configure.ac:1839: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
+m4trace:configure.ac:1839: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1859: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
+m4trace:configure.ac:1859: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1859: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
 @%:@undef PUBCOOKIE])
-m4trace:configure.ac:1860: -1- AC_SUBST([REGEX_BUILD])
-m4trace:configure.ac:1860: -1- AC_SUBST_TRACE([REGEX_BUILD])
-m4trace:configure.ac:1860: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1862: -1- AC_SUBST([WEB_BUILD])
-m4trace:configure.ac:1862: -1- AC_SUBST_TRACE([WEB_BUILD])
-m4trace:configure.ac:1862: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1863: -1- AC_SUBST([WEB_BINDIR])
-m4trace:configure.ac:1863: -1- AC_SUBST_TRACE([WEB_BINDIR])
-m4trace:configure.ac:1863: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1864: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1864: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1864: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1865: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1865: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1865: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1866: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1866: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1866: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1868: -1- AC_SUBST([AM_CFLAGS])
-m4trace:configure.ac:1868: -1- AC_SUBST_TRACE([AM_CFLAGS])
-m4trace:configure.ac:1868: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1869: -1- AC_SUBST([AM_LDFLAGS])
-m4trace:configure.ac:1869: -1- AC_SUBST_TRACE([AM_LDFLAGS])
-m4trace:configure.ac:1869: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1871: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in regex/Makefile \
+m4trace:configure.ac:1866: -1- AC_SUBST([REGEX_BUILD])
+m4trace:configure.ac:1866: -1- AC_SUBST_TRACE([REGEX_BUILD])
+m4trace:configure.ac:1866: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1868: -1- AC_SUBST([WEB_BUILD])
+m4trace:configure.ac:1868: -1- AC_SUBST_TRACE([WEB_BUILD])
+m4trace:configure.ac:1868: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1869: -1- AC_SUBST([WEB_BINDIR])
+m4trace:configure.ac:1869: -1- AC_SUBST_TRACE([WEB_BINDIR])
+m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1870: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1870: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1871: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1871: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1872: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1872: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1874: -1- AC_SUBST([AM_CFLAGS])
+m4trace:configure.ac:1874: -1- AC_SUBST_TRACE([AM_CFLAGS])
+m4trace:configure.ac:1874: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1875: -1- AC_SUBST([AM_LDFLAGS])
+m4trace:configure.ac:1875: -1- AC_SUBST_TRACE([AM_LDFLAGS])
+m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1877: -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:1878: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1878: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1878: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1878: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1878: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1878: -2- m4_include([VERSION])
-m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1878: -2- m4_include([VERSION])
-m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:1878: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:1884: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1884: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1884: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1884: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1884: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1884: -2- m4_include([VERSION])
+m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1884: -2- m4_include([VERSION])
+m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:1884: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2
index 3b96813d..d0839532 100644
--- a/autom4te.cache/traces.2
+++ b/autom4te.cache/traces.2
@@ -5463,21 +5463,23 @@ m4trace:configure.ac:583: -1- m4_pattern_allow([^DF_DEFAULT_PRINTER$])
 m4trace:configure.ac:623: -1- m4_pattern_allow([^PASSFILE$])
 m4trace:configure.ac:627: -1- m4_pattern_allow([^DF_SSHPATH$])
 m4trace:configure.ac:642: -1- m4_pattern_allow([^DF_SSHCMD$])
-m4trace:configure.ac:999: -1- m4_pattern_allow([^OSX_TARGET$])
-m4trace:configure.ac:1004: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
-m4trace:configure.ac:1036: -1- m4_pattern_allow([^__EXTENSIONS__$])
-m4trace:configure.ac:1167: -1- m4_pattern_allow([^_WINDOWS$])
-m4trace:configure.ac:1242: -1- m4_pattern_allow([^HAS_TERMINFO$])
-m4trace:configure.ac:1245: -1- m4_pattern_allow([^HAS_TERMCAP$])
-m4trace:configure.ac:1269: -1- m4_pattern_allow([^ENABLE_LDAP$])
-m4trace:configure.ac:1274: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
-m4trace:configure.ac:1438: -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:1035: -1- m4_pattern_allow([^OSX_TARGET$])
+m4trace:configure.ac:1040: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
+m4trace:configure.ac:1072: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:1178: -1- m4_pattern_allow([^_WINDOWS$])
+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...
 ../../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:1438: the top level])
-m4trace:configure.ac:1484: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1493: -1- ACX_PTHREAD([
+configure.ac:1442: the top level])
+m4trace:configure.ac:1488: -1- m4_pattern_allow([^HAVE_REGEX_H$])
+m4trace:configure.ac:1497: -1- ACX_PTHREAD([
       AC_MSG_RESULT([yes])
       case "$target" in
 	  *openbsd*)
@@ -5492,111 +5494,111 @@ m4trace:configure.ac:1493: -1- ACX_PTHREAD([
     ], [
       AC_MSG_RESULT([no])
     ])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1493: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1493: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1497: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1497: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1497: -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:1493: the top level])
-m4trace:configure.ac:1511: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1521: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1523: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1524: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1525: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1526: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1557: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1573: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+configure.ac:1497: the top level])
+m4trace:configure.ac:1515: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1525: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1527: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1529: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1530: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1532: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1577: -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:1582: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1585: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1586: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1588: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1588: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1589: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1591: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1610: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1629: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1647: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1653: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1704: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1704: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1715: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1737: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1738: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1739: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1740: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1741: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1745: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1762: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1763: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1815: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1826: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1830: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1853: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1860: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1862: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1863: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1864: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1865: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1866: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1868: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1869: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1878: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1878: -2- m4_include([VERSION])
-m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1878: -2- m4_include([VERSION])
-m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1878: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:1878: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:1878: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:1586: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1589: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1590: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1592: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1592: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1595: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1614: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1633: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1708: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1708: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1719: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1741: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1742: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1743: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1744: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1745: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1748: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1768: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1821: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1832: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1836: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1839: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1859: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1866: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1868: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1874: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1884: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1884: -2- m4_include([VERSION])
+m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1884: -2- m4_include([VERSION])
+m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1884: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:1884: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:1884: -1- _LT_PROG_LTMAIN
diff --git a/configure b/configure
index a9e426a2..68588a18 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Rev:2 by chappa@washington.edu.
+# From configure.ac Rev:3 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.11.4.
+# Generated by GNU Autoconf 2.69 for alpine 2.11.5.
 #
 # 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.4'
-PACKAGE_STRING='alpine 2.11.4'
+PACKAGE_VERSION='2.11.5'
+PACKAGE_STRING='alpine 2.11.5'
 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.4 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.5 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.4:";;
+     short | recursive ) echo "Configuration of alpine 2.11.5:";;
    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.4
+alpine configure 2.11.5
 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.4, which was
+It was created by alpine $as_me 2.11.5, 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.4'
+ VERSION='2.11.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15542,13 +15542,19 @@ else
         alpine_SSLTYPE="nopwd"
 	if test -d /etc/pki/tls ; then
 	  alpine_SSLDIR="/etc/pki/tls"
-	  alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	  alpine_SSLKEYS="$alpine_SSLDIR/private"
-	  alpine_SSLINCLUDE="/usr/include/openssl"
-	  alpine_SSLLIB="/usr/lib"
 	else
 	  alpine_SSLDIR="/usr/share/ssl"
 	fi
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      elif test -f /etc/mandrake-release ; then
+	alpine_SSLDIR="/usr/lib/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/SuSE-release ; then
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/etc/ssl"
@@ -15562,6 +15568,14 @@ else
         alpine_SSLCERTS="/usr/share/certs"
 	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
+	   alpine_SSLDIR="/etc/ssl"
+	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	   alpine_SSLKEYS="$alpine_SSLDIR/private"
+	   alpine_SSLINCLUDE="/usr/include/openssl"
+	   alpine_SSLLIB="/usr/lib"
+        fi
       else
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/usr"
@@ -15584,14 +15598,49 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
       fi
       ;;
+    *-*-netbsd*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-dragonfly*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
     *-openbsd*)
-      alpine_SSLTYPE="nopwd"
-      alpine_SSLDIR="/usr"
-      alpine_SSLCERTS="/etc/ssl/certs"
+	alpine_SSLTYPE="nopwd"
+	alpine_SSLDIR="/usr"
+	alpine_SSLCERTS="/etc/ssl/certs"
+      ;;
+    *-*-freebsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-openbsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+	alpine_SSLCERTS="/etc/ssl"
+	alpine_SSLKEYS="/etc/ssl/private"
+      ;;
+    *-*-cygwin)
+	alpine_SSLDIR="/usr/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/certs"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
       ;;
     *-sco-sysv* | *-sysv*UnixWare | *-sysv*OpenUNIX)
-      alpine_SSLTYPE="sco.nopwd"
-      alpine_SSLDIR="/usr/local/ssl"
+	alpine_SSLTYPE="sco.nopwd"
+	alpine_SSLDIR="/usr/local/ssl"
       ;;
     *-*-solaris*)
       if test -d /usr/sfw/include/openssl ; then
@@ -15618,6 +15667,8 @@ if test "${with_ssl_dir+set}" = set; then :
   withval=$with_ssl_dir;
       if test "x$withval" != "xno" ; then
 	alpine_SSLDIR=$withval
+	alpine_SSLINCLUDE=$alpine_SSLDIR/include
+	alpine_SSLLIB=$alpine_SSLDIR/lib
       fi
 
 fi
@@ -15860,11 +15911,6 @@ case "$host" in
       systype="LMD"
       alpine_c_client_target="lmd"
       alpine_PAM="yes"
-      alpine_SSLDIR="/usr/lib/ssl"
-      alpine_SSLCERTS="$alpine_SSLDIR/certs"
-      alpine_SSLKEYS="$alpine_SSLDIR/private"
-      alpine_SSLINCLUDE="/usr/include/openssl"
-      alpine_SSLLIB="/usr/lib"
     elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then
       systype="LRH"
       alpine_PAM="yes"
@@ -15872,11 +15918,6 @@ case "$host" in
 	alpine_c_client_target="lr5"
       else
 	alpine_c_client_target="lrh"
-	alpine_SSLDIR="/usr/share/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl"
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/debian_release -o -f /etc/debian_version ; then
       if test -d /etc/osso-af-init ; then
@@ -15886,11 +15927,6 @@ case "$host" in
         systype="DEB"
         alpine_c_client_target="ldb"
 	alpine_PAM="yes"
-	alpine_SSLDIR="/etc/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl"
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/SuSE-release ; then
       systype="LSU"
@@ -16082,22 +16118,12 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-dragonfly*)
     systype="DFB"
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-bsdi*)
     systype="BSI"
@@ -16110,11 +16136,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bsf"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-openbsd*)
@@ -16122,11 +16143,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bso"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
-    alpine_SSLCERTS="/etc/ssl"
-    alpine_SSLKEYS="/etc/ssl/private"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-aix5*)
@@ -16164,11 +16180,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
     alpine_path_delim="/"
     alpine_mode_readonly="(S_IREAD | S_IWRITE)"
     alpine_c_client_target="cyg"
-    alpine_SSLDIR="/usr/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/certs"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   windows* | *-*-pw32*)
@@ -16507,15 +16518,12 @@ $as_echo "#define HAS_TERMCAP 1" >>confdefs.h
     ;;
 esac
 
-if test "$alpine_with_ldap" = "yes" ; then
-  alpine_has_ldap=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5
-$as_echo_n "checking for ber_alloc in -llber... " >&6; }
-if ${ac_cv_lib_lber_ber_alloc+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llber  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16525,35 +16533,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ber_alloc ();
+char dlopen ();
 int
 main ()
 {
-return ber_alloc ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lber_ber_alloc=yes
-else
-  ac_cv_lib_lber_ber_alloc=no
+for ac_lib in '' dl dld; 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_dlopen=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5
-$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; }
-if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
+done
+if ${ac_cv_search_dlopen+:} false; then :
 
-      LIBS="$LIBS -llber"
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+else
+   alpine_DL="none"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
-$as_echo_n "checking for library containing ldap_init... " >&6; }
-if ${ac_cv_search_ldap_init+:} false; then :
+if test "x$alpine_DL" = "xnone" ; then
+    as_fn_error $? "No library containing dlopen found" "$LINENO" 5
+    exit 1
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
+$as_echo_n "checking for library containing SSLeay... " >&6; }
+if ${ac_cv_search_SSLeay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16566,16 +16597,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_init ();
+char SSLeay ();
 int
 main ()
 {
-return ldap_init ();
+return SSLeay ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' crypto; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16583,35 +16614,42 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_init=$ac_res
+  ac_cv_search_SSLeay=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_init+:} false; then :
+  if ${ac_cv_search_SSLeay+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_init+:} false; then :
+if ${ac_cv_search_SSLeay+:} false; then :
 
 else
-  ac_cv_search_ldap_init=no
+  ac_cv_search_SSLeay=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
-$as_echo "$ac_cv_search_ldap_init" >&6; }
-ac_res=$ac_cv_search_ldap_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
+$as_echo "$ac_cv_search_SSLeay" >&6; }
+ac_res=$ac_cv_search_SSLeay
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-      alpine_has_ldap=yes
-
 else
+   alpine_CRYPTO="none"
+fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5
-$as_echo_n "checking for library containing ldap_open... " >&6; }
-if ${ac_cv_search_ldap_open+:} false; then :
+  if test "x$alpine_CRYPTO" = "xnone" ; then
+     as_fn_error $? "crypto library NOT found" "$LINENO" 5
+     exit 1
+  fi
+fi
+
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
+$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+if ${ac_cv_search_SSL_library_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16624,16 +16662,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ldap_open ();
+char SSL_library_init ();
 int
 main ()
 {
-return ldap_open ();
+return SSL_library_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' ssl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16641,61 +16679,55 @@ for ac_lib in '' ldap; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ldap_open=$ac_res
+  ac_cv_search_SSL_library_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ldap_open+:} false; then :
+  if ${ac_cv_search_SSL_library_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ldap_open+:} false; then :
+if ${ac_cv_search_SSL_library_init+:} false; then :
 
 else
-  ac_cv_search_ldap_open=no
+  ac_cv_search_SSL_library_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5
-$as_echo "$ac_cv_search_ldap_open" >&6; }
-ac_res=$ac_cv_search_ldap_open
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
+$as_echo "$ac_cv_search_SSL_library_init" >&6; }
+ac_res=$ac_cv_search_SSL_library_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-	  alpine_has_ldap=yes
-
-fi
-
-
+else
+   alpine_SSLTYPE="none"
 fi
 
 
-  if test "$alpine_has_ldap" = "yes" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5
-$as_echo "$as_me: Including LDAP Support" >&6;}
-
-$as_echo "#define ENABLE_LDAP /**/" >>confdefs.h
-
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5
-$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; }
-    if test "$cross_compiling" = yes; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
-
+  if test "x$alpine_SSLTYPE" = "xnone" ; then
+     as_fn_error $? "No library containing SSL_library_init found in your path" "$LINENO" 5
+     exit 1
+  fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
+$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
+  if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
-#include <string.h>
-#include <ldap.h>
+#include <stdlib.h>
+#include <openssl/ssl.h>
 int main(void) {
 
-	if (LDAP_VENDOR_VERSION >= 20300)
+	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
 		exit(0);
 
 	exit(2);
@@ -16703,35 +16735,69 @@ int main(void) {
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
-$as_echo "#define LDAP_DEPRECATED 1" >>confdefs.h
+else
+   alpine_SSLTYPE="none"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
 
+    if test "x$alpine_SSLTYPE" = "xnone" ; then
+	as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
+	exit 1
+    fi
+fi
 
+if test "$alpine_with_ldap" = "yes" ; then
+  alpine_has_ldap=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5
+$as_echo_n "checking for ber_alloc in -llber... " >&6; }
+if ${ac_cv_lib_lber_ber_alloc+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llber  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
+/* 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 ber_alloc ();
+int
+main ()
+{
+return ber_alloc ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lber_ber_alloc=yes
+else
+  ac_cv_lib_lber_ber_alloc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5
+$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; }
+if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then :
 
+      LIBS="$LIBS -llber"
 
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions!  Excluding LDAP support." >&5
-$as_echo "$as_me: Cannot find LDAP functions!  Excluding LDAP support." >&6;}
-  fi
 fi
 
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ac_cv_search_SSL_library_init+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
+$as_echo_n "checking for library containing ldap_init... " >&6; }
+if ${ac_cv_search_ldap_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16744,16 +16810,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char ldap_init ();
 int
 main ()
 {
-return SSL_library_init ();
+return ldap_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ssl; do
+for ac_lib in '' ldap; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16761,86 +16827,35 @@ for ac_lib in '' ssl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSL_library_init=$ac_res
+  ac_cv_search_ldap_init=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSL_library_init+:} false; then :
+  if ${ac_cv_search_ldap_init+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSL_library_init+:} false; then :
+if ${ac_cv_search_ldap_init+:} false; then :
 
 else
-  ac_cv_search_SSL_library_init=no
+  ac_cv_search_ldap_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
-$as_echo "$ac_cv_search_SSL_library_init" >&6; }
-ac_res=$ac_cv_search_SSL_library_init
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5
+$as_echo "$ac_cv_search_ldap_init" >&6; }
+ac_res=$ac_cv_search_ldap_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-      LIBS="$LIBS -lssl"
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5
-$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; }
-     if test "$cross_compiling" = yes; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
-$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <openssl/ssl.h>
-int main(void) {
-
-	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
-		exit(0);
-
-	exit(2);
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-else
-
-		as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
-		exit 1
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+      alpine_has_ldap=yes
 
 else
-  alpine_SSLTYPE="none"
-fi
-
-  if test "x$alpine_SSLTYPE" = "xnone" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries NOT found" >&5
-$as_echo "$as_me: OpenSSL libraries NOT found" >&6;}
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries FOUND" >&5
-$as_echo "$as_me: OpenSSL libraries FOUND" >&6;}
-  fi
-fi
 
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5
-$as_echo_n "checking for library containing SSLeay... " >&6; }
-if ${ac_cv_search_SSLeay+:} false; then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5
+$as_echo_n "checking for library containing ldap_open... " >&6; }
+if ${ac_cv_search_ldap_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16853,16 +16868,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSLeay ();
+char ldap_open ();
 int
 main ()
 {
-return SSLeay ();
+return ldap_open ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypto; do
+for ac_lib in '' ldap; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16870,41 +16885,90 @@ for ac_lib in '' crypto; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_SSLeay=$ac_res
+  ac_cv_search_ldap_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_SSLeay+:} false; then :
+  if ${ac_cv_search_ldap_open+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_SSLeay+:} false; then :
+if ${ac_cv_search_ldap_open+:} false; then :
 
 else
-  ac_cv_search_SSLeay=no
+  ac_cv_search_ldap_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5
-$as_echo "$ac_cv_search_SSLeay" >&6; }
-ac_res=$ac_cv_search_SSLeay
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5
+$as_echo "$ac_cv_search_ldap_open" >&6; }
+ac_res=$ac_cv_search_ldap_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-      LIBS="$LIBS -lcrypto"
+	  alpine_has_ldap=yes
+
+fi
+
+
+fi
+
+
+  if test "$alpine_has_ldap" = "yes" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5
+$as_echo "$as_me: Including LDAP Support" >&6;}
+
+$as_echo "#define ENABLE_LDAP /**/" >>confdefs.h
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5
+$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; }
+    if test "$cross_compiling" = yes; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ldap.h>
+int main(void) {
+
+	if (LDAP_VENDOR_VERSION >= 20300)
+		exit(0);
+
+	exit(2);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define LDAP_DEPRECATED 1" >>confdefs.h
+
+
 
 else
 
-      alpine_CRYPTO = "none"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
 
-  if test "x$alpine_CRYPTO" = "xnone" ; then
-    as_fn_error $? "crypto library NOT found" "$LINENO" 5
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: crypto library found" >&5
-$as_echo "$as_me: crypto library found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions!  Excluding LDAP support." >&5
+$as_echo "$as_me: Cannot find LDAP functions!  Excluding LDAP support." >&6;}
   fi
 fi
 
@@ -17221,7 +17285,7 @@ fi
   fi
 fi
 
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
 $as_echo_n "checking for library containing regcomp... " >&6; }
 if ${ac_cv_search_regcomp+:} false; then :
@@ -17287,7 +17351,7 @@ else
 fi
 
 fi
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
 if test "x$ac_cv_header_regex_h" = xyes; then :
 
@@ -17306,7 +17370,7 @@ fi
 
 $as_echo "#define HAVE_REGEX_H 1" >>confdefs.h
 
-if test x$alpine_REGEX = "xyes" ; then
+if test "x$alpine_REGEX" = "xyes" ; then
   CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
   LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
   REGEX_BUILD=regex
@@ -19425,6 +19489,8 @@ else
     certdir="$alpine_SSLCERTS"
   elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then
     certdir="${alpine_SSLDIR}/certs"
+  elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/ssl/certs" ; then
+    certdir="${alpine_SSLDIR}/ssl/certs"
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: SSL Problem: certificate directory not found" >&5
 $as_echo "$as_me: SSL Problem: certificate directory not found" >&6;}
@@ -20094,7 +20160,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.4, which was
+This file was extended by alpine $as_me 2.11.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20160,7 +20226,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.4
+alpine config.status 2.11.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index af4f1eef..f00f8472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl  */
 
 AC_PREREQ([2.69])
 
-AC_REVISION([Rev:2 by chappa@washington.edu])
+AC_REVISION([Rev:3 by chappa@washington.edu])
 
 dnl Alpine Version Number is in $srcdir/VERSION
 AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu])
@@ -669,13 +669,19 @@ else
         alpine_SSLTYPE="nopwd"
 	if test -d /etc/pki/tls ; then  
 	  alpine_SSLDIR="/etc/pki/tls"
-	  alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	  alpine_SSLKEYS="$alpine_SSLDIR/private"
-	  alpine_SSLINCLUDE="/usr/include/openssl" 
-	  alpine_SSLLIB="/usr/lib"
 	else
 	  alpine_SSLDIR="/usr/share/ssl"
 	fi
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
+      elif test -f /etc/mandrake-release ; then
+	alpine_SSLDIR="/usr/lib/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs" 
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
       elif test -f /etc/SuSE-release ; then
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/etc/ssl"
@@ -689,6 +695,14 @@ else
         alpine_SSLCERTS="/usr/share/certs"
 	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
+	   alpine_SSLDIR="/etc/ssl"
+	   alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	   alpine_SSLKEYS="$alpine_SSLDIR/private"
+	   alpine_SSLINCLUDE="/usr/include/openssl" 
+	   alpine_SSLLIB="/usr/lib"
+        fi
       else
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/usr"
@@ -711,14 +725,49 @@ else
 	alpine_SSLINCLUDE="/usr/include/openssl"
       fi
       ;;
+    *-*-netbsd*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-dragonfly*)
+	alpine_SSLDIR="/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+      ;;
     *-openbsd*)
-      alpine_SSLTYPE="nopwd"
-      alpine_SSLDIR="/usr"
-      alpine_SSLCERTS="/etc/ssl/certs"
+	alpine_SSLTYPE="nopwd"
+	alpine_SSLDIR="/usr"
+	alpine_SSLCERTS="/etc/ssl/certs"
+      ;;
+    *-*-freebsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
+      ;;
+    *-*-openbsd*)
+	alpine_SSLDIR="/etc/ssl"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
+	alpine_SSLCERTS="/etc/ssl" 
+	alpine_SSLKEYS="/etc/ssl/private"
+      ;;
+    *-*-cygwin)
+	alpine_SSLDIR="/usr/ssl"
+	alpine_SSLCERTS="$alpine_SSLDIR/certs" 
+	alpine_SSLKEYS="$alpine_SSLDIR/certs"
+	alpine_SSLINCLUDE="/usr/include/openssl" 
+	alpine_SSLLIB="/usr/lib"
       ;;
     *-sco-sysv* | *-sysv*UnixWare | *-sysv*OpenUNIX)
-      alpine_SSLTYPE="sco.nopwd"
-      alpine_SSLDIR="/usr/local/ssl"
+	alpine_SSLTYPE="sco.nopwd"
+	alpine_SSLDIR="/usr/local/ssl"
       ;;
     *-*-solaris*)
       if test -d /usr/sfw/include/openssl ; then
@@ -744,6 +793,8 @@ else
     [
       if test "x$withval" != "xno" ; then
 	alpine_SSLDIR=$withval
+	alpine_SSLINCLUDE=$alpine_SSLDIR/include
+	alpine_SSLLIB=$alpine_SSLDIR/lib
       fi
     ])
 
@@ -937,11 +988,6 @@ case "$host" in
       systype="LMD"
       alpine_c_client_target="lmd"
       alpine_PAM="yes"
-      alpine_SSLDIR="/usr/lib/ssl"
-      alpine_SSLCERTS="$alpine_SSLDIR/certs" 
-      alpine_SSLKEYS="$alpine_SSLDIR/private"
-      alpine_SSLINCLUDE="/usr/include/openssl" 
-      alpine_SSLLIB="/usr/lib"
     elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then
       systype="LRH"
       alpine_PAM="yes"
@@ -949,11 +995,6 @@ case "$host" in
 	alpine_c_client_target="lr5"
       else
 	alpine_c_client_target="lrh"
-	alpine_SSLDIR="/usr/share/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl"
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/debian_release -o -f /etc/debian_version ; then
       if test -d /etc/osso-af-init ; then
@@ -963,11 +1004,6 @@ case "$host" in
         systype="DEB"
         alpine_c_client_target="ldb"
 	alpine_PAM="yes"
-	alpine_SSLDIR="/etc/ssl"
-	alpine_SSLCERTS="$alpine_SSLDIR/certs"
-	alpine_SSLKEYS="$alpine_SSLDIR/private"
-	alpine_SSLINCLUDE="/usr/include/openssl" 
-	alpine_SSLLIB="/usr/lib"
       fi
     elif test -f /etc/SuSE-release ; then
       systype="LSU"
@@ -1070,22 +1106,12 @@ case "$host" in
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-dragonfly*)
     systype="DFB"
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
-    alpine_SSLDIR="/etc/openssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
     ;;
   *-*-bsdi*)
     systype="BSI"
@@ -1098,11 +1124,6 @@ case "$host" in
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bsf"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs"
-    alpine_SSLKEYS="$alpine_SSLDIR/private"
-    alpine_SSLINCLUDE="/usr/include/openssl" 
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-openbsd*)
@@ -1110,11 +1131,6 @@ case "$host" in
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="bso"
-    alpine_SSLDIR="/etc/ssl"
-    alpine_SSLINCLUDE="/usr/include/openssl"
-    alpine_SSLLIB="/usr/lib"
-    alpine_SSLCERTS="/etc/ssl" 
-    alpine_SSLKEYS="/etc/ssl/private"
     LIBS="$LIBS $LIBINTL"
     ;;
   *-*-aix5*)
@@ -1152,11 +1168,6 @@ case "$host" in
     alpine_path_delim="/"
     alpine_mode_readonly="(S_IREAD | S_IWRITE)"
     alpine_c_client_target="cyg"
-    alpine_SSLDIR="/usr/ssl"
-    alpine_SSLCERTS="$alpine_SSLDIR/certs" 
-    alpine_SSLKEYS="$alpine_SSLDIR/certs"
-    alpine_SSLINCLUDE="/usr/include/openssl" 
-    alpine_SSLLIB="/usr/lib"
     LIBS="$LIBS $LIBINTL"
     ;;
   windows* | *-*-pw32*)
@@ -1246,6 +1257,54 @@ case $alpine_termdata in
     ;;
 esac
 
+dnl is -ldl present? if so, add it
+AC_SEARCH_LIBS([dlopen], [dl dld],, [ alpine_DL="none" ])
+if test "x$alpine_DL" = "xnone" ; then
+    AC_MSG_ERROR([No library containing dlopen found])
+    exit 1	
+fi
+
+dnl Crypto support is needed 
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+  AC_SEARCH_LIBS(SSLeay,crypto,, [ alpine_CRYPTO="none" ])
+  if test "x$alpine_CRYPTO" = "xnone" ; then
+     AC_MSG_ERROR(crypto library NOT found)
+     exit 1
+  fi
+fi
+
+dnl provide SSL support?
+if test "x$alpine_SSLTYPE" != "xnone" ; then
+   AC_SEARCH_LIBS(SSL_library_init,ssl,,[ alpine_SSLTYPE="none" ])
+
+  if test "x$alpine_SSLTYPE" = "xnone" ; then
+     AC_MSG_ERROR(No library containing SSL_library_init found in your path)
+     exit 1
+  fi
+
+  AC_MSG_CHECKING([Openssl library version >= 1.0.0c])
+  AC_RUN_IFELSE(
+	[AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <stdlib.h>
+#include <openssl/ssl.h>
+int main(void) {
+
+	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
+		exit(0);
+
+	exit(2);
+}
+	]])],
+	[ AC_MSG_RESULT(yes) ],
+	[ alpine_SSLTYPE="none" ])
+
+    if test "x$alpine_SSLTYPE" = "xnone" ; then
+	AC_MSG_ERROR(Install openssl version >= 1.0.0c)
+	exit 1
+    fi
+fi
+
 dnl provide LDAP support?
 if test "$alpine_with_ldap" = "yes" ; then
   alpine_has_ldap=
@@ -1274,7 +1333,7 @@ if test "$alpine_with_ldap" = "yes" ; then
     AC_RUN_IFELSE(
 	[AC_LANG_SOURCE([[
 #include <stdio.h>
-#include <string.h>
+#include <stdlib.h>
 #include <ldap.h>
 int main(void) {
 
@@ -1303,61 +1362,6 @@ int main(void) {
   fi
 fi
 
-dnl provide SSL support?
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  AC_SEARCH_LIBS(SSL_library_init,ssl,
-    [
-      LIBS="$LIBS -lssl"
-
-     AC_MSG_CHECKING([Openssl library version >= 1.0.0c])
-     AC_RUN_IFELSE(
-	[AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <openssl/ssl.h>
-int main(void) {
-
-	if (OPENSSL_VERSION_NUMBER >= 0x1000003f)
-		exit(0);
-
-	exit(2);
-}
-	]])],
-	[
-		AC_MSG_RESULT(yes)
-	],
-	[
-		AC_MSG_ERROR(Install openssl version >= 1.0.0c)
-		exit 1
-	],
-	[
-		AC_MSG_WARN([cross compiling: not checking])
-	]
-    )
-    ],
-    [alpine_SSLTYPE="none"])
-  if test "x$alpine_SSLTYPE" = "xnone" ; then
-    AC_MSG_NOTICE([OpenSSL libraries NOT found])
-  else
-    AC_MSG_NOTICE([OpenSSL libraries FOUND])
-  fi
-fi
-
-dnl Crypto support is needed 
-if test "x$alpine_SSLTYPE" != "xnone" ; then
-  AC_SEARCH_LIBS(SSLeay,crypto,
-    [
-      LIBS="$LIBS -lcrypto"
-    ],
-    [
-      alpine_CRYPTO = "none"
-    ])
-  if test "x$alpine_CRYPTO" = "xnone" ; then
-    AC_MSG_ERROR(crypto library NOT found)
-  else
-    AC_MSG_NOTICE([crypto library found])
-  fi
-fi
-
 dnl PAM support is needed to build c-client in some linux, and hence Alpine.
 if test "x$alpine_PAM" != "xnone" ; then
   AC_SEARCH_LIBS(pam_start,pam,
@@ -1461,7 +1465,7 @@ TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl"
 fi
 
 dnl Local or supplied regex?
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   AC_SEARCH_LIBS([regcomp],posix regexp regex re,,
     [
       if test x$alpine_REGEX = "xno" ; then
@@ -1471,7 +1475,7 @@ if test x$alpine_REGEX != "xyes" ; then
       fi
     ])
 fi
-if test x$alpine_REGEX != "xyes" ; then
+if test "x$alpine_REGEX" != "xyes" ; then
   AC_CHECK_HEADER([regex.h],,
     [
       if test x$alpine_REGEX = "xno" ; then
@@ -1482,7 +1486,7 @@ if test x$alpine_REGEX != "xyes" ; then
     ])
 fi
 AC_DEFINE(HAVE_REGEX_H,1,[Regular expression header file exists])
-if test x$alpine_REGEX = "xyes" ; then
+if test "x$alpine_REGEX" = "xyes" ; then
   CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
   LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
   REGEX_BUILD=regex
@@ -1753,6 +1757,8 @@ else
     certdir="$alpine_SSLCERTS"
   elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then
     certdir="${alpine_SSLDIR}/certs"
+  elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/ssl/certs" ; then
+    certdir="${alpine_SSLDIR}/ssl/certs"
   else
     AC_MSG_NOTICE([SSL Problem: certificate directory not found])
   fi
diff --git a/include/config.wnt.h b/include/config.wnt.h
index d20ff221..78bc90f6 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -448,7 +448,7 @@
 #define PACKAGE "alpine"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "alpine-contact@u.washington.edu"
+#define PACKAGE_BUGREPORT "chappa@gmx.com"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "alpine"
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index fe3fcc23..bcd9ba38 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -1955,7 +1955,7 @@ BOOL APIENTRY DllMain(
 	fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.11r\n");
 	fprintf(ms_global->dfd, " Build date: %s\r\n", datestamp);
 	fprintf(ms_global->dfd,
-		" please report all bugs to alpine-contact@u.washington.edu\r\n");
+		" please report all bugs to chappa@gmx.com\r\n");
 	if(tm_now)
 	  fprintf(ms_global->dfd, 
 		  "Created: %2.2d:%2.2d:%2.2d %d/%d/%d\r\n",
diff --git a/packages/debian/control b/packages/debian/control
index 7e94e885..7c62f3a9 100644
--- a/packages/debian/control
+++ b/packages/debian/control
@@ -1,7 +1,7 @@
 Source: alpine
 Section: non-free/mail
 Priority: optional
-Maintainer: Alpine Contact <alpine-contact@u.washington.edu>
+Maintainer: Eduardo Chappa <chappa@gmx.com>
 Standards-Version: 3.6.1.0
 Build-Depends: libncurses-dev | libncurses5-dev, libldap-dev | libldap2-dev, libssl-dev, libpam-dev | libpam0g-dev
 
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 1a0d3bed..d737ed43 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 29 2013-09-05 00:40:13
+Alpine Commit 30 2013-09-12 00:34:18
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -194,6 +194,9 @@ Additions include:
 <P>
 Bugs that have been addressed include:
 <UL>
+  <LI> Save command did not warn of existence of a message with a deleted 
+       attachment in an aggregate save, unless cursor was positioned on a message 
+       with a deleted attachment. Reported by Florian Herzig.
   <LI> Transformation of UTF-8 to MUTF7 was not being done when creating a folder
        in an IMAP server.
   <LI> DATE tokens were not internally transformed to UTF-8, which made their
@@ -2586,10 +2589,7 @@ directed to the individual or group that did the adaptation.
 <P>
 
 <ADDRESS>
-   Alpine&nbsp;Development&nbsp;Team&nbsp;&lt;alpine-contact@u.washington.edu&gt;<BR>
-   Computing&nbsp;&amp;&nbsp;Communications<BR>
-   University&nbsp;of&nbsp;Washington<BR>
-   Seattle,&nbsp;WA&nbsp;98195<BR>
+   Eduardo Chappa &lt;chappa@gmx.com&gt;
 </ADDRESS>
 
 <P>
diff --git a/po/Makefile.in b/po/Makefile.in
index 16455ca7..8949197d 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.16
 
 PACKAGE = alpine
-VERSION = 2.11.3
+VERSION = 2.11.4
 PACKAGE_BUGREPORT = chappa@washington.edu
 
 SHELL = /bin/sh
diff --git a/po/Makevars b/po/Makevars
index 24318814..5715806f 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = University of Washington
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = alpine-contact@u.washington.edu
+MSGID_BUGS_ADDRESS = chappa@gmx.com
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/po/alpine.pot b/po/alpine.pot
index 1e17ca9a..d3b38e66 100644
--- a/po/alpine.pot
+++ b/po/alpine.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: alpine-contact@u.washington.edu\n"
+"Report-Msgid-Bugs-To: chappa@gmx.com\n"
 "POT-Creation-Date: 2008-06-03 12:14-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/web/INSTALL b/web/INSTALL
index 62ce69d6..f6e3482b 100644
--- a/web/INSTALL
+++ b/web/INSTALL
@@ -35,7 +35,7 @@ web/cgi/alpine/help/tech-notes.html.
 
 At some point online FAQs and such may be available.  If you find
 anything missing, incomplete, or otherwise unclear please send a note
-to <alpine-contact@cac.washington.edu>.
+to <chappa@gmx.com>.
 
 
 WEB ALPINE LAYOUT
@@ -355,7 +355,5 @@ FURTHER INFORMATION
 
 See the Web Alpine technical notes for more detailed descriptions of
 what's going on and why.  If you have any questions or comments drop
-us a note <alpine-contact@cac.washington.edu>.
+us a note <chappa@gmx.com>.
 
--- 
-$Id: INSTALL 1169 2008-08-27 06:42:06Z hubert@u.washington.edu $
diff --git a/web/README b/web/README
index 64d19168..293f6211 100644
--- a/web/README
+++ b/web/README
@@ -73,9 +73,4 @@ documented as well).
 SUPPORT AND FEEDBACK
 --------------------
 
-Send comments and questions to <alpine-contact@cac.washington.edu>.
-
-
---
-alpine.tar.z web/README
-$Id: README 890 2007-12-21 05:34:43Z hubert@u.washington.edu $
+Send comments and questions to <chappa@gmx.com>
diff --git a/web/src/cgi.tcl-1.10/README.UW b/web/src/cgi.tcl-1.10/README.UW
index 7dfe161c..006a7fbd 100644
--- a/web/src/cgi.tcl-1.10/README.UW
+++ b/web/src/cgi.tcl-1.10/README.UW
@@ -20,4 +20,4 @@ PATCH.UW, amount to a few things:
       newlines
 
 For comments or questions regarding the Web Alpine application
-send comments to <alpine-contact@cac.washington.edu>
+send comments to <chappa@gmx.com>