From 98f878d2272bf8dff21f2a0265d963c29e33fed2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 25 Nov 2018 14:05:08 +1100
Subject: Improve OpenSSL_add_all_algorithms check.

OpenSSL_add_all_algorithms() may be a macro so check for that too.
---
 configure.ac | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 14e7c4a61..c1427247e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2705,10 +2705,19 @@ if test "x$openssl" = "xyes" ; then
 		EVP_MD_CTX_copy_ex \
 		EVP_MD_CTX_init \
 		HMAC_CTX_init \
-		OpenSSL_add_all_algorithms \
 		RSA_generate_key_ex \
 		RSA_get_default_method \
 	])
+
+	# OpenSSL_add_all_algorithms may be a macro.
+	AC_CHECK_FUNC(OpenSSL_add_all_algorithms,
+	    AC_DEFINE(HAVE_OPENSSL_ADD_ALL_ALGORITHMS, 1, [as a function]),
+	    AC_CHECK_DECL(OpenSSL_add_all_algorithms,
+		AC_DEFINE(HAVE_OPENSSL_ADD_ALL_ALGORITHMS, 1, [as a macro]), ,
+		[[#include <openssl/evp.h>]]
+	    )
+	)
+
 	# LibreSSL/OpenSSL 1.1x API
 	AC_CHECK_FUNCS([ \
 		OPENSSL_init_crypto \
-- 
cgit v1.2.3