diff options
| author | Magnus Hagander <magnus@hagander.net> | 2014-07-15 22:00:56 +0200 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2014-07-15 22:02:46 +0200 |
| commit | 5571caf42d62ea30c452b0ae5f1748289ae613b4 (patch) | |
| tree | 7e5a0ee859f78a8097dd4832eee3d11736afc95e | |
| parent | 9a218c02b8f10bc5aa3a9227b0a30ad0b6bdf6a6 (diff) | |
| download | postgresql-5571caf42d62ea30c452b0ae5f1748289ae613b4.tar.gz postgresql-5571caf42d62ea30c452b0ae5f1748289ae613b4.zip | |
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.
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/configure b/configure index ac0d98e2a4d..7a97bdc2ce0 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index 32eda48f631..0d7cb5a77c6 100644 --- a/configure.in +++ b/configure.in @@ -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 |