From 1de2a1f9a4cc3b9496e836f9487c721526b4add1 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Thu, 12 Sep 2013 00:40:26 -0600 Subject: * Save command did not warn of existence of a message with a deleted attachment in an aggregate save, unless cursor was positioned on a message with a deleted attachment. Reported by Florian Herzig. * Rewrite of configure script: ldap is checked for after ssl, which is checked after crypto, which is checked for after dl library. Set defaults for include and lib directories based on SSLDIR. Joint work with Florian Herzig. * Update contact information (remove alpine-contact@u.washington.edu and add chappa@gmx.com) --- configure | 526 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 296 insertions(+), 230 deletions(-) (limited to 'configure') diff --git a/configure b/configure index a9e426a2..68588a18 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Rev:2 by chappa@washington.edu. +# From configure.ac Rev:3 by chappa@washington.edu. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for alpine 2.11.4. +# Generated by GNU Autoconf 2.69 for alpine 2.11.5. # # Report bugs to . # @@ -730,8 +730,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='alpine' PACKAGE_TARNAME='alpine' -PACKAGE_VERSION='2.11.4' -PACKAGE_STRING='alpine 2.11.4' +PACKAGE_VERSION='2.11.5' +PACKAGE_STRING='alpine 2.11.5' PACKAGE_BUGREPORT='chappa@washington.edu' PACKAGE_URL='' @@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures alpine 2.11.4 to adapt to many kinds of systems. +\`configure' configures alpine 2.11.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1664,7 +1664,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alpine 2.11.4:";; + short | recursive ) echo "Configuration of alpine 2.11.5:";; esac cat <<\_ACEOF @@ -1948,7 +1948,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alpine configure 2.11.4 +alpine configure 2.11.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alpine $as_me 2.11.4, which was +It was created by alpine $as_me 2.11.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3375,7 +3375,7 @@ fi # Define the identity of the package. PACKAGE='alpine' - VERSION='2.11.4' + VERSION='2.11.5' cat >>confdefs.h <<_ACEOF @@ -15542,13 +15542,19 @@ else alpine_SSLTYPE="nopwd" if test -d /etc/pki/tls ; then alpine_SSLDIR="/etc/pki/tls" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" else alpine_SSLDIR="/usr/share/ssl" fi + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + elif test -f /etc/mandrake-release ; then + alpine_SSLDIR="/usr/lib/ssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" elif test -f /etc/SuSE-release ; then alpine_SSLTYPE="nopwd" alpine_SSLDIR="/etc/ssl" @@ -15562,6 +15568,14 @@ else alpine_SSLCERTS="/usr/share/certs" alpine_SSLINCLUDE="/usr/include/openssl" alpine_SSLLIB="/usr/lib" + elif test -f /etc/debian_release -o -f /etc/debian_version ; then + if test !-d /etc/osso-af-init ; then + alpine_SSLDIR="/etc/ssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + fi else alpine_SSLTYPE="nopwd" alpine_SSLDIR="/usr" @@ -15584,14 +15598,49 @@ else alpine_SSLINCLUDE="/usr/include/openssl" fi ;; + *-*-netbsd*) + alpine_SSLDIR="/etc/openssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + ;; + *-*-dragonfly*) + alpine_SSLDIR="/etc/openssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + ;; *-openbsd*) - alpine_SSLTYPE="nopwd" - alpine_SSLDIR="/usr" - alpine_SSLCERTS="/etc/ssl/certs" + alpine_SSLTYPE="nopwd" + alpine_SSLDIR="/usr" + alpine_SSLCERTS="/etc/ssl/certs" + ;; + *-*-freebsd*) + alpine_SSLDIR="/etc/ssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + ;; + *-*-openbsd*) + alpine_SSLDIR="/etc/ssl" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" + alpine_SSLCERTS="/etc/ssl" + alpine_SSLKEYS="/etc/ssl/private" + ;; + *-*-cygwin) + alpine_SSLDIR="/usr/ssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/certs" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" ;; *-sco-sysv* | *-sysv*UnixWare | *-sysv*OpenUNIX) - alpine_SSLTYPE="sco.nopwd" - alpine_SSLDIR="/usr/local/ssl" + alpine_SSLTYPE="sco.nopwd" + alpine_SSLDIR="/usr/local/ssl" ;; *-*-solaris*) if test -d /usr/sfw/include/openssl ; then @@ -15618,6 +15667,8 @@ if test "${with_ssl_dir+set}" = set; then : withval=$with_ssl_dir; if test "x$withval" != "xno" ; then alpine_SSLDIR=$withval + alpine_SSLINCLUDE=$alpine_SSLDIR/include + alpine_SSLLIB=$alpine_SSLDIR/lib fi fi @@ -15860,11 +15911,6 @@ case "$host" in systype="LMD" alpine_c_client_target="lmd" alpine_PAM="yes" - alpine_SSLDIR="/usr/lib/ssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" elif test -f /etc/redhat-release -o -f /etc/redhat_version ; then systype="LRH" alpine_PAM="yes" @@ -15872,11 +15918,6 @@ case "$host" in alpine_c_client_target="lr5" else alpine_c_client_target="lrh" - alpine_SSLDIR="/usr/share/ssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" fi elif test -f /etc/debian_release -o -f /etc/debian_version ; then if test -d /etc/osso-af-init ; then @@ -15886,11 +15927,6 @@ case "$host" in systype="DEB" alpine_c_client_target="ldb" alpine_PAM="yes" - alpine_SSLDIR="/etc/ssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" fi elif test -f /etc/SuSE-release ; then systype="LSU" @@ -16082,22 +16118,12 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h alpine_path_delim="/" alpine_mode_readonly="(0600)" alpine_c_client_target="neb" - alpine_SSLDIR="/etc/openssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" ;; *-*-dragonfly*) systype="DFB" alpine_path_delim="/" alpine_mode_readonly="(0600)" alpine_c_client_target="neb" - alpine_SSLDIR="/etc/openssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" ;; *-*-bsdi*) systype="BSI" @@ -16110,11 +16136,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h alpine_path_delim="/" alpine_mode_readonly="(0600)" alpine_c_client_target="bsf" - alpine_SSLDIR="/etc/ssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/private" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" LIBS="$LIBS $LIBINTL" ;; *-*-openbsd*) @@ -16122,11 +16143,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h alpine_path_delim="/" alpine_mode_readonly="(0600)" alpine_c_client_target="bso" - alpine_SSLDIR="/etc/ssl" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" - alpine_SSLCERTS="/etc/ssl" - alpine_SSLKEYS="/etc/ssl/private" LIBS="$LIBS $LIBINTL" ;; *-*-aix5*) @@ -16164,11 +16180,6 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h alpine_path_delim="/" alpine_mode_readonly="(S_IREAD | S_IWRITE)" alpine_c_client_target="cyg" - alpine_SSLDIR="/usr/ssl" - alpine_SSLCERTS="$alpine_SSLDIR/certs" - alpine_SSLKEYS="$alpine_SSLDIR/certs" - alpine_SSLINCLUDE="/usr/include/openssl" - alpine_SSLLIB="/usr/lib" LIBS="$LIBS $LIBINTL" ;; windows* | *-*-pw32*) @@ -16507,15 +16518,12 @@ $as_echo "#define HAS_TERMCAP 1" >>confdefs.h ;; esac -if test "$alpine_with_ldap" = "yes" ; then - alpine_has_ldap= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5 -$as_echo_n "checking for ber_alloc in -llber... " >&6; } -if ${ac_cv_lib_lber_ber_alloc+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llber $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16525,35 +16533,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ber_alloc (); +char dlopen (); int main () { -return ber_alloc (); +return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lber_ber_alloc=yes -else - ac_cv_lib_lber_ber_alloc=no +for ac_lib in '' dl dld; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5 -$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; } -if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then : +done +if ${ac_cv_search_dlopen+:} false; then : - LIBS="$LIBS -llber" +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +else + alpine_DL="none" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5 -$as_echo_n "checking for library containing ldap_init... " >&6; } -if ${ac_cv_search_ldap_init+:} false; then : +if test "x$alpine_DL" = "xnone" ; then + as_fn_error $? "No library containing dlopen found" "$LINENO" 5 + exit 1 +fi + +if test "x$alpine_SSLTYPE" != "xnone" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5 +$as_echo_n "checking for library containing SSLeay... " >&6; } +if ${ac_cv_search_SSLeay+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -16566,16 +16597,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ldap_init (); +char SSLeay (); int main () { -return ldap_init (); +return SSLeay (); ; return 0; } _ACEOF -for ac_lib in '' ldap; do +for ac_lib in '' crypto; do if test -z "$ac_lib"; then ac_res="none required" else @@ -16583,35 +16614,42 @@ for ac_lib in '' ldap; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ldap_init=$ac_res + ac_cv_search_SSLeay=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_ldap_init+:} false; then : + if ${ac_cv_search_SSLeay+:} false; then : break fi done -if ${ac_cv_search_ldap_init+:} false; then : +if ${ac_cv_search_SSLeay+:} false; then : else - ac_cv_search_ldap_init=no + ac_cv_search_SSLeay=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5 -$as_echo "$ac_cv_search_ldap_init" >&6; } -ac_res=$ac_cv_search_ldap_init +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5 +$as_echo "$ac_cv_search_SSLeay" >&6; } +ac_res=$ac_cv_search_SSLeay if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - alpine_has_ldap=yes - else + alpine_CRYPTO="none" +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5 -$as_echo_n "checking for library containing ldap_open... " >&6; } -if ${ac_cv_search_ldap_open+:} false; then : + if test "x$alpine_CRYPTO" = "xnone" ; then + as_fn_error $? "crypto library NOT found" "$LINENO" 5 + exit 1 + fi +fi + +if test "x$alpine_SSLTYPE" != "xnone" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5 +$as_echo_n "checking for library containing SSL_library_init... " >&6; } +if ${ac_cv_search_SSL_library_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -16624,16 +16662,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ldap_open (); +char SSL_library_init (); int main () { -return ldap_open (); +return SSL_library_init (); ; return 0; } _ACEOF -for ac_lib in '' ldap; do +for ac_lib in '' ssl; do if test -z "$ac_lib"; then ac_res="none required" else @@ -16641,61 +16679,55 @@ for ac_lib in '' ldap; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ldap_open=$ac_res + ac_cv_search_SSL_library_init=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_ldap_open+:} false; then : + if ${ac_cv_search_SSL_library_init+:} false; then : break fi done -if ${ac_cv_search_ldap_open+:} false; then : +if ${ac_cv_search_SSL_library_init+:} false; then : else - ac_cv_search_ldap_open=no + ac_cv_search_SSL_library_init=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5 -$as_echo "$ac_cv_search_ldap_open" >&6; } -ac_res=$ac_cv_search_ldap_open +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5 +$as_echo "$ac_cv_search_SSL_library_init" >&6; } +ac_res=$ac_cv_search_SSL_library_init if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - alpine_has_ldap=yes - -fi - - +else + alpine_SSLTYPE="none" fi - if test "$alpine_has_ldap" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5 -$as_echo "$as_me: Including LDAP Support" >&6;} - -$as_echo "#define ENABLE_LDAP /**/" >>confdefs.h - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5 -$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; } - if test "$cross_compiling" = yes; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 -$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;} - + if test "x$alpine_SSLTYPE" = "xnone" ; then + as_fn_error $? "No library containing SSL_library_init found in your path" "$LINENO" 5 + exit 1 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5 +$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; } + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#include -#include +#include +#include int main(void) { - if (LDAP_VENDOR_VERSION >= 20300) + if (OPENSSL_VERSION_NUMBER >= 0x1000003f) exit(0); exit(2); @@ -16703,35 +16735,69 @@ int main(void) { _ACEOF if ac_fn_c_try_run "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - -$as_echo "#define LDAP_DEPRECATED 1" >>confdefs.h +else + alpine_SSLTYPE="none" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + if test "x$alpine_SSLTYPE" = "xnone" ; then + as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5 + exit 1 + fi +fi +if test "$alpine_with_ldap" = "yes" ; then + alpine_has_ldap= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_alloc in -llber" >&5 +$as_echo_n "checking for ber_alloc in -llber... " >&6; } +if ${ac_cv_lib_lber_ber_alloc+:} false; then : + $as_echo_n "(cached) " >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llber $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ber_alloc (); +int +main () +{ +return ber_alloc (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lber_ber_alloc=yes +else + ac_cv_lib_lber_ber_alloc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_alloc" >&5 +$as_echo "$ac_cv_lib_lber_ber_alloc" >&6; } +if test "x$ac_cv_lib_lber_ber_alloc" = xyes; then : + LIBS="$LIBS -llber" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions! Excluding LDAP support." >&5 -$as_echo "$as_me: Cannot find LDAP functions! Excluding LDAP support." >&6;} - fi fi -if test "x$alpine_SSLTYPE" != "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5 -$as_echo_n "checking for library containing SSL_library_init... " >&6; } -if ${ac_cv_search_SSL_library_init+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5 +$as_echo_n "checking for library containing ldap_init... " >&6; } +if ${ac_cv_search_ldap_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -16744,16 +16810,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char SSL_library_init (); +char ldap_init (); int main () { -return SSL_library_init (); +return ldap_init (); ; return 0; } _ACEOF -for ac_lib in '' ssl; do +for ac_lib in '' ldap; do if test -z "$ac_lib"; then ac_res="none required" else @@ -16761,86 +16827,35 @@ for ac_lib in '' ssl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_SSL_library_init=$ac_res + ac_cv_search_ldap_init=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_SSL_library_init+:} false; then : + if ${ac_cv_search_ldap_init+:} false; then : break fi done -if ${ac_cv_search_SSL_library_init+:} false; then : +if ${ac_cv_search_ldap_init+:} false; then : else - ac_cv_search_SSL_library_init=no + ac_cv_search_ldap_init=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5 -$as_echo "$ac_cv_search_SSL_library_init" >&6; } -ac_res=$ac_cv_search_SSL_library_init +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_init" >&5 +$as_echo "$ac_cv_search_ldap_init" >&6; } +ac_res=$ac_cv_search_ldap_init if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LIBS="$LIBS -lssl" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5 -$as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; } - if test "$cross_compiling" = yes; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 -$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;} - - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -int main(void) { - - if (OPENSSL_VERSION_NUMBER >= 0x1000003f) - exit(0); - - exit(2); -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -else - - as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5 - exit 1 - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - + alpine_has_ldap=yes else - alpine_SSLTYPE="none" -fi - - if test "x$alpine_SSLTYPE" = "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries NOT found" >&5 -$as_echo "$as_me: OpenSSL libraries NOT found" >&6;} - else - { $as_echo "$as_me:${as_lineno-$LINENO}: OpenSSL libraries FOUND" >&5 -$as_echo "$as_me: OpenSSL libraries FOUND" >&6;} - fi -fi -if test "x$alpine_SSLTYPE" != "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSLeay" >&5 -$as_echo_n "checking for library containing SSLeay... " >&6; } -if ${ac_cv_search_SSLeay+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_open" >&5 +$as_echo_n "checking for library containing ldap_open... " >&6; } +if ${ac_cv_search_ldap_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -16853,16 +16868,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char SSLeay (); +char ldap_open (); int main () { -return SSLeay (); +return ldap_open (); ; return 0; } _ACEOF -for ac_lib in '' crypto; do +for ac_lib in '' ldap; do if test -z "$ac_lib"; then ac_res="none required" else @@ -16870,41 +16885,90 @@ for ac_lib in '' crypto; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_SSLeay=$ac_res + ac_cv_search_ldap_open=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_SSLeay+:} false; then : + if ${ac_cv_search_ldap_open+:} false; then : break fi done -if ${ac_cv_search_SSLeay+:} false; then : +if ${ac_cv_search_ldap_open+:} false; then : else - ac_cv_search_SSLeay=no + ac_cv_search_ldap_open=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSLeay" >&5 -$as_echo "$ac_cv_search_SSLeay" >&6; } -ac_res=$ac_cv_search_SSLeay +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_open" >&5 +$as_echo "$ac_cv_search_ldap_open" >&6; } +ac_res=$ac_cv_search_ldap_open if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LIBS="$LIBS -lcrypto" + alpine_has_ldap=yes + +fi + + +fi + + + if test "$alpine_has_ldap" = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Including LDAP Support" >&5 +$as_echo "$as_me: Including LDAP Support" >&6;} + +$as_echo "#define ENABLE_LDAP /**/" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should define LDAP_DEPRECATED" >&5 +$as_echo_n "checking if we should define LDAP_DEPRECATED... " >&6; } + if test "$cross_compiling" = yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 +$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;} + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +int main(void) { + + if (LDAP_VENDOR_VERSION >= 20300) + exit(0); + + exit(2); +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define LDAP_DEPRECATED 1" >>confdefs.h + + else - alpine_CRYPTO = "none" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - if test "x$alpine_CRYPTO" = "xnone" ; then - as_fn_error $? "crypto library NOT found" "$LINENO" 5 + else - { $as_echo "$as_me:${as_lineno-$LINENO}: crypto library found" >&5 -$as_echo "$as_me: crypto library found" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find LDAP functions! Excluding LDAP support." >&5 +$as_echo "$as_me: Cannot find LDAP functions! Excluding LDAP support." >&6;} fi fi @@ -17221,7 +17285,7 @@ fi fi fi -if test x$alpine_REGEX != "xyes" ; then +if test "x$alpine_REGEX" != "xyes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5 $as_echo_n "checking for library containing regcomp... " >&6; } if ${ac_cv_search_regcomp+:} false; then : @@ -17287,7 +17351,7 @@ else fi fi -if test x$alpine_REGEX != "xyes" ; then +if test "x$alpine_REGEX" != "xyes" ; then ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default" if test "x$ac_cv_header_regex_h" = xyes; then : @@ -17306,7 +17370,7 @@ fi $as_echo "#define HAVE_REGEX_H 1" >>confdefs.h -if test x$alpine_REGEX = "xyes" ; then +if test "x$alpine_REGEX" = "xyes" ; then CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex" LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex" REGEX_BUILD=regex @@ -19425,6 +19489,8 @@ else certdir="$alpine_SSLCERTS" elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then certdir="${alpine_SSLDIR}/certs" + elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/ssl/certs" ; then + certdir="${alpine_SSLDIR}/ssl/certs" else { $as_echo "$as_me:${as_lineno-$LINENO}: SSL Problem: certificate directory not found" >&5 $as_echo "$as_me: SSL Problem: certificate directory not found" >&6;} @@ -20094,7 +20160,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alpine $as_me 2.11.4, which was +This file was extended by alpine $as_me 2.11.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20160,7 +20226,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alpine config.status 2.11.4 +alpine config.status 2.11.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3-54-g00ecf