mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

check for LIBRESSL_VERSION_NUMBER

Browse Source
This commit is contained in:
Mark Andrews 2016-11-01 12:02:36 +11:00
parent 5480a74b70
commit f53fc4540a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -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
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
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
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
#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;

10
configure.in
View File

@ -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).)],
#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();
[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();
#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() {
#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;