Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit5571caf

Browse files
committed
Move check for SSL_get_current_compression to run on mingw
Mingw uses a different header file than msvc, so we don't get thehardcoded value, so we need the configure test to run.
1 parent9a218c0 commit5571caf

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8509,17 +8509,6 @@ else
85098509
as_fn_error$?"library 'ssl' is required for OpenSSL""$LINENO" 5
85108510
fi
85118511

8512-
forac_funcin SSL_get_current_compression
8513-
do:
8514-
ac_fn_c_check_func"$LINENO""SSL_get_current_compression""ac_cv_func_SSL_get_current_compression"
8515-
iftest"x$ac_cv_func_SSL_get_current_compression" = xyes;then:
8516-
cat>>confdefs.h<<_ACEOF
8517-
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
8518-
_ACEOF
8519-
8520-
fi
8521-
done
8522-
85238512
else
85248513
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing CRYPTO_new_ex_data">&5
85258514
$as_echo_n"checking for library containing CRYPTO_new_ex_data...">&6; }
@@ -8638,6 +8627,17 @@ else
86388627
fi
86398628

86408629
fi
8630+
forac_funcin SSL_get_current_compression
8631+
do:
8632+
ac_fn_c_check_func"$LINENO""SSL_get_current_compression""ac_cv_func_SSL_get_current_compression"
8633+
iftest"x$ac_cv_func_SSL_get_current_compression" = xyes;then:
8634+
cat>>confdefs.h<<_ACEOF
8635+
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
8636+
_ACEOF
8637+
8638+
fi
8639+
done
8640+
86418641
fi
86428642

86438643
iftest"$with_pam" = yes;then

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -950,11 +950,11 @@ if test "$with_openssl" = yes ; then
950950
if test "$PORTNAME" != "win32"; then
951951
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
952952
AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
953-
AC_CHECK_FUNCS([SSL_get_current_compression])
954953
else
955954
AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
956955
AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
957956
fi
957+
AC_CHECK_FUNCS([SSL_get_current_compression])
958958
fi
959959

960960
if test "$with_pam" = yes ; then

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp