From: Witold Kręcicki <wpk@isc.org>
Date: Wed, 13 May 2020 15:37:51 +0000 (+0200)
Subject: autoconf: link with libssl
X-Git-Tag: v9.17.7~16^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a2065e2f48a5954d70a16500e2093bf641adabb;p=thirdparty%2Fbind9.git

autoconf: link with libssl

This is prerequisite to adding DoT and DoH support to BIND 9.
---

diff --git a/configure.ac b/configure.ac
index c43c51eee6e..4e5332750e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -607,7 +607,7 @@ CRYPTO=OpenSSL
 #
 # OpenSSL/LibreSSL is mandatory
 #
-PKG_CHECK_MODULES([OPENSSL], [libcrypto], [],
+PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto], [],
 		  [AX_CHECK_OPENSSL([:],[AC_MSG_FAILURE([OpenSSL/LibreSSL not found])])])
 
 AX_SAVE_FLAGS([openssl])
@@ -698,6 +698,8 @@ AC_CHECK_FUNCS([EVP_aes_128_ecb EVP_aes_192_ecb EVP_aes_256_ecb], [:],
 #
 AC_CHECK_FUNCS([DH_get0_key ECDSA_SIG_get0 RSA_set0_key])
 
+AC_CHECK_FUNCS([TLS_server_method])
+
 #
 # Check whether FIPS mode is available and whether we should enable it
 #
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index 85d72b0e452..19d0c2d176b 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -68,7 +68,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
 	    AS_IF([test -f "$ssldir/include/openssl/ssl.h"],
 	        [
 		    OPENSSL_CFLAGS="-I$ssldir/include"
-                    OPENSSL_LIBS="-L$ssldir/lib -lcrypto"
+                    OPENSSL_LIBS="-L$ssldir/lib -lcrypto -lssl"
                     found=true
                     AC_MSG_RESULT([yes])
                     break