* Opening a folder updates recent count in maildrops.

  * Fixes to configure script so that it will not require PAM for every system.
  * Fix to configure script so that it will use CPPFLAGS instead of
    CPPCFLAGS, and so the --with-ssl-include-dir option take effect
    during the build. Fix by Ulf-Dietrich Braumann.
  * Fix in WebAlpine: do not use deprecated dereference in pointer,
    needs to use tcl_getstringresult() instead. Reported by Ulf-Dietrich
    Braumann.
  * Fix in configure script to detect location of tcl library; add
    /usr/local in FreeBSD and fix a bug in configure script that used
    $alpine_TCLINC instead of $alpine_TCLINC/tcl.h. Reported and fixed
    by Werner Scheinast.
  * Move SSL configurations from UW-IMAP to configure script.

1 files changed, 452 insertions, 332 deletions

diff --git a/configure b/configure
index 8c9f46e6..f1257f4b 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Rev:2 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.11.
+# Generated by GNU Autoconf 2.69 for alpine 2.11.2.
 #
 # 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'
-PACKAGE_STRING='alpine 2.11'
+PACKAGE_VERSION='2.11.2'
+PACKAGE_STRING='alpine 2.11.2'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -908,8 +908,8 @@ dvidir
 htmldir
 infodir
 docdir
-oldincludedir
-includedir
+oldIncludedir
+Includedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1091,8 +1091,8 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
+Includedir='${prefix}/include'
+oldIncludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
@@ -1231,12 +1231,12 @@ do
   | --ht=*)
     htmldir=$ac_optarg ;;
 
-  -includedir | --includedir | --includedi | --included | --include \
+  -Includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+    ac_prev=Includedir ;;
+  -Includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
+    Includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
@@ -1284,14 +1284,14 @@ do
   | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
     no_recursion=yes ;;
 
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  -oldIncludedir | --oldincludedir | --oldincludedi | --oldincluded \
   | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
   | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+    ac_prev=oldIncludedir ;;
+  -oldIncludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
+    oldIncludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
@@ -1478,8 +1478,8 @@ fi
 
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		datadir sysconfdir sharedstatedir localstatedir Includedir \
+		oldIncludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
@@ -1593,7 +1593,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 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1605,7 +1605,7 @@ Defaults for the options are specified in brackets.
 Configuration:
   -h, --help              display this help and exit
       --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
+      --help=recursive    display the short help of all the Included packages
   -V, --version           display version information and exit
   -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
@@ -1634,8 +1634,8 @@ Fine tuning of the installation directories:
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --Includedir=DIR        C header files [PREFIX/include]
+  --oldIncludedir=DIR     C header files for non-gcc [/usr/include]
   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
   --infodir=DIR           info documentation [DATAROOTDIR/info]
@@ -1663,7 +1663,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.11:";;
+     short | recursive ) echo "Configuration of alpine 2.11.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1860,7 +1860,7 @@ Optional Packages:
   --with-ldap-lib-dir=DIR LDAP library path
   --without-smime         Disable S/MIME
   --without-tcl           Disable TCL, thus Web Alpine support
-  --with-tcl-lib=LIBRARY  Specific TCL Library, like \"tcl8.5\"
+  --with-tcl-lib=LIBRARY  Specific TCL Library, like \"tcl8.6\"
   --with-tcl-include=DIR  Directory containing TCL include files
   --with-supplied-regex   Use regex library supplied with alpine
   --without-pthread       Do NOT test for nor build with POSIX thread support
@@ -1947,7 +1947,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.11
+alpine configure 2.11.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@ fi
 
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
+# Tests whether TYPE exists after having Included INCLUDES, setting cache
 # variable VAR accordingly.
 ac_fn_c_check_type ()
 {
@@ -2553,7 +2553,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, which was
+It was created by alpine $as_me 2.11.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3374,7 +3374,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.11'
+ VERSION='2.11.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13485,7 +13485,7 @@ if test "${with_dmalloc_dir+set}" = set; then :
   withval=$with_dmalloc_dir;
     if test "x$withval" != "xno" ; then
       enable_dmalloc = "yes"
-      CPPFLAGS="$CPPCFLAGS -I${withval}"
+      CPPFLAGS="$CPPFLAGS -I${withval}"
       LDFLAGS="$LDFLAGS -L${withval}"
     fi
 
@@ -15540,17 +15540,26 @@ 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
       elif test -f /etc/SuSE-release ; then
         alpine_SSLTYPE="nopwd"
-        alpine_SSLDIR="/usr/share/ssl"
-        alpine_SSLCERTS="/etc/ssl/certs"
+        alpine_SSLDIR="/etc/ssl"
+        alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
       elif test -d /etc/osso-af-init ; then
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/usr"
         alpine_SSLCERTS="/usr/share/certs"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+	alpine_SSLLIB="/usr/lib"
       else
         alpine_SSLTYPE="nopwd"
         alpine_SSLDIR="/usr"
@@ -15559,7 +15568,19 @@ else
       ;;
     *-apple-darwin*)
       alpine_SSLTYPE="nopwd"
-      alpine_SSLCERTS="/System/Library/OpenSSL/certs"
+      if test -d /opt/local/etc/openssl ; then
+	alpine_SSLDIR="/opt/local/etc/openssl"
+	alpine_SSLCERTS="$alpine_SSLDIR"
+	alpine_SSLKEYS="$alpine_SSLDIR"
+	alpine_SSLLIB="/usr/lib"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+      elif test -d /System/Library/OpenSSL ; then
+	alpine_SSLDIR="/System/Library/OpenSSL"
+        alpine_SSLCERTS="$alpine_SSLDIR/certs"
+	alpine_SSLKEYS="$alpine_SSLDIR/private"
+	alpine_SSLLIB="/usr/lib"
+	alpine_SSLINCLUDE="/usr/include/openssl"
+      fi
       ;;
     *-openbsd*)
       alpine_SSLTYPE="nopwd"
@@ -15568,7 +15589,7 @@ else
       ;;
     *-sco-sysv* | *-sysv*UnixWare | *-sysv*OpenUNIX)
       alpine_SSLTYPE="sco.nopwd"
-      alpine_SSLDIR=/usr/local/ssl
+      alpine_SSLDIR="/usr/local/ssl"
       ;;
     *-*-solaris*)
       if test -d /usr/sfw/include/openssl ; then
@@ -15585,7 +15606,7 @@ else
       ;;
     *)
       alpine_SSLTYPE="nopwd"
-      alpine_SSLDIR=/usr/local/ssl
+      alpine_SSLDIR="/usr/local/ssl"
       ;;
   esac
 
@@ -15633,7 +15654,7 @@ if test "${with_ssl_lib_dir+set}" = set; then :
 fi
 
     if test -n "$alpine_SSLINCLUDE" ; then
-    CPPCFLAGS="-I$alpine_SSLINCLUDE $CPPFLAGS"
+    CPPFLAGS="-I$alpine_SSLINCLUDE $CPPFLAGS"
   elif test -n "$alpine_SSLDIR" ; then
     CPPFLAGS="-I${alpine_SSLDIR}/include $CPPFLAGS"
   fi
@@ -15819,6 +15840,349 @@ fi
 
 
 
+alpine_PAM="none"
+
+case "$host" in
+  *-linux-gnu*|*-k*bsd*-gnu*)
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    if test -f /etc/fedora-release ; then
+      systype="LFD"
+      alpine_PAM="yes"
+      if test -d /etc/pki/tls ; then
+	alpine_c_client_target="lfd"
+      else
+	alpine_c_client_target="lrh"
+      fi
+    elif test -f /etc/mandrake-release ; then
+      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"
+      if test -d /etc/pki/tls ; then
+	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
+        systype="LN8"
+        alpine_c_client_target="ln8"
+      else
+        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"
+      alpine_c_client_target="lsu"
+      alpine_PAM="yes"
+    else
+      systype="LNX"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+$as_echo_n "checking for pam_start in -lpam... " >&6; }
+if ${ac_cv_lib_pam_pam_start+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpam  $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 pam_start ();
+int
+main ()
+{
+return pam_start ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pam_pam_start=yes
+else
+  ac_cv_lib_pam_pam_start=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_pam_pam_start" >&5
+$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
+if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
+
+          alpine_c_client_target="lnp"
+	  alpine_PAM="yes"
+
+else
+
+	  if test -f /etc/shadow ; then
+	    alpine_c_client_target="slx"
+	  else
+	    alpine_c_client_target="lnx"
+	  fi
+
+fi
+
+    fi
+    ;;
+  *-apple-darwin*)
+    systype="OSX"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    LIBS="$LIBS -framework Carbon -framework ApplicationServices -framework Security"
+    AM_CFLAGS="$AM_CFLAGS -Dbsd"
+
+$as_echo "#define OSX_TARGET 1" >>confdefs.h
+
+    case "$alpine_os_credential_cache" in
+      no)
+	;;
+      *)
+
+$as_echo "#define APPLEKEYCHAIN 1" >>confdefs.h
+
+	;;
+    esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+$as_echo_n "checking for pam_start in -lpam... " >&6; }
+if ${ac_cv_lib_pam_pam_start+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpam  $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 pam_start ();
+int
+main ()
+{
+return pam_start ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pam_pam_start=yes
+else
+  ac_cv_lib_pam_pam_start=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_pam_pam_start" >&5
+$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
+if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
+
+	ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
+if test "x$ac_cv_header_security_pam_appl_h" = xyes; then :
+
+	  alpine_PAM="yes"
+	  alpine_c_client_target="oxs"
+
+else
+  	ac_fn_c_check_header_mongrel "$LINENO" "pam/pam_appl.h" "ac_cv_header_pam_pam_appl_h" "$ac_includes_default"
+if test "x$ac_cv_header_pam_pam_appl_h" = xyes; then :
+
+		   alpine_PAM="yes"
+		   alpine_c_client_target="oxp"
+
+else
+
+		  alpine_PAM="none"
+		  alpine_pam_none_reason="header files not found"
+
+fi
+
+
+
+fi
+
+
+
+else
+
+        alpine_c_client_target="osx"
+
+fi
+
+    ;;
+  *-*-solaris*)
+    if test x$GCC = "xyes" ; then
+      systype="GSO"
+      alpine_c_client_target="gso"
+    else
+      systype="SOC"
+      alpine_c_client_target="soc"
+
+$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+    fi
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+            ;;
+  *-*-sunos4*)
+    systype="SUN"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="s40"
+    ;;
+  *-*-sco3.2v5*)
+    if test x$GCC = "xyes" ; then
+      systype="GO5"
+      alpine_c_client_target="go5"
+    else
+      systype="SC5"
+      alpine_c_client_target="sc5"
+    fi
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+            ;;
+  *-next-*)
+    systype="NXT"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="nx3"
+    ;;
+  *-*-netbsd*)
+    systype="NEB"
+    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"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="bsi"
+    ;;
+  *-*-freebsd*)
+    systype="BSF"
+    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*)
+    systype="BSO"
+    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*)
+    systype="A52"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="a52"
+    ;;
+  *-*-aix4*)
+    systype="A41"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="a41"
+    ;;
+  *-*-aix3*)
+    systype="A32"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="a32"
+    ;;
+  *-*UNIX_SV | *-*-sysv5UnixWare7* | *-*OpenUNIX*)
+    systype="UW2"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="uw2"
+    ;;
+  *-*-osf5*)
+    systype="OSF"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="osf"
+    ;;
+  *-*-cygwin)
+    systype="CYG"
+    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*)
+    systype="WNT"
+    alpine_path_delim="\\"
+    alpine_mode_readonly="(S_IREAD | S_IWRITE)"
+    alpine_c_client_target="wnt"
+
+$as_echo "#define _WINDOWS 1" >>confdefs.h
+
+    ;;
+  *)
+    as_fn_error $? "Unrecognized system: $host" "$LINENO" 5
+    ;;
+esac
+
 
 # Check whether --with-ipv6 was given.
 if test "${with_ipv6+set}" = set; then :
@@ -16449,7 +16813,7 @@ $as_echo "yes" >&6; }
 
 else
 
-		as_fn_error $? "Install openssl version >= 1.0.1c" "$LINENO" 5
+		as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5
 		exit 1
 
 fi
@@ -16597,14 +16961,30 @@ ac_res=$ac_cv_search_pam_start
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-      LIBS="$LIBS -lpam"
-      ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
+	LIBS="$LIBS -lpam"
+	ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
 if test "x$ac_cv_header_security_pam_appl_h" = xyes; then :
 
+	  alpine_PAM="yes"
+
+else
+  	 ac_fn_c_check_header_mongrel "$LINENO" "pam/pam_appl.h" "ac_cv_header_pam_pam_appl_h" "$ac_includes_default"
+if test "x$ac_cv_header_pam_pam_appl_h" = xyes; then :
+
+		alpine_PAM="yes"
+		if test "x$alpine_c_client_target" != "xoxp" ; then
+		   alpine_PAM="none"
+		   alpine_pam_none_reason="header files not in security/ directory"
+		fi
+
 else
 
-	  alpine_PAM="none"
-	  alpine_pam_none_reason="header files not found"
+		alpine_PAM="none"
+		alpine_pam_none_reason="header files not found"
+
+fi
+
+
 
 fi
 
@@ -16617,8 +16997,8 @@ else
 
 fi
 
-  if test -n "$alpine_pam_none_reason" ; then
-    as_fn_error $? "No PAM support: $alpine_pam_none_reason" "$LINENO" 5
+    if test -n "$alpine_pam_none_reason" ; then
+      as_fn_error $? "No PAM support: $alpine_pam_none_reason" "$LINENO" 5
   fi
 fi
 
@@ -16707,6 +17087,9 @@ $as_echo "$as_me: NOT including Kerberos Support: $alpine_gss_none_reason" >&6;}
 fi
 
 if test -n "$WEB_BUILD" ; then
+TCL_VERSIONS_DOT="tcl8.6 tcl8.5 tcl8.4 tcl8.3"
+TCL_VERSIONS_NODOT="`echo ${TCL_VERSIONS_DOT} | ${SED} 's/\.//g'`"
+TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_Eval" >&5
 $as_echo_n "checking for library containing Tcl_Eval... " >&6; }
 if ${ac_cv_search_Tcl_Eval+:} false; then :
@@ -16731,7 +17114,7 @@ return Tcl_Eval ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' $alpine_TCLLIB tcl8.5 tcl8.4 tcl8.3 tcl84 tcl83 tcl; do
+for ac_lib in '' $alpine_TCLLIB ${TCL_VERSIONS}; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16769,8 +17152,8 @@ fi
 
 
     if test -n "$alpine_TCLINC" ; then
-    as_ac_Header=`$as_echo "ac_cv_header_$alpine_TCLINC" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$alpine_TCLINC" "$as_ac_Header" "$ac_includes_default"
+    as_ac_Header=`$as_echo "ac_cv_header_$alpine_TCLINC/tcl.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$alpine_TCLINC/tcl.h" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
 else
@@ -16790,16 +17173,17 @@ if test "x$ac_cv_header_tcl_h" = xyes; then :
 
 else
 
-	for dir in tcl8.5 tcl8.4 tcl8.3 tcl84 tcl83 ; do
-	  as_ac_File=`$as_echo "ac_cv_file_/usr/include/$dir/tcl.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/$dir/tcl.h" >&5
-$as_echo_n "checking for /usr/include/$dir/tcl.h... " >&6; }
+	for base in /usr /usr/local ; do
+	 for dir in ${TCL_VERSIONS} ; do
+	  as_ac_File=`$as_echo "ac_cv_file_$base/include/$dir/tcl.h" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $base/include/$dir/tcl.h" >&5
+$as_echo_n "checking for $base/include/$dir/tcl.h... " >&6; }
 if eval \${$as_ac_File+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/include/$dir/tcl.h"; then
+if test -r "$base/include/$dir/tcl.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -16815,9 +17199,13 @@ if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 fi
 
 	  if test "$found" = "yes" ; then
-	    CPPFLAGS="$CPPFLAGS -I/usr/include/$dir"
+	    CPPFLAGS="$CPPFLAGS -I$base/include/$dir"
 	    break
 	  fi
+	 done
+	 if test "$found" = "yes" ; then
+	    break
+	 fi
 	done
 	if test "$found" != "yes" ; then
 	    WEB_BUILD=
@@ -17707,8 +18095,8 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be Included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be Included... " >&6; }
 if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -18981,277 +19369,6 @@ fi
 
 
 
-case "$host" in
-  *-linux-gnu*|*-k*bsd*-gnu*)
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    if test -f /etc/fedora-release ; then
-      systype="LFD"
-      if test -d /etc/pki/tls ; then
-	alpine_c_client_target="lfd"
-      else
-	alpine_c_client_target="lrh"
-      fi
-    elif test -f /etc/mandrake-release ; then
-      systype="LMD"
-      alpine_c_client_target="lmd"
-    elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then
-      systype="LRH"
-      if test -d /etc/pki/tls ; then
-	alpine_c_client_target="lr5"
-      else
-	alpine_c_client_target="lrh"
-      fi
-    elif test -f /etc/debian_release -o -f /etc/debian_version ; then
-      if test -d /etc/osso-af-init ; then
-        systype="LN8"
-        alpine_c_client_target="ln8"
-      else
-        systype="DEB"
-        alpine_c_client_target="ldb"
-      fi
-    elif test -f /etc/SuSE-release ; then
-      systype="LSU"
-      alpine_c_client_target="lsu"
-    else
-      systype="LNX"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-$as_echo_n "checking for pam_start in -lpam... " >&6; }
-if ${ac_cv_lib_pam_pam_start+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpam  $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 pam_start ();
-int
-main ()
-{
-return pam_start ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pam_pam_start=yes
-else
-  ac_cv_lib_pam_pam_start=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_pam_pam_start" >&5
-$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
-
-          alpine_c_client_target="lnp"
-
-else
-
-	  if test -f /etc/shadow ; then
-	    alpine_c_client_target="slx"
-	  else
-	    alpine_c_client_target="lnx"
-	  fi
-
-fi
-
-    fi
-    ;;
-  *-apple-darwin*)
-    systype="OSX"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    LIBS="$LIBS -framework Carbon -framework ApplicationServices -framework Security"
-    AM_CFLAGS="$AM_CFLAGS -Dbsd"
-
-$as_echo "#define OSX_TARGET 1" >>confdefs.h
-
-    case "$alpine_os_credential_cache" in
-      no)
-	;;
-      *)
-
-$as_echo "#define APPLEKEYCHAIN 1" >>confdefs.h
-
-	;;
-    esac
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-$as_echo_n "checking for pam_start in -lpam... " >&6; }
-if ${ac_cv_lib_pam_pam_start+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpam  $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 pam_start ();
-int
-main ()
-{
-return pam_start ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pam_pam_start=yes
-else
-  ac_cv_lib_pam_pam_start=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_pam_pam_start" >&5
-$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
-
-        alpine_c_client_target="oxp"
-
-else
-
-        alpine_c_client_target="osx"
-
-fi
-
-    ;;
-  *-*-solaris*)
-    if test x$GCC = "xyes" ; then
-      systype="GSO"
-      alpine_c_client_target="gso"
-    else
-      systype="SOC"
-      alpine_c_client_target="soc"
-
-$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-    fi
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-            ;;
-  *-*-sunos4*)
-    systype="SUN"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="s40"
-    ;;
-  *-*-sco3.2v5*)
-    if test x$GCC = "xyes" ; then
-      systype="GO5"
-      alpine_c_client_target="go5"
-    else
-      systype="SC5"
-      alpine_c_client_target="sc5"
-    fi
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-            ;;
-  *-next-*)
-    systype="NXT"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="nx3"
-    ;;
-  *-*-netbsd*)
-    systype="NEB"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="neb"
-    ;;
-  *-*-dragonfly*)
-    systype="DFB"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="neb"
-    ;;
-  *-*-bsdi*)
-    systype="BSI"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="bsi"
-    ;;
-  *-*-freebsd*)
-    systype="BSF"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="bsf"
-    LIBS="$LIBS $LIBINTL"
-    ;;
-  *-*-openbsd*)
-    systype="BSO"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="bso"
-    LIBS="$LIBS $LIBINTL"
-    ;;
-  *-*-aix5*)
-    systype="A52"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="a52"
-    ;;
-  *-*-aix4*)
-    systype="A41"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="a41"
-    ;;
-  *-*-aix3*)
-    systype="A32"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="a32"
-    ;;
-  *-*UNIX_SV | *-*-sysv5UnixWare7* | *-*OpenUNIX*)
-    systype="UW2"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="uw2"
-    ;;
-  *-*-osf5*)
-    systype="OSF"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(0600)"
-    alpine_c_client_target="osf"
-    ;;
-  *-*-cygwin)
-    systype="CYG"
-    alpine_path_delim="/"
-    alpine_mode_readonly="(S_IREAD | S_IWRITE)"
-    alpine_c_client_target="cyg"
-    LIBS="$LIBS $LIBINTL"
-    ;;
-  windows* | *-*-pw32*)
-    systype="WNT"
-    alpine_path_delim="\\"
-    alpine_mode_readonly="(S_IREAD | S_IWRITE)"
-    alpine_c_client_target="wnt"
-
-$as_echo "#define _WINDOWS 1" >>confdefs.h
-
-    ;;
-  *)
-    as_fn_error $? "Unrecognized system: $host" "$LINENO" 5
-    ;;
-esac
-
 if test -n "$alpine_with_local_maildir" ; then
     alpine_local_maildir=$alpine_with_local_maildir
 elif test -d /var/spool/mail ; then
@@ -19346,6 +19463,14 @@ $as_echo "$as_me: * * *   installed.  If you get certificate validation failures
 $as_echo "$as_me: * * *   in Alpine, this might be the reason for them." >&6;}
   fi
 
+  if test -n "$alpine_SSLINCLUDE" ; then
+    c_client_specials="${c_client_specials}SSLINCLUDE=$alpine_SSLINCLUDE "
+  fi
+
+  if test -n "$alpine_SSLLIB" ; then
+    c_client_specials="${c_client_specials}SSLLIB=$alpine_SSLLIB "
+  fi
+
   if test -n "$alpine_SSLDIR" ; then
     c_client_specials="${c_client_specials}SSLDIR=$alpine_SSLDIR "
   fi
@@ -19354,14 +19479,9 @@ $as_echo "$as_me: * * *   in Alpine, this might be the reason for them." >&6;}
     c_client_specials="${c_client_specials}SSLCERTS=$alpine_SSLCERTS "
   fi
 
-  if test -n "$alpine_SSLINCLUDE" ; then
-    c_client_specials="${c_client_specials}SSLINCLUDE=$alpine_SSLINCLUDE "
+  if test -n "$alpine_SSLKEYS" ; then
+      c_client_specials="${c_client_specials}SSLKEYS=$alpine_SSLKEYS "
   fi
-
-  if test -n "$alpine_SSLLIB" ; then
-    c_client_specials="${c_client_specials}SSLLIB=$alpine_SSLLIB "
-  fi
-
 fi
 
 if test "x$alpine_GSSTYPE" != "xnone" ; then
@@ -19972,7 +20092,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, which was
+This file was extended by alpine $as_me 2.11.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20038,7 +20158,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
+alpine config.status 2.11.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"