]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
check for LIBRESSL_VERSION_NUMBER
authorMark Andrews <marka@isc.org>
Tue, 1 Nov 2016 01:02:36 +0000 (12:02 +1100)
committerMark Andrews <marka@isc.org>
Tue, 1 Nov 2016 01:02:36 +0000 (12:02 +1100)
configure
configure.in

index 209d371d87b45e59c0cfdc480d7c90fc552e137c..588476367f9c8b1b9766064a75ddea40835232fe 100755 (executable)
--- a/configure
+++ b/configure
@@ -15956,7 +15956,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>
@@ -15967,7 +15967,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();
@@ -15985,7 +15985,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>
@@ -15996,7 +15996,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();
@@ -16193,7 +16193,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;
 
index 048c68b47d7ef1b1bf92006e70e8eb090c349702..1ca8946dca2bb8446318a2279f1fabae2eb8ebf8 100644 (file)
@@ -1616,7 +1616,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>
@@ -1624,7 +1624,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();
@@ -1633,7 +1633,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>
@@ -1641,7 +1641,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();
@@ -1769,7 +1769,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;