From: Mark Andrews <marka@isc.org>
Date: Thu, 20 Feb 2014 09:30:50 +0000 (+1100)
Subject: don't set want_openssl_aes unless CRYPTO = -DOPENSSL
X-Git-Tag: v9.10.0b1~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f80420c71a0a82aa2de4d75783ca815cad77e6f;p=thirdparty%2Fbind9.git

don't set want_openssl_aes unless CRYPTO = -DOPENSSL
---

diff --git a/config.h.in b/config.h.in
index c65d8911bc8..fe410b218c9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -188,6 +188,9 @@ int sigwait(const unsigned int *set, int *sig);
    MSVC and with C++ compilers. */
 #undef FLEXIBLE_ARRAY_MEMBER
 
+/* Define to 1 if you have the `AES_encrypt' function. */
+#undef HAVE_AES_ENCRYPT
+
 /* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
diff --git a/configure b/configure
index f06e4e33a0f..281913e1e14 100755
--- a/configure
+++ b/configure
@@ -15684,7 +15684,10 @@ $as_echo "#define HMAC_SHA256_SIT 1" >>confdefs.h
 		if test "$ac_cv_func_AES_encrypt" = "yes"
 		then
 			with_sit_alg="aes"
-			want_openssl_aes="yes"
+			if test "$CRYPTO" = "-DOPENSSL"
+			then
+				want_openssl_aes="yes"
+			fi
 
 $as_echo "#define AES_SIT 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index f0a6ce9b0f3..3548607714b 100644
--- a/configure.in
+++ b/configure.in
@@ -1558,7 +1558,10 @@ case $with_sit_alg in
 		if test "$ac_cv_func_AES_encrypt" = "yes"
 		then
 			with_sit_alg="aes"
-			want_openssl_aes="yes"
+			if test "$CRYPTO" = "-DOPENSSL"
+			then
+				want_openssl_aes="yes"
+			fi
 			AC_DEFINE(AES_SIT, 1,
 				 [Use AES for Source Identity Token generation])
 		else