check for LIBRESSL_VERSION_NUMBER

(cherry picked from commit f53fc4540a)
This commit is contained in:
Mark Andrews 2016-11-01 12:02:36 +11:00
parent d3feb65b63
commit fa43314964
2 changed files with 10 additions and 10 deletions

10
configure vendored
View file

@ -15940,7 +15940,7 @@ $as_echo_n "checking whether linking with OpenSSL requires -ldl... " >&6; }
/* end confdefs.h. */
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h>
#else
#include <openssl/err.h>
@ -15951,7 +15951,7 @@ int
main ()
{
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else
DSO_METHOD_dlfcn();
@ -15969,7 +15969,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h>
#else
#include <openssl/err.h>
@ -15980,7 +15980,7 @@ int
main ()
{
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else
DSO_METHOD_dlfcn();
@ -16177,7 +16177,7 @@ else
#include <openssl/conf.h>
#include <openssl/engine.h>
int main() {
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10000000L)
ENGINE *e;
EC_KEY *ek;

View file

@ -1639,7 +1639,7 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)],
AC_MSG_CHECKING(whether linking with OpenSSL requires -ldl)
AC_TRY_LINK([
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h>
#else
#include <openssl/err.h>
@ -1647,7 +1647,7 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)],
#endif
],
[
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else
DSO_METHOD_dlfcn();
@ -1656,7 +1656,7 @@ DSO_METHOD_dlfcn();
[AC_MSG_RESULT(no)],
[LIBS="$LIBS -ldl"
AC_TRY_LINK([
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h>
#else
#include <openssl/err.h>
@ -1664,7 +1664,7 @@ DSO_METHOD_dlfcn();
#endif
],
[
#if OPENSSL_VERSION_NUMBER >= 0x10100004L
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else
DSO_METHOD_dlfcn();
@ -1792,7 +1792,7 @@ int main() {
#include <openssl/conf.h>
#include <openssl/engine.h>
int main() {
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10000000L)
ENGINE *e;
EC_KEY *ek;