diff options
| author | Patrick Griffis <tingping@tingping.se> | 2017-01-05 12:48:37 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2017-01-05 12:52:04 -0500 |
| commit | eddaf8c39620d13b8a0e81e9ab9b2eb8e5700e38 (patch) | |
| tree | 956f8ebd17a36a99365cd42c462c6abaeb8a5323 | |
| parent | dfaf0e31c7a3bfbdb12654382957d1b9514950cb (diff) | |
build: Fix checking for OpenSSL 1.1 functions
Fixes #1920
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 10a15504..d4357893 100644 --- a/configure.ac +++ b/configure.ac @@ -374,8 +374,6 @@ AS_IF([test "$openssl" != no], [ openssl=yes COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS" COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS" - dnl Test for various functions that are not available in LibreSSL - AC_CHECK_FUNCS([SSL_CTX_get_ssl_method X509_get_signature_nid DH_set0_pqg DH_get0_key DH_set0_key]) ], [ unset openssl_path ac_cv_lib_ssl_SSL_new ac_cv_header_openssl_ssl_h AS_IF([test "$openssl" != yes], [ @@ -406,6 +404,14 @@ AS_IF([test "$openssl" != no], [ ]) LIBS=$SAVED_LIBS ]) + + AS_IF([test "$openssl" = yes], [ + dnl Test for various functions that are not available in LibreSSL + SAVED_LIBS="$LIBS" + LIBS="$OPENSSL_LIBS" + AC_CHECK_FUNCS([SSL_CTX_get_ssl_method X509_get_signature_nid DH_set0_pqg DH_get0_key DH_set0_key]) + LIBS="$SAVED_LIBS" + ]) ]) dnl ********************************************************************* |