Commit 5571caf4 authored by Magnus Hagander's avatar Magnus Hagander

Move check for SSL_get_current_compression to run on mingw

Mingw uses a different header file than msvc, so we don't get the
hardcoded value, so we need the configure test to run.
parent 9a218c02
......@@ -8509,17 +8509,6 @@ else
as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5
fi
for ac_func in SSL_get_current_compression
do :
ac_fn_c_check_func "$LINENO" "SSL_get_current_compression" "ac_cv_func_SSL_get_current_compression"
if test "x$ac_cv_func_SSL_get_current_compression" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
_ACEOF
fi
done
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing CRYPTO_new_ex_data" >&5
$as_echo_n "checking for library containing CRYPTO_new_ex_data... " >&6; }
......@@ -8638,6 +8627,17 @@ else
fi
fi
for ac_func in SSL_get_current_compression
do :
ac_fn_c_check_func "$LINENO" "SSL_get_current_compression" "ac_cv_func_SSL_get_current_compression"
if test "x$ac_cv_func_SSL_get_current_compression" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
_ACEOF
fi
done
fi
if test "$with_pam" = yes ; then
......
......@@ -950,11 +950,11 @@ if test "$with_openssl" = yes ; then
if test "$PORTNAME" != "win32"; then
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
AC_CHECK_FUNCS([SSL_get_current_compression])
else
AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
fi
AC_CHECK_FUNCS([SSL_get_current_compression])
fi
if test "$with_pam" = yes ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment