[rt45019] separate DNS_CRYPTO_LIBS from ISC_OPENSSL_LIBS and use both

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 2f9a179fd59ae4a876a403965e5327af24606e8d..85b58622aa40df7477202f84ffcbc0a0ee4a0025 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,7 +20,7 @@ CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
 

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 75b309f22536bef9814840e6422b7a67c6d45797..b031f31908266fc6876ff0aaa851fc6f378268d1 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.8 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,7 +20,7 @@ CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@

diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index 313063c579ee4de1947dc4d308373e7bd2f58d82..cdc48b313349ebb281f2f69870e94cb494240d37 100644 (file)
--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -22,7 +22,7 @@ CWARNINGS =
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 IRSLIBS =      ../../lib/irs/libirs.@A@
 
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 511fdfe86edbba3b5980b37a11db26f078c19798..28add35cf53f2b71c9062e63055937e0864cffa1 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -24,7 +24,7 @@ CWARNINGS =
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 LWRESLIBS =    ../../lib/lwres/liblwres.@A@
 

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 8c6627a8d31887a5779fabe1b971d64a991e77a3..48f879165eeb77c6e30d39a7c619d49090ec5a79 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.42.332.1 2011/03/16 06:37:51 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -21,7 +19,7 @@ CDEFINES =    -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 
 DNSDEPLIBS =   ../../lib/dns/libdns.@A@

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 3a11bf5d101f5f22677b7344b1caa7084ec3e166..9fe652a01d28a1d7a8b00642ffda26b9dba587c9 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -47,7 +47,7 @@ CWARNINGS =
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 LWRESLIBS =    ../../lib/lwres/liblwres.@A@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 21d5c61f33b37a8aa59f0269ef2d27ae84a66a4e..824f71b63049389a68ccac891638e6aa33225266 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -28,7 +26,7 @@ CWARNINGS =
 LWRESLIBS =    ../../lib/lwres/liblwres.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 

diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index d9aa66bc94d2a7b28db21edbc21f594481f68d3e..d2ab8699437187b67f9e4fedd58058b5065c6120 100644 (file)
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.2 2009/10/05 12:07:08 fdupont Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index eb6ff4fb6529ab5dd0716372921ff0182c8d42d1..41ecc2a824c65facd1fe8a2ed5a219749753b4d5 100644 (file)
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.49 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,7 +20,7 @@ CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@

diff --git a/bin/tests/atomic/Makefile.in b/bin/tests/atomic/Makefile.in
index d7bb314a5b8b4e7ce3d9a5971ac8edd7ffa47599..877206828adb6e38a23e332d0e17ed2c280b2460 100644 (file)
--- a/bin/tests/atomic/Makefile.in
+++ b/bin/tests/atomic/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.2 2011/01/11 23:47:12 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index 88083e3e486d837bf376a00e5e8d1cf151a17189..f8c082df2c3dae463c14896d3d7e772b69771b0d 100644 (file)
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.34 2010/08/13 23:47:03 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -19,7 +17,7 @@ CDEFINES =    @CRYPTO@
 CWARNINGS =
 
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCCFGLIBS =   ../../../lib/isccfg/libisccfg.@A@
 
 DNSDEPLIBS =   ../../../lib/dns/libdns.@A@

diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 6a63a27338933c94ae4a2fe5c79adeadcfdf0e61..9e5918d87c37fc99ea0e7cf225bf506c8237c895 100644 (file)
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.52 2010/12/24 23:47:05 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -19,7 +17,7 @@ CDEFINES =    @CRYPTO@ @USE_GSSAPI@
 CWARNINGS =
 
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/hashes/Makefile.in b/bin/tests/hashes/Makefile.in
index 5de57b5849b248a2a1779399de1829f3c1f73b0b..8d2445b6457a0b5c72ec77bd55f157e21fd7c9e1 100644 (file)
--- a/bin/tests/hashes/Makefile.in
+++ b/bin/tests/hashes/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.3 2010/09/29 23:47:05 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 82ee5126172e5980face565ca2e8cf4ca0a50269..3aac9c8acdc64f95262dfa33c51b02c272e56b8a 100644 (file)
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -20,7 +18,7 @@ CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index 0c47ba59d8fdee5fe013fc7505c6cd07e2b82472..0c8c4cbc9a38db005bb6139cd4aab5f4c06bbd78 100644 (file)
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.37 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index 0bf9821b757f4aaa9744aa07cdc752884f6215c1..e801a4e7dc8eb5871b23536d2b2c516bd4e60f7f 100644 (file)
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -19,7 +17,7 @@ CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in
index 6303622c35f288ec77e504e27be06a0e86420ea4..713633b936729e8b64f19f90a2093a9703159ad2 100644 (file)
--- a/bin/tests/net/Makefile.in
+++ b/bin/tests/net/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.19 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/pkcs11/benchmarks/Makefile.in b/bin/tests/pkcs11/benchmarks/Makefile.in
index 8bf13088e9f87bad991c5cfec4996d30bf85db75..dafcc81306feb39b4b69226e88bcc131e52d0352 100644 (file)
--- a/bin/tests/pkcs11/benchmarks/Makefile.in
+++ b/bin/tests/pkcs11/benchmarks/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index 4e26d62bb3eae2391cf9fd47e7c7060bb0fa6f4e..9772600a1a9312c35fe917b2ce8683ad9e476b3f 100644 (file)
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -19,7 +17,7 @@ CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/resolver/Makefile.in b/bin/tests/resolver/Makefile.in
index 31118e35074a9d1412d717e235703102f041c6e9..a152a29a4a3622a32204ff23892b08c983610fa1 100644 (file)
--- a/bin/tests/resolver/Makefile.in
+++ b/bin/tests/resolver/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.3 2011/02/03 12:18:10 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -20,7 +18,7 @@ CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-ISCLIBS =      ../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
index aa87c8b0170184ae466191a65ae1757084706b0f..f8629269b2bd16ccaeb3cf2d8596a42dbe60cc6a 100644 (file)
--- a/bin/tests/sockaddr/Makefile.in
+++ b/bin/tests/sockaddr/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.25 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -25,7 +23,7 @@ TAPILIBS =    ../../../lib/tests/libt_api.@A@
 
 DEPLIBS =      ${TAPIDEPLIBS} ${ISCDEPLIBS}
 
-LIBS =         ${TAPILIBS} ${ISCLIBS} ${ISCLIBS} @LIBS@
+LIBS =         ${TAPILIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =      t_sockaddr@EXEEXT@
 

diff --git a/bin/tests/system/dyndb/driver/Makefile.in b/bin/tests/system/dyndb/driver/Makefile.in
index 2d116e8e498cb971a33dd1022ea0330c1aca76fd..4f51a27886f1d00bb73d9681d13a0b40c59d3e1c 100644 (file)
--- a/bin/tests/system/dyndb/driver/Makefile.in
+++ b/bin/tests/system/dyndb/driver/Makefile.in
@@ -15,8 +15,8 @@ CINCLUDES =   ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
 CDEFINES =     @CRYPTO@
 CWARNINGS =
 
-DNSLIBS =      ../../../../../lib/dns/libdns.@A@
-ISCLIBS =      ../../../../../lib/isc/libisc.@A@
+DNSLIBS =      ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+ISCLIBS =      ../../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =   ../../../../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../../../../lib/isc/libisc.@A@

diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
index 533becfbb5961a11dbfd7ffff1d5734ee5c374da..306a9102a64ea235d3546e5cf8b2bb51040b6ab6 100644 (file)
--- a/bin/tests/system/lwresd/Makefile.in
+++ b/bin/tests/system/lwresd/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.22 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/system/rndc/Makefile.in b/bin/tests/system/rndc/Makefile.in
index c8a65f1034fe68ee37f90de3245cf2cef339e44f..61918c50df8e61d3a44af54809354ce15107bee7 100644 (file)
--- a/bin/tests/system/rndc/Makefile.in
+++ b/bin/tests/system/rndc/Makefile.in
@@ -4,9 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -20,7 +17,6 @@ CINCLUDES =   ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =
 ISCLIBS =      ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =

diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in
index 1e2a8fd4d1dce0100d4ce196978d129bd327a9e8..428672bfa17a5060d4053c7c46b89bdea2a8c8c3 100644 (file)
--- a/bin/tests/system/rsabigexponent/Makefile.in
+++ b/bin/tests/system/rsabigexponent/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index 6bb5cf775c6c0df78d6ef4a3f76a0845ddcc883b..949aa1122dedaec6946fb6f732ca29961680a794 100644 (file)
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.14 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index eb617866fab668a4b14da63b6b11e988c80e5788..e0d883d04a3c8ccfc547f90c85f7d18c723501c0 100644 (file)
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.34 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index 6b18243bfe10928d83f19d6323e293858b0105d3..34ba7f09635ae7bb662224d05aa901bcfd48ca98 100644 (file)
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.32 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 9c985a337960f4b72f460617dc15680cfb41e1d3..ac62a526270434803c9b4c7f519b247a06a8e916 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -21,7 +21,7 @@ CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
-ISCLIBS =      ../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
 LWRESLIBS =    ../../lib/lwres/liblwres.@A@

diff --git a/configure b/configure
index 64682905f6689b02b4c4fd86d6c01c6263a2a13b..12751fbb520cb887443a350a9339d4e999f1b03d 100755 (executable)
--- a/configure
+++ b/configure
@@ -962,6 +962,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1119,6 +1120,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1371,6 +1373,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1508,7 +1519,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+               libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1661,6 +1672,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -14439,9 +14451,9 @@ done
                    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
                    "-lgssapi" \
                    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
-                   "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
-                   "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
-                   "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+                   "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \
+                   "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \
+                   "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \
                    "-lgss -lkrb5"
                do
                    # Note that this does not include $saved_libs, because
@@ -14451,9 +14463,9 @@ done
                    # when you are trying to build with KTH in /usr/lib.
                    if test "/usr" = "$use_gssapi"
                    then
-                           LIBS="$TRY_LIBS"
+                           LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
                    else
-                           LIBS="-L$use_gssapi/lib $TRY_LIBS"
+                           LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
                    fi
                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
 $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
@@ -14554,7 +14566,7 @@ esac
 
 
 
-DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
+DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS"
 
 #
 # Applications linking with libdns also need to link with these libraries.

diff --git a/configure.in b/configure.in
index 5bb34f6b32d7e374ec6634b00c0d3076e2fc1baa..1808c440f0f4fe74703a41adff00e17ae3953635 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1037,9 +1037,9 @@ case "$use_gssapi" in
                    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
                    "-lgssapi" \
                    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
-                   "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
-                   "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
-                   "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+                   "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \
+                   "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \
+                   "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \
                    "-lgss -lkrb5"
                do
                    # Note that this does not include $saved_libs, because
@@ -1049,9 +1049,9 @@ case "$use_gssapi" in
                    # when you are trying to build with KTH in /usr/lib.
                    if test "/usr" = "$use_gssapi"
                    then
-                           LIBS="$TRY_LIBS"
+                           LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
                    else
-                           LIBS="-L$use_gssapi/lib $TRY_LIBS"
+                           LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
                    fi
                    AC_MSG_CHECKING(linking as $TRY_LIBS)
                    AC_TRY_LINK([
@@ -1132,7 +1132,7 @@ AC_SUBST(ISC_PLATFORM_KRB5HEADER)
 AC_SUBST(USE_GSSAPI)
 AC_SUBST(DST_GSSAPI_INC)
 AC_SUBST(DNS_GSSAPI_LIBS)
-DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
+DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS"
 
 #
 # Applications linking with libdns also need to link with these libraries.

diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in
index ac1d68fb922ec65feec53f4a907a2c9d12b9833d..abda98d107bfdde1b58fb59ffbb2f750f3e131c9 100644 (file)
--- a/contrib/dlz/bin/dlzbdb/Makefile.in
+++ b/contrib/dlz/bin/dlzbdb/Makefile.in
@@ -21,7 +21,7 @@ CDEFINES =      @CONTRIB_DLZ@
 CWARNINGS =
 
 DLZLIBS =      @DLZ_DRIVER_LIBS@
-ISCLIBS =      ../../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DEPLIBS =      ${ISCDEPLIBS}
 

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index 900e6c37196c6e2627d233239ce38aef1b0de45b..e48b52ce80433c7a5c5090d63f5ec3df3a4c0feb 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.14 2009/12/05 23:31:40 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,9 +20,9 @@ CINCLUDES =   -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =     @CRYPTO@
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCCFGLIBS =    ../../lib/isccfg/libisccfg.@A@
-DNSLIBS =    ../../lib/dns/libdns.@A@
+DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index b29936f601ff0d5ea181c0fb03a3aa3c3e9547b7..213e82322df964418d41aa034dfc96ab55bf04c6 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -30,7 +30,7 @@ CDEFINES =    -DUSE_MD5 @CRYPTO@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 65b1e36b5db00fac2fc3652ede4875c7d041e4ba..1d783c4a8538a37b851dcd532ac8c2a404833d9c 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,7 +20,7 @@ CINCLUDES =   -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
                @DST_OPENSSL_INC@
 CDEFINES =     @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
-ISCLIBS =      ../../isc/libisc.@A@
+ISCLIBS =      ../../isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCDEPLIBS =   ../../isc/libisc.@A@
 DNSLIBS =      ../libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../libdns.@A@

diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 2ecf8b03e5a071d26af82d00cd80880e6485ca56..8a85312c7bd104302f58f6550077bbb8cf3283cb 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -25,7 +23,7 @@ CFGLIBS =     ../../isccfg/libisccfg.@A@
 CFGDEPLIBS =   ../../isccfg/libisccfg.@A@
 DNSLIBS =      ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../../dns/libdns.@A@
-ISCLIBS =      ../../isc/libisc.@A@
+ISCLIBS =      ../../isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCDEPLIBS =   ../../isc/libisc.@A@
 IRSLIBS =      ../libirs.@A@
 IRSDEPLIBS =   ../libirs.@A@

diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 2637448d638bfc22e27c9f477d575fd0638888f0..d0e2122ab9549b02050f6c1ebb1f431049aa8cdd 100644 (file)
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,7 +20,7 @@ CINCLUDES =   -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \
 CDEFINES =     @CRYPTO@
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 53a94e3c736b3436c36574da60c523dddea056be..2932c68e0859ced696c1ef7dc562c101ace8f6d0 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -19,8 +19,8 @@ CINCLUDES =   -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@
-DNSLIBS =      ../../lib/dns/libdns.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../../lib/cfg/libisccfg.@A@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
@@ -59,8 +59,7 @@ libisccfg.la: ${OBJS}
         ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-               ${OBJS} ${DNSLIBS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ \
-               ${LIBS}
+               ${OBJS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 timestamp: libisccfg.@A@
        touch timestamp

diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index e418be73641a4efc8fd988d879fcf582809f4776..a89c36a27f01e2b1bc600508f88d077f05036902 100644 (file)
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -21,7 +21,7 @@ CINCLUDES =   -I. -Iinclude \
                @DST_OPENSSL_INC@
 CDEFINES =     @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
-ISCLIBS =      ../../isc/libisc.@A@
+ISCLIBS =      ../../isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCDEPLIBS =   ../../isc/libisc.@A@
 DNSLIBS =      ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =   ../../dns/libdns.@A@

diff --git a/lib/samples/Makefile-postinstall.in b/lib/samples/Makefile-postinstall.in
index d78df2d8217d3cdc4ecc081fd5079eb10812b6e7..739d180ef343b8e57a1b14185aa778bf687333ad 100644 (file)
--- a/lib/samples/Makefile-postinstall.in
+++ b/lib/samples/Makefile-postinstall.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile-postinstall.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
-
 srcdir =       @srcdir@
 #prefix =      @prefix@
 #exec_prefix = @exec_prefix@
@@ -14,7 +12,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      -ldns @DNS_CRYPTO_LIBS@
-ISCLIBS =      -lisc
+ISCLIBS =      -lisc @ISC_OPENSSL_LIBS@
 ISCCFGLIBS =   -lisccfg
 IRSLIBS =      -lirs
 

diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index ab934c464331184a5e00b6c8a13ee6eaf5c169e6..e5377d8d3a4f7c7d31dae68f56e864dd2f48fd53 100644 (file)
--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -21,7 +21,7 @@ CDEFINES =    @CRYPTO@ -DVERSION=\"${VERSION}\" \
                -DSYSCONFDIR=\"${sysconfdir}\"
 CWARNINGS =
 
-ISCLIBS =      ../isc/libisc.@A@
+ISCLIBS =      ../isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 DNSLIBS =      ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =   ../isccfg/libisccfg.@A@
 IRSLIBS =      ../irs/libirs.@A@

diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 643f904a16f7a947a5dd31c0458dff6e9191dd5b..27a6c40b14aa092ce2ab418b2e4a0fd0c3ff3f0d 100644 (file)
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: Makefile.in,v 1.28 2009/12/05 23:31:41 each Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -16,7 +14,7 @@ CINCLUDES =   ${DNS_INCLUDES} ${ISC_INCLUDES} ${TEST_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-ISCLIBS =      ../../lib/isc/libisc.@A@
+ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
 
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@