Commit0e34d82

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 parent3b70e97 commit0e34d82Copy full SHA for 0e34d82

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -8511,17 +8511,6 @@ else`
`8511`	`8511`	`as_fn_error$?"library 'ssl' is required for OpenSSL""$LINENO" 5`
`8512`	`8512`	`fi`
`8513`	`8513`
`8514`		`-forac_funcin SSL_get_current_compression`
`8515`		`-do:`
`8516`		`- ac_fn_c_check_func"$LINENO""SSL_get_current_compression""ac_cv_func_SSL_get_current_compression"`
`8517`		`-iftest"x$ac_cv_func_SSL_get_current_compression" = xyes;then:`
`8518`		`- cat>>confdefs.h<<_ACEOF`
`8519`		`-#define HAVE_SSL_GET_CURRENT_COMPRESSION 1`
`8520`		`-_ACEOF`
`8521`		`-`
`8522`		`-fi`
`8523`		`-done`
`8524`		`-`
`8525`	`8514`	`else`
`8526`	`8515`	`{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing CRYPTO_new_ex_data">&5`
`8527`	`8516`	`$as_echo_n"checking for library containing CRYPTO_new_ex_data...">&6; }`
`@@ -8640,6 +8629,17 @@ else`
`8640`	`8629`	`fi`
`8641`	`8630`
`8642`	`8631`	`fi`
	`8632`	`+forac_funcin SSL_get_current_compression`
	`8633`	`+do:`
	`8634`	`+ ac_fn_c_check_func"$LINENO""SSL_get_current_compression""ac_cv_func_SSL_get_current_compression"`
	`8635`	`+iftest"x$ac_cv_func_SSL_get_current_compression" = xyes;then:`
	`8636`	`+ cat>>confdefs.h<<_ACEOF`
	`8637`	`+#define HAVE_SSL_GET_CURRENT_COMPRESSION 1`
	`8638`	`+_ACEOF`
	`8639`	`+`
	`8640`	`+fi`
	`8641`	`+done`
	`8642`	`+`
`8643`	`8643`	`fi`
`8644`	`8644`
`8645`	`8645`	`iftest"$with_pam" = yes;then`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -951,11 +951,11 @@ if test "$with_openssl" = yes ; then`
`951`	`951`	`if test "$PORTNAME" != "win32"; then`
`952`	`952`	`AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])`
`953`	`953`	`AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])`
`954`		`- AC_CHECK_FUNCS([SSL_get_current_compression])`
`955`	`954`	`else`
`956`	`955`	`AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])`
`957`	`956`	`AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])`
`958`	`957`	`fi`
	`958`	`+ AC_CHECK_FUNCS([SSL_get_current_compression])`
`959`	`959`	`fi`
`960`	`960`
`961`	`961`	`if test "$with_pam" = yes ; then`

Comments

(0)