From a17b07d466e8add2423ed8cb42e8940a532070f1 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 22 Mar 2016 18:01:27 -0700
Subject: [PATCH] [v9_10] fix AES configuration for cross-compiling

---
 configure    | 2 ++
 configure.in | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 6a6f376e26..c8466ffd82 100755
--- a/configure
+++ b/configure
@@ -16056,6 +16056,8 @@ $as_echo_n "checking for OpenSSL AES support... " >&6; }
 	if test "$cross_compiling" = yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using --with-aes" >&5
 $as_echo "using --with-aes" >&6; }
+         # Expect cross-compiling with a modern OpenSSL
+	 have_aes="evp"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/configure.in b/configure.in
index 3c808f0e1f..f457f79738 100644
--- a/configure.in
+++ b/configure.in
@@ -1764,7 +1764,9 @@ int main() {
 	[AC_MSG_RESULT(yes)
 	 have_aes="yes"],
 	[AC_MSG_RESULT(no)])],
-	[AC_MSG_RESULT(using --with-aes)])
+	[AC_MSG_RESULT(using --with-aes)
+         # Expect cross-compiling with a modern OpenSSL
+	 have_aes="evp"])
 
 	ISC_OPENSSL_INC=""
 	ISC_OPENSSL_LIBS=""