From 0e40083fdd5445703bd30e46e5bfe7d047bced12 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Tue, 6 Nov 2001 20:05:13 +0000
Subject: [PATCH] @DNS_OPENSSL_LIBS@ -> @DNS_CRYPTO_LIBS@

---
 bin/check/Makefile.in             |  4 ++--
 bin/dig/Makefile.in               |  4 ++--
 bin/dnssec/Makefile.in            |  4 ++--
 bin/named/Makefile.in             |  4 ++--
 bin/nsupdate/Makefile.in          |  4 ++--
 bin/rndc/Makefile.in              |  4 ++--
 bin/tests/Makefile.in             |  4 ++--
 bin/tests/db/Makefile.in          |  4 ++--
 bin/tests/dst/Makefile.in         |  4 ++--
 bin/tests/master/Makefile.in      |  4 ++--
 bin/tests/names/Makefile.in       |  4 ++--
 bin/tests/rbt/Makefile.in         |  4 ++--
 bin/tests/system/tkey/Makefile.in |  4 ++--
 configure.in                      | 14 ++++++++++----
 isc-config.sh.in                  |  4 ++--
 15 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index d08a0a53dd..885f391254 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.17 2001/09/20 15:16:16 marka Exp $
+# $Id: Makefile.in,v 1.18 2001/11/06 20:04:57 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,7 +29,7 @@ CINCLUDES =	${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
 CDEFINES = 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCLIBS =	../../lib/isc/libisc.@A@
 BIND9LIBS =	../../lib/bind9/libbind9.@A@
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 0cacbfd999..c84a87fc49 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.26 2001/09/20 15:16:19 marka Exp $
+# $Id: Makefile.in,v 1.27 2001/11/06 20:04:59 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -28,7 +28,7 @@ CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =	-DVERSION=\"${VERSION}\"
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 6c1e63834f..6dbf709236 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.20 2001/09/20 15:16:21 marka Exp $
+# $Id: Makefile.in,v 1.21 2001/11/06 20:05:00 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -28,7 +28,7 @@ CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../lib/dns/libdns.@A@
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 3bc48ece12..570f89b7db 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.75 2001/09/20 15:16:22 marka Exp $
+# $Id: Makefile.in,v 1.76 2001/11/06 20:05:01 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,7 +39,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include \
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =	../../lib/isccc/libisccc.@A@
 ISCLIBS =	../../lib/isc/libisc.@A@
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 7770b3e154..0dfc685c8a 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.16 2001/09/20 15:16:28 marka Exp $
+# $Id: Makefile.in,v 1.17 2001/11/06 20:05:02 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,7 +29,7 @@ CDEFINES =
 CWARNINGS =
 
 LWRESLIBS =	../../lib/lwres/liblwres.@A@
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../lib/isc/libisc.@A@
 
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 554dec70f6..6c63e995ec 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.34 2001/09/20 15:16:29 marka Exp $
+# $Id: Makefile.in,v 1.35 2001/11/06 20:05:04 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -32,7 +32,7 @@ CWARNINGS =
 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =	../../lib/isccc/libisccc.@A@
 ISCLIBS =	../../lib/isc/libisc.@A@
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 
 ISCCFGDEPLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCCCDEPLIBS =	../../lib/isccc/libisccc.@A@
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index e5f7ad229b..12296f633c 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.115 2001/09/20 15:16:32 marka Exp $
+# $Id: Makefile.in,v 1.116 2001/11/06 20:05:05 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -27,7 +27,7 @@ CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../lib/isc/libisc.@A@
 ISCCFGLIBS = 	../../lib/isccfg/libisccfg.@A@
 LWRESLIBS =	../../lib/lwres/liblwres.@A@
diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index 55312bf0be..b984a2fb10 100644
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.22 2001/09/20 15:16:33 marka Exp $
+# $Id: Makefile.in,v 1.23 2001/11/06 20:05:06 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -26,7 +26,7 @@ CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index b659ed8b4a..35347d137e 100644
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.31 2001/09/20 15:16:34 marka Exp $
+# $Id: Makefile.in,v 1.32 2001/11/06 20:05:07 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -26,7 +26,7 @@ CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 6f608c3a6b..d76fb57e78 100644
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.21 2001/09/20 15:16:36 marka Exp $
+# $Id: Makefile.in,v 1.22 2001/11/06 20:05:09 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -27,7 +27,7 @@ CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index fe44661995..1a30c0483b 100644
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.21 2001/09/20 15:16:39 marka Exp $
+# $Id: Makefile.in,v 1.22 2001/11/06 20:05:10 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -27,7 +27,7 @@ CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index 41158a5c57..dc0a0a6b98 100644
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.21 2001/09/20 15:16:41 marka Exp $
+# $Id: Makefile.in,v 1.22 2001/11/06 20:05:11 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -27,7 +27,7 @@ CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../../lib/dns/libdns.@A@
diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index 981f5cb731..7c63f0dcd4 100644
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2001/09/20 15:16:46 marka Exp $
+# $Id: Makefile.in,v 1.5 2001/11/06 20:05:13 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -28,7 +28,7 @@ CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
+DNSLIBS =	../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../../../lib/isc/libisc.@A@
 
 DNSDEPLIBS =	../../../../lib/dns/libdns.@A@
diff --git a/configure.in b/configure.in
index 502ba94352..b2a8b4ea0d 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.310 $)
+AC_REVISION($Revision: 1.311 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -367,9 +367,9 @@ esac
 # it as needed) if it is found.
 #
 
-AC_SUBST(DST_OPENSSL_INC)
-AC_SUBST(DNS_OPENSSL_LIBS)
 AC_SUBST(USE_OPENSSL)
+AC_SUBST(DST_OPENSSL_INC)
+DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
 
 #
 # was --with-gssapi specified?
@@ -403,7 +403,13 @@ DNS_GSSAPI_LIBS=''
 
 AC_SUBST(USE_GSSAPI)
 AC_SUBST(DST_GSSAPI_INC)
-AC_SUBST(DNS_GSSAPI_LIBS)
+DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_GSSAPI_LIBS"
+
+#
+# Applications linking with libdns also need to link with these libraries.
+#
+
+AC_SUBST(DNS_CRYPTO_LIBS)
 
 #
 # was --with-randomdev specified?
diff --git a/isc-config.sh.in b/isc-config.sh.in
index 84fd07333e..a3f9cc7819 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: isc-config.sh.in,v 1.10 2001/04/16 22:29:55 bwelling Exp $
+# $Id: isc-config.sh.in,v 1.11 2001/11/06 20:04:56 bwelling Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -120,7 +120,7 @@ if test x"$echo_libs" = x"true"; then
 		libs="$libs -llwres"
 	fi
 	if test x"$libdns" = x"true" ; then
-		libs="$libs -ldns @DNS_OPENSSL_LIBS@"
+		libs="$libs -ldns @DNS_CRYPTO_LIBS@"
 	fi
 	if test x"$libisccfg" = x"true" ; then
 		libs="$libs -lisccfg"