[master] fix AES configuration for cross-compiling

diff --git a/configure b/configure
index 7ce158192d45613a3ed6c077ba404a9b1bb8210f..81cf3c64fbef83d0370c827b0ac7ac56b61a8642 100755 (executable)
--- a/configure
+++ b/configure
@@ -16030,6 +16030,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 e6a8b3e8645408bab2588a4946c8f9ddb32d0a53..b9362928fe2c853eb0a35550dfc8df461f993a16 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1734,7 +1734,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=""