From dd9bd7bac749b3908a406d78ce02fb7a39ef81c8 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sun, 18 Aug 2013 01:59:52 -0600 Subject: * 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. --- autom4te.cache/output.2 | 2018 +++++++++++++++++++++++++---------------------- 1 file changed, 1090 insertions(+), 928 deletions(-) (limited to 'autom4te.cache/output.2') diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2 index 15517e06..32716030 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. @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for alpine 2.10.9999. +@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.2. @%:@ @%:@ Report bugs to . @%:@ @@ -730,8 +730,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='alpine' PACKAGE_TARNAME='alpine' -PACKAGE_VERSION='2.10.9999' -PACKAGE_STRING='alpine 2.10.9999' +PACKAGE_VERSION='2.11.2' +PACKAGE_STRING='alpine 2.11.2' PACKAGE_BUGREPORT='chappa@washington.edu' PACKAGE_URL='' @@ -791,6 +791,10 @@ C_CLIENT_LDFLAGS C_CLIENT_CFLAGS C_CLIENT_WITH_IPV6 C_CLIENT_TARGET +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +acx_pthread_config alpine_interactive_spellcheck ISPELLPROG alpine_simple_spellcheck @@ -805,7 +809,6 @@ INTLLIBS LTLIBICONV LIBICONV INTL_MACOSX_LIBS -XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 XGETTEXT @@ -813,7 +816,6 @@ GMSGFMT_015 MSGFMT_015 GMSGFMT MSGFMT -GETTEXT_MACRO_VERSION USE_NLS MAKE LN @@ -906,8 +908,8 @@ dvidir htmldir infodir docdir -oldincludedir -includedir +oldIncludedir +Includedir localstatedir sharedstatedir sysconfdir @@ -1089,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}' @@ -1229,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 ;; @@ -1282,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 ;; @@ -1476,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 @@ -1591,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.10.9999 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]... @@ -1603,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] @@ -1632,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] @@ -1661,7 +1663,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alpine 2.10.9999:";; + short | recursive ) echo "Configuration of alpine 2.11.2:";; esac cat <<\_ACEOF @@ -1858,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 @@ -1945,7 +1947,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alpine configure 2.10.9999 +alpine configure 2.11.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2313,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 () { @@ -2551,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.10.9999, 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 $@ @@ -3372,7 +3374,7 @@ fi # Define the identity of the package. PACKAGE='alpine' - VERSION='2.10.9999' + VERSION='2.11.2' cat >>confdefs.h <<_ACEOF @@ -11764,9 +11766,6 @@ $as_echo "$USE_NLS" >&6; } - GETTEXT_MACRO_VERSION=0.18 - - # Prepare PATH_SEPARATOR. @@ -12042,9 +12041,6 @@ fi test -n "$localedir" || localedir='${datadir}/locale' - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= - - ac_config_commands="$ac_config_commands po-directories" @@ -12104,7 +12100,7 @@ $as_echo_n "checking for ld used by GCC... " >&6; } # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -12138,9 +12134,9 @@ else # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -12195,14 +12191,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" @%:@ Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : @@ -12212,67 +12206,23 @@ fi - - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 -$as_echo_n "checking for 64-bit host... " >&6; } -if ${gl_cv_solaris_64bit+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef _LP64 -sixtyfour bits -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "sixtyfour bits" >/dev/null 2>&1; then : - gl_cv_solaris_64bit=yes -else - gl_cv_solaris_64bit=no -fi -rm -f conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 -$as_echo "$gl_cv_solaris_64bit" >&6; } - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + acl_libdirstem=lib + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; esac fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + done + IFS="$acl_save_IFS" + fi @@ -12281,10 +12231,6 @@ $as_echo "$gl_cv_solaris_64bit" >&6; } - - - - use_additional=yes acl_save_prefix="$prefix" @@ -12321,10 +12267,6 @@ if test "${with_libiconv_prefix+set}" = set; then : else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi fi fi @@ -12333,8 +12275,6 @@ fi LIBICONV= LTLIBICONV= INCICONV= - LIBICONV_PREFIX= - HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -12368,50 +12308,27 @@ fi found_la= found_so= found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" + if test -n "$shlibext" \ + && { test -f "$additional_libdir/lib$name.$shlibext" \ + || { test "$shlibext" = dll \ + && test -f "$additional_libdir/lib$name.dll.a"; }; }; then + found_dir="$additional_libdir" + if test -f "$additional_libdir/lib$name.$shlibext"; then + found_so="$additional_libdir/lib$name.$shlibext" else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi + found_so="$additional_libdir/lib$name.dll.a" fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi fi fi fi @@ -12429,42 +12346,26 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" + if test -n "$shlibext" \ + && { test -f "$dir/lib$name.$shlibext" \ + || { test "$shlibext" = dll \ + && test -f "$dir/lib$name.dll.a"; }; }; then + found_dir="$dir" + if test -f "$dir/lib$name.$shlibext"; then + found_so="$dir/lib$name.$shlibext" else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi + found_so="$dir/lib$name.dll.a" fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi fi fi ;; @@ -12477,9 +12378,7 @@ fi if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -12492,10 +12391,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$acl_hardcode_direct" = yes; then + if test "$hardcode_direct" = yes; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" haveit= for x in $rpathdirs; do @@ -12527,7 +12426,7 @@ fi if test -z "$haveit"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" fi - if test "$acl_hardcode_minus_L" != no; then + if test "$hardcode_minus_L" != no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" @@ -12546,16 +12445,6 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = 'iconv'; then - LIBICONV_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = 'iconv'; then - LIBICONV_PREFIX="$basedir" - fi additional_includedir="$basedir/include" ;; esac @@ -12604,11 +12493,9 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -12708,21 +12595,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then + if test -n "$hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" + eval flag=\"$hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" + eval flag=\"$hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done @@ -12733,11 +12620,6 @@ fi LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" done fi - - - - - @@ -12748,7 +12630,6 @@ fi - @@ -12909,7 +12790,7 @@ $as_echo "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - + am_save_CPPFLAGS="$CPPFLAGS" @@ -12994,123 +12875,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -$as_echo_n "checking for working iconv... " >&6; } -if ${am_cv_func_iconv_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - if test "$cross_compiling" = yes; then : - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -int main () -{ - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } - /* Test against Solaris 10 bug: Failures are not distinguishable from - successful returns. */ - { - iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); - if (cd_ascii_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\263"; - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - return 1; - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - am_cv_func_iconv_works=yes -else - am_cv_func_iconv_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LIBS="$am_save_LIBS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -$as_echo "$am_cv_func_iconv_works" >&6; } - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then $as_echo "@%:@define HAVE_ICONV 1" >>confdefs.h @@ -13132,10 +12896,6 @@ $as_echo "$LIBICONV" >&6; } - - - - use_additional=yes acl_save_prefix="$prefix" @@ -13172,10 +12932,6 @@ if test "${with_libintl_prefix+set}" = set; then : else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi fi fi @@ -13184,8 +12940,6 @@ fi LIBINTL= LTLIBINTL= INCINTL= - LIBINTL_PREFIX= - HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -13219,50 +12973,27 @@ fi found_la= found_so= found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" + if test -n "$shlibext" \ + && { test -f "$additional_libdir/lib$name.$shlibext" \ + || { test "$shlibext" = dll \ + && test -f "$additional_libdir/lib$name.dll.a"; }; }; then + found_dir="$additional_libdir" + if test -f "$additional_libdir/lib$name.$shlibext"; then + found_so="$additional_libdir/lib$name.$shlibext" else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi + found_so="$additional_libdir/lib$name.dll.a" fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi fi fi fi @@ -13280,42 +13011,26 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" + if test -n "$shlibext" \ + && { test -f "$dir/lib$name.$shlibext" \ + || { test "$shlibext" = dll \ + && test -f "$dir/lib$name.dll.a"; }; }; then + found_dir="$dir" + if test -f "$dir/lib$name.$shlibext"; then + found_so="$dir/lib$name.$shlibext" else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi + found_so="$dir/lib$name.dll.a" fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi fi fi ;; @@ -13328,9 +13043,7 @@ fi if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -13343,10 +13056,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$acl_hardcode_direct" = yes; then + if test "$hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" haveit= for x in $rpathdirs; do @@ -13378,7 +13091,7 @@ fi if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$acl_hardcode_minus_L" != no; then + if test "$hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -13397,16 +13110,6 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = 'intl'; then - LIBINTL_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = 'intl'; then - LIBINTL_PREFIX="$basedir" - fi additional_includedir="$basedir/include" ;; esac @@ -13455,11 +13158,9 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -13559,21 +13260,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then + if test -n "$hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" + eval flag=\"$hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" + eval flag=\"$hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done @@ -13584,11 +13285,6 @@ fi LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" done fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } @@ -13789,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 @@ -15844,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" @@ -15863,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" @@ -15872,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 @@ -15889,7 +15606,7 @@ else ;; *) alpine_SSLTYPE="nopwd" - alpine_SSLDIR=/usr/local/ssl + alpine_SSLDIR="/usr/local/ssl" ;; esac @@ -15937,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 @@ -16123,39 +15840,69 @@ fi +alpine_PAM="none" -@%:@ Check whether --with-ipv6 was given. -if test "${with_ipv6+set}" = set; then : - withval=$with_ipv6; with_ipv6=$withval -fi - - -if test "x$with_ipv6" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Excluding IPv6 Support" >&5 -$as_echo "$as_me: Excluding IPv6 Support" >&6;} - c_client_specials="${c_client_specials}IP6=4 " - c_client_ip6="true" -else - c_client_ip6="touch imap/ip6" -fi - - - -if test x$enable_dmalloc = "xyes" ; then - if test "x$with_pthread" = "xyes" ; then - dmalloc_lib=dmallocth - else - dmalloc_lib=dmalloc - fi - - as_ac_Lib=`$as_echo "ac_cv_lib_$dmalloc_lib''_dmalloc_shutdown" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -l$dmalloc_lib" >&5 -$as_echo_n "checking for dmalloc_shutdown in -l$dmalloc_lib... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +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="-l$dmalloc_lib $LIBS" +LIBS="-lpam $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16165,41 +15912,354 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char dmalloc_shutdown (); +char pam_start (); int main () { -return dmalloc_shutdown (); +return pam_start (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pam_pam_start=yes else - eval "$as_ac_Lib=no" + 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 -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -@%:@define `$as_echo "HAVE_LIB$dmalloc_lib" | $as_tr_cpp` 1 -_ACEOF - - LIBS="-l$dmalloc_lib $LIBS" - +{ $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 - as_fn_error but -ldmalloc not found "$dmalloc_lib requested" "$LINENO" 5 - + if test -f /etc/shadow ; then + alpine_c_client_target="slx" + else + alpine_c_client_target="lnx" + fi + 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 : + withval=$with_ipv6; with_ipv6=$withval +fi + + +if test "x$with_ipv6" = "xno" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Excluding IPv6 Support" >&5 +$as_echo "$as_me: Excluding IPv6 Support" >&6;} + c_client_specials="${c_client_specials}IP6=4 " + c_client_ip6="true" +else + c_client_ip6="touch imap/ip6" +fi + + + +if test x$enable_dmalloc = "xyes" ; then + if test "x$with_pthread" = "xyes" ; then + dmalloc_lib=dmallocth + else + dmalloc_lib=dmalloc + fi + + as_ac_Lib=`$as_echo "ac_cv_lib_$dmalloc_lib''_dmalloc_shutdown" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -l$dmalloc_lib" >&5 +$as_echo_n "checking for dmalloc_shutdown in -l$dmalloc_lib... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$dmalloc_lib $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 dmalloc_shutdown (); +int +main () +{ +return dmalloc_shutdown (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +@%:@define `$as_echo "HAVE_LIB$dmalloc_lib" | $as_tr_cpp` 1 +_ACEOF + + LIBS="-l$dmalloc_lib $LIBS" + +else + + as_fn_error but -ldmalloc not found "$dmalloc_lib requested" "$LINENO" 5 + +fi + +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -ltinfo" >&5 $as_echo_n "checking for setupterm in -ltinfo... " >&6; } @@ -16723,8 +16783,8 @@ if test "$ac_res" != no; then : LIBS="$LIBS -lssl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0" >&5 -$as_echo_n "checking Openssl library version >= 1.0... " >&6; } + { $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 @@ -16739,7 +16799,7 @@ else #include int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x10000000) + if (OPENSSL_VERSION_NUMBER >= 0x1000003f) exit(0); exit(2); @@ -16753,7 +16813,7 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Install openssl version >= 1.0" "$LINENO" 5 + as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5 exit 1 fi @@ -16901,28 +16961,44 @@ 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="none" - alpine_pam_none_reason="header files not found" + 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" + +fi + + fi - + else alpine_PAM="none" alpine_pam_none_reason="library files not found" - + 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 @@ -17011,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 : @@ -17035,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 @@ -17073,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 @@ -17094,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" @@ -17119,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= @@ -17176,76 +17260,422 @@ rm -f core conftest.err conftest.$ac_objext \ break fi done -if ${ac_cv_search_regcomp+:} false; then : - -else - ac_cv_search_regcomp=no +if ${ac_cv_search_regcomp+:} false; then : + +else + ac_cv_search_regcomp=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5 +$as_echo "$ac_cv_search_regcomp" >&6; } +ac_res=$ac_cv_search_regcomp +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + + if test x$alpine_REGEX = "xno" ; then + as_fn_error $? "Unable to find system regex library" "$LINENO" 5 + else + alpine_REGEX=yes + fi + +fi + +fi +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 : + +else + + if test x$alpine_REGEX = "xno" ; then + as_fn_error $? "Unable to find system regex include file" "$LINENO" 5 + else + alpine_REGEX=yes + fi + +fi + + +fi + +$as_echo "@%:@define HAVE_REGEX_H 1" >>confdefs.h + +if test x$alpine_REGEX = "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex" + LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex" + REGEX_BUILD=regex +fi + +if test "x$with_pthread" != "xno" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread support" >&5 +$as_echo_n "checking for pthread support... " >&6; } + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + 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 pthread_join (); +int +main () +{ +return pthread_join (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + acx_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } + ;; + + -*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_acx_pthread_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$acx_pthread_config"; then + ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_acx_pthread_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" +fi +fi +acx_pthread_config=$ac_cv_prog_acx_pthread_config +if test -n "$acx_pthread_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 +$as_echo "$acx_pthread_config" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + acx_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int attr=$attr; return attr; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + attr_name=$attr; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +$as_echo "$attr_name" >&6; } + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + +cat >>confdefs.h <<_ACEOF +@%:@define PTHREAD_CREATE_JOINABLE $attr_name +_ACEOF + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + for ac_prog in xlc_r cc_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PTHREAD_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PTHREAD_CC"; then + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PTHREAD_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5 -$as_echo "$ac_cv_search_regcomp" >&6; } -ac_res=$ac_cv_search_regcomp -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else - - if test x$alpine_REGEX = "xno" ; then - as_fn_error $? "Unable to find system regex library" "$LINENO" 5 - else - alpine_REGEX=yes - fi - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -fi -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 : - + + test -n "$PTHREAD_CC" && break +done +test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" + + else + PTHREAD_CC=$CC + fi else - - if test x$alpine_REGEX = "xno" ; then - as_fn_error $? "Unable to find system regex include file" "$LINENO" 5 - else - alpine_REGEX=yes - fi - + PTHREAD_CC="$CC" fi -fi -$as_echo "@%:@define HAVE_REGEX_H 1" >>confdefs.h -if test x$alpine_REGEX = "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex" - LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex" - REGEX_BUILD=regex -fi -if test "x$with_pthread" != "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread support" >&5 -$as_echo_n "checking for pthread support... " >&6; } - ACX_PTHREAD( - - AC_MSG_RESULT([yes]) +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } case "$target" in *openbsd*) - AC_MSG_NOTICE([WARNING: pthread support on OpenBSD is unstable!]) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pthread support on OpenBSD is unstable!" >&5 +$as_echo "$as_me: WARNING: pthread support on OpenBSD is unstable!" >&6;} AM_CFLAGS="$AM_CFLAGS -pthread" ;; esac LIBS="$PTHREAD_LIBS $LIBS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" CC="$PTHREAD_CC" - AC_DEFINE([HAVE_PTHREAD], [1], [System has pthread support]) - , + +$as_echo "@%:@define HAVE_PTHREAD 1" >>confdefs.h + - AC_MSG_RESULT([no]) - ) + : +else + acx_pthread_ok=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 $as_echo_n "checking for library containing nanosleep... " >&6; } @@ -17665,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 @@ -18828,228 +19258,61 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_bind" >&5 -$as_echo "$ac_cv_search_bind" >&6; } -ac_res=$ac_cv_search_bind -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -else - - WEB_BUILD= - -fi - - -for ac_func in sigaction sigemptyset sigaddset sigprocmask -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - - -$as_echo "@%:@define POSIX_SIGNALS /**/" >>confdefs.h - - -else - - for ac_func in sigset sigrelse -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - - -$as_echo "@%:@define SYSV_SIGNALS /**/" >>confdefs.h - - -fi -done - - -fi -done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing syslog" >&5 -$as_echo_n "checking for library containing syslog... " >&6; } -if ${ac_cv_search_syslog+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char syslog (); -int -main () -{ -return syslog (); - ; - return 0; -} -_ACEOF -for ac_lib in '' bsd socket inet; 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_syslog=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_syslog+:} false; then : - break -fi -done -if ${ac_cv_search_syslog+:} false; then : - -else - ac_cv_search_syslog=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_syslog" >&5 -$as_echo "$ac_cv_search_syslog" >&6; } -ac_res=$ac_cv_search_syslog -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - -$as_echo "@%:@define HAVE_SYSLOG 1" >>confdefs.h - - -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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_bind" >&5 +$as_echo "$ac_cv_search_bind" >&6; } +ac_res=$ac_cv_search_bind +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - alpine_c_client_target="lnp" - else - if test -f /etc/shadow ; then - alpine_c_client_target="slx" - else - alpine_c_client_target="lnx" - fi - + WEB_BUILD= + 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) - ;; - *) +for ac_func in sigaction sigemptyset sigaddset sigprocmask +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + + +$as_echo "@%:@define POSIX_SIGNALS /**/" >>confdefs.h + + +else + + for ac_func in sigset sigrelse +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + -$as_echo "@%:@define APPLEKEYCHAIN 1" >>confdefs.h +$as_echo "@%:@define SYSV_SIGNALS /**/" >>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 : + +fi +done + + +fi +done + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing syslog" >&5 +$as_echo_n "checking for library containing syslog... " >&6; } +if ${ac_cv_search_syslog+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpam $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19059,156 +19322,52 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char pam_start (); +char syslog (); int main () { -return pam_start (); +return syslog (); ; 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 +for ac_lib in '' bsd socket inet; 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_syslog=$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_syslog+:} false; then : + break 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 : +done +if ${ac_cv_search_syslog+:} false; then : - alpine_c_client_target="oxp" - else - - alpine_c_client_target="osx" - + ac_cv_search_syslog=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_syslog" >&5 +$as_echo "$ac_cv_search_syslog" >&6; } +ac_res=$ac_cv_search_syslog +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + +$as_echo "@%:@define HAVE_SYSLOG 1" >>confdefs.h - ;; - *-*-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 - 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 @@ -19304,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 @@ -19312,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 " - fi - - if test -n "$alpine_SSLLIB" ; then - c_client_specials="${c_client_specials}SSLLIB=$alpine_SSLLIB " + if test -n "$alpine_SSLKEYS" ; then + c_client_specials="${c_client_specials}SSLKEYS=$alpine_SSLKEYS " fi - fi if test "x$alpine_GSSTYPE" != "xnone" ; then @@ -19930,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.10.9999, 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 @@ -19996,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.10.9999 +alpine config.status 2.11.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3-70-g09d2