--- ircd-hybrid-8/configure 2012/03/21 17:48:54 1302 +++ ircd-hybrid-8/configure 2012/03/23 12:03:56 1304 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 1292 2012-02-12 20:36:27Z michael . +# From configure.ac Id: configure.ac 1302 2012-03-21 17:48:54Z michael . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for ircd-hybrid 8beta1. # @@ -13755,13 +13755,9 @@ if test "$cf_enable_openssl" != "no"; th fi if test ! -z "$cf_openssl_basedir"; then - LIBS="-lcrypto -lssl $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5 $as_echo "$cf_openssl_basedir" >&6; } cf_enable_openssl="yes" - -$as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. Please check your path." >&5 $as_echo "not found. Please check your path." >&6; } @@ -13774,8 +13770,8 @@ $as_echo "disabled" >&6; } fi if test "$cf_enable_openssl" != "no"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.7 or above" >&5 -$as_echo_n "checking for OpenSSL 0.9.7 or above... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5 +$as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; } if test "$cross_compiling" = yes; then : cf_openssl_version_ok=no else @@ -13788,7 +13784,7 @@ else int main () { - exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000)); + exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ; return 0; } @@ -13807,7 +13803,53 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5 +$as_echo_n "checking for SSL_connect in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_connect+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $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 SSL_connect (); +int +main () +{ +return SSL_connect (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_connect=yes +else + ac_cv_lib_ssl_SSL_connect=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_ssl_SSL_connect" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; } +if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSSL 1 +_ACEOF + + LIBS="-lssl $LIBS" + +fi + + if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5 $as_echo_n "checking for RSA_free in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_RSA_free+:} false; then : $as_echo_n "(cached) " >&6 @@ -13852,24 +13894,6 @@ _ACEOF fi - if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then : - for ac_func in EVP_bf_cfb \ - EVP_cast5_cfb \ - EVP_idea_cfb \ - EVP_rc5_32_12_16_cfb \ - EVP_des_ede3_cfb \ - EVP_des_cfb -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 - -fi -done - fi else @@ -13879,7 +13903,7 @@ $as_echo "no - OpenSSL support disabled" fi fi - if test "$cf_enable_openssl" = yes; then + if test "$ac_cv_lib_crypto_RSA_free" = yes; then ENABLE_SSL_TRUE= ENABLE_SSL_FALSE='#' else