From 45eea1bda65a66106bb7d85eae5997deb013bf0c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 16 Oct 2009 04:16:17 +0000
Subject: [PATCH] 2715.   [bug]           Require OpenSSL support to be
 explicitly disabled.                         [RT #20288]

---
 CHANGES      |  5 ++++-
 configure.in | 12 ++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index bf1fc69412..6776039847 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-2713.	[port]		aix/powerpc: 'asm("ics");' needs non standard assembler
+2715.	[bug]		Require OpenSSL support to be explicitly disabled.
+			[RT #20288]
+
+2714.	[port]		aix/powerpc: 'asm("ics");' needs non standard assembler
 			flags.
 
 	--- 9.7.0b1 released ---
diff --git a/configure.in b/configure.in
index 6d116c4eae..b36570d86c 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.484 $)
+AC_REVISION($Revision: 1.485 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -525,7 +525,9 @@ case "$use_openssl" in
 	auto)
 		DST_OPENSSL_INC=""
 		USE_OPENSSL=""
-		AC_MSG_RESULT(not found)
+		AC_MSG_ERROR(
+[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
+If you don't want OpenSSL, use --without-openssl])
 		;;
 	*)
 		if test "$use_openssl" = "yes"
@@ -3246,6 +3248,12 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 
+if test "X$USE_OPENSSL" = "X"; then
+cat << \EOF                                                             
+BIND is being built without OpenSSL. This means it will not have DNSSEC support.
+EOF
+fi
+
 if test "X$OPENSSL_WARNING" != "X"; then
 cat << \EOF
 WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING