Commit f53fc454 authored by Mark Andrews's avatar Mark Andrews
Browse files

check for LIBRESSL_VERSION_NUMBER

parent 5480a74b
...@@ -15956,7 +15956,7 @@ $as_echo_n "checking whether linking with OpenSSL requires -ldl... " >&6; } ...@@ -15956,7 +15956,7 @@ $as_echo_n "checking whether linking with OpenSSL requires -ldl... " >&6; }
/* end confdefs.h. */ /* end confdefs.h. */
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h> #include <openssl/crypto.h>
#else #else
#include <openssl/err.h> #include <openssl/err.h>
...@@ -15967,7 +15967,7 @@ int ...@@ -15967,7 +15967,7 @@ int
main () main ()
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else #else
DSO_METHOD_dlfcn(); DSO_METHOD_dlfcn();
...@@ -15985,7 +15985,7 @@ else ...@@ -15985,7 +15985,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h> #include <openssl/crypto.h>
#else #else
#include <openssl/err.h> #include <openssl/err.h>
...@@ -15996,7 +15996,7 @@ int ...@@ -15996,7 +15996,7 @@ int
main () main ()
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else #else
DSO_METHOD_dlfcn(); DSO_METHOD_dlfcn();
...@@ -16193,7 +16193,7 @@ else ...@@ -16193,7 +16193,7 @@ else
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/engine.h> #include <openssl/engine.h>
int main() { int main() {
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10000000L)
ENGINE *e; ENGINE *e;
EC_KEY *ek; EC_KEY *ek;
......
...@@ -1616,7 +1616,7 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)], ...@@ -1616,7 +1616,7 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)],
AC_MSG_CHECKING(whether linking with OpenSSL requires -ldl) AC_MSG_CHECKING(whether linking with OpenSSL requires -ldl)
AC_TRY_LINK([ AC_TRY_LINK([
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h> #include <openssl/crypto.h>
#else #else
#include <openssl/err.h> #include <openssl/err.h>
...@@ -1624,7 +1624,7 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)], ...@@ -1624,7 +1624,7 @@ shared library configuration (e.g., LD_LIBRARY_PATH).)],
#endif #endif
], ],
[ [
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else #else
DSO_METHOD_dlfcn(); DSO_METHOD_dlfcn();
...@@ -1633,7 +1633,7 @@ DSO_METHOD_dlfcn(); ...@@ -1633,7 +1633,7 @@ DSO_METHOD_dlfcn();
[AC_MSG_RESULT(no)], [AC_MSG_RESULT(no)],
[LIBS="$LIBS -ldl" [LIBS="$LIBS -ldl"
AC_TRY_LINK([ AC_TRY_LINK([
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
#include <openssl/crypto.h> #include <openssl/crypto.h>
#else #else
#include <openssl/err.h> #include <openssl/err.h>
...@@ -1641,7 +1641,7 @@ DSO_METHOD_dlfcn(); ...@@ -1641,7 +1641,7 @@ DSO_METHOD_dlfcn();
#endif #endif
], ],
[ [
#if OPENSSL_VERSION_NUMBER >= 0x10100004L #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100004L)
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
#else #else
DSO_METHOD_dlfcn(); DSO_METHOD_dlfcn();
...@@ -1769,7 +1769,7 @@ int main() { ...@@ -1769,7 +1769,7 @@ int main() {
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/engine.h> #include <openssl/engine.h>
int main() { int main() {
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10000000L)
ENGINE *e; ENGINE *e;
EC_KEY *ek; EC_KEY *ek;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment