CHANGES

diff --git a/configure.in b/configure.in
index cbbea5333fac5f62abb5ccfb150dd1e76293c873..9368cfa7492ed632e8f659b5d91c1f5bc8bff9cc 100644 (file)
--- 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.497 $)
+AC_REVISION($Revision: 1.498 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -522,10 +522,14 @@ case "$use_openssl" in
                AC_MSG_RESULT(no)
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLLINKOBJS=""
+               OPENSSLLINKSRCS=""
                ;;
        auto)
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLLINKOBJS=""
+               OPENSSLLINKSRCS=""
                AC_MSG_ERROR(
 [OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
 If you don't want OpenSSL, use --without-openssl])
@@ -670,6 +674,8 @@ esac
                AC_CHECK_FUNCS(EVP_sha256 EVP_sha512)
                CFLAGS="$saved_cflags"
                LIBS="$saved_libs"
+               OPENSSLLINKOBJS='${OPENSSLLINKOBJS}'
+               OPENSSLLINKSRCS='${OPENSSLLINKSRCS}'
 
                ;;
 esac
@@ -681,6 +687,8 @@ esac
 
 AC_SUBST(USE_OPENSSL)
 AC_SUBST(DST_OPENSSL_INC)
+AC_SUBST(OPENSSLLINKOBJS)
+AC_SUBST(OPENSSLLINKSRCS)
 DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
 
 #
@@ -993,6 +1001,8 @@ then
        fi
        ALWAYS_DEFINES="-D_REENTRANT"
        ISC_PLATFORM_USETHREADS="#define ISC_PLATFORM_USETHREADS 1"
+       THREADOPTOBJS='${THREADOPTOBJS}'
+       THREADOPTSRCS='${THREADOPTSRCS}'
        thread_dir=pthreads
        #
        # We'd like to use sigwait() too
@@ -1071,11 +1081,15 @@ then
 else
        ISC_PLATFORM_USETHREADS="#undef ISC_PLATFORM_USETHREADS"
        thread_dir=nothreads
+       THREADOPTOBJS=""
+       THREADOPTSRCS=""
        ALWAYS_DEFINES=""
 fi
 
 AC_SUBST(ALWAYS_DEFINES)
 AC_SUBST(ISC_PLATFORM_USETHREADS)
+AC_SUBST(THREADOPTOBJS)
+AC_SUBST(THREADOPTSRCS)
 ISC_THREAD_DIR=$thread_dir
 AC_SUBST(ISC_THREAD_DIR)
 

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 2290ab4072a7c1f64b188a9cafca4742a0ff5b62..44abf9ee2aaa0af33551e8384ebbd3ee6447fd00 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.169 2009/12/05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.170 2010/06/09 01:43:08 marka Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -46,11 +46,12 @@ LIBS =              @LIBS@
 
 # Alphabetically
 
-DSTOBJS =      @DST_EXTRA_OBJS@ \
+OPENSSLLINKOBJS = openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \
+                 opensslrsa_link.@O@
+
+DSTOBJS =      @DST_EXTRA_OBJS@ @OPENSSLLINKOBJS@ \
                dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \
-               gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@ \
-               openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \
-               opensslrsa_link.@O@
+               gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@ 
 
 # Alphabetically
 DNSOBJS =      acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
@@ -73,12 +74,13 @@ DNSOBJS =   acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
 OBJS=          ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS}
 
 # Alphabetically
-DSTSRCS =      @DST_EXTRA_SRCS@ \
+OPENSSLLINKSRCS = openssl_link.c openssldh_link.c \
+               openssldsa_link.c opensslrsa_link.c
+
+DSTSRCS =      @DST_EXTRA_SRCS@ @OPENSSLLINKSRCS@ \
                dst_api.c dst_lib.c dst_parse.c \
                dst_result.c gssapi_link.c gssapictx.c \
-               hmac_link.c key.c \
-               openssl_link.c openssldh_link.c \
-               openssldsa_link.c opensslrsa_link.c
+               hmac_link.c key.c
 
 DNSSRCS =      acache.c acl.c adb.c byaddr.c \
                cache.c callbacks.c compress.c \

diff --git a/lib/export/dns/Makefile.in b/lib/export/dns/Makefile.in
index 7445e303e1fa65c79bbd6d7bb58cbbc0e28c2fa7..c5b18224f4f6e38ee9c6a1ec808dbd4331241b46 100644 (file)
--- a/lib/export/dns/Makefile.in
+++ b/lib/export/dns/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2009/12/05 23:31:40 each Exp $
+# $Id: Makefile.in,v 1.5 2010/06/09 01:43:08 marka Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/dns
@@ -42,11 +42,14 @@ ISCDEPLIBS =        ../isc/libisc.@A@
 LIBS =         @LIBS@
 
 # Alphabetically
-DSTOBJS =      dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \
-               gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@ \
-               openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \
+
+OPENSSLLINKOBJS = openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O \
                opensslrsa_link.@O@
 
+DSTOBJS =      @OPENSSLLINKOBJS@ \
+               dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \
+               gssapi_link.@O@ gssapictx.@O@ hmac_link.@O@ key.@O@
+
 DNSOBJS =      acl.@O@ adb.@O@ byaddr.@O@ \
                cache.@O@ callbacks.@O@ client.@O@ compress.@O@ \
                db.@O@ dbiterator.@O@ diff.@O@ dispatch.@O@ dlz.@O@ dnssec.@O@ \
@@ -67,12 +70,15 @@ PORTDNSOBJS =       ecdb.@O@
 OBJS=          ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} ${PORTDNSOBJS}
 
 # Alphabetically
-DSTSRCS =      dst_api.c dst_lib.c dst_parse.c \
-               dst_result.c gssapi_link.c gssapictx.c \
-               hmac_link.c key.c \
-               openssl_link.c openssldh_link.c \
+
+OPENSSLLINKSRCS = openssl_link.c openssldh_link.c \
                openssldsa_link.c opensslrsa_link.c
 
+DSTSRCS =      @OPENSSLLINKSRCS@ \
+               dst_api.c dst_lib.c dst_parse.c \
+               dst_result.c gssapi_link.c gssapictx.c \
+               hmac_link.c key.c 
+
 DNSSRCS =      acl.c adb.c byaddr.c \
                cache.c callbacks.c client.c compress.c \
                db.c dbiterator.c diff.c dispatch.c dlz.c dnssec.c ds.c \

diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in
index ca199818ee14c962b3906b32bf605fffcb3096a5..0ed5c346ecb24f7f6e025d8dd3c0455c4188714d 100644 (file)
--- a/lib/export/isc/Makefile.in
+++ b/lib/export/isc/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2009/12/05 23:31:41 each Exp $
+# $Id: Makefile.in,v 1.6 2010/06/09 01:43:08 marka Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/isc
@@ -52,8 +52,9 @@ UNIXOBJS =    @ISC_ISCIPV6_O@ \
 
 NLSOBJS =      nls/msgcat.@O@
 
-THREADOBJS =   @ISC_THREAD_DIR@/condition.@O@ @ISC_THREAD_DIR@/mutex.@O@ \
-               @ISC_THREAD_DIR@/thread.@O@
+THREADOPTOBJS = @ISC_THREAD_DIR@/condition.@O@ @ISC_THREAD_DIR@/mutex.@O@
+
+THREADOBJS =   @THREADOPTOBJS @ISC_THREAD_DIR@/thread.@O@
 
 WIN32OBJS =    win32/condition.@O@ win32/dir.@O@ win32/file.@O@ \
                win32/fsaccess.@O@ win32/once.@O@ win32/stdtime.@O@ \

diff --git a/lib/export/isc/nothreads/Makefile.in b/lib/export/isc/nothreads/Makefile.in
index e1bd566346337b0a2e69917541d4b78bfe7c9d46..fe55571d484c0c48dc8a24cc854efb4a9678abe0 100644 (file)
--- a/lib/export/isc/nothreads/Makefile.in
+++ b/lib/export/isc/nothreads/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
+# $Id: Makefile.in,v 1.4 2010/06/09 01:43:08 marka Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/isc/nothreads
@@ -28,9 +28,11 @@ CINCLUDES =  -I${srcdir}/include \
 CDEFINES =
 CWARNINGS =
 
-OBJS =         condition.@O@ mutex.@O@ thread.@O@
+THREADOPTOBJS = condition.@O@ mutex.@O@
+OBJS =         @THREADOPTOBJS@ thread.@O@
 
-SRCS =         condition.c mutex.c thread.c
+THREADOPTSRCS = condition.c mutex.c
+SRCS =         @THREADOPTSRCS@ thread.c
 
 SUBDIRS =      include
 TARGETS =      ${OBJS}

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 7e5f814514e9c94a705069df60cba092c9cf8249..055b382204852a1f58d17cb58424311205c03cc8 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.108 2010/02/22 23:49:11 tbox Exp $
+# $Id: Makefile.in,v 1.109 2010/06/09 01:43:09 marka Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -41,8 +41,9 @@ UNIXOBJS =    @ISC_ISCIPV6_O@ \
 
 NLSOBJS =      nls/msgcat.@O@
 
-THREADOBJS =   @ISC_THREAD_DIR@/condition.@O@ @ISC_THREAD_DIR@/mutex.@O@ \
-               @ISC_THREAD_DIR@/thread.@O@
+THREADOPTOBJS = @ISC_THREAD_DIR@/condition.@O@ @ISC_THREAD_DIR@/mutex.@O@
+
+THREADOBJS =   @THREADOPTOBJS@ @ISC_THREAD_DIR@/thread.@O@
 
 WIN32OBJS =    win32/condition.@O@ win32/dir.@O@ win32/file.@O@ \
                win32/fsaccess.@O@ win32/once.@O@ win32/stdtime.@O@ \

diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index ad2b253579596336a13eacb37d3f8f8f5c0ed3f0..9335b0307085e853fcbd822760b2e7e6798af2c6 100644 (file)
--- a/lib/isc/nothreads/Makefile.in
+++ b/lib/isc/nothreads/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2009/12/05 23:31:41 each Exp $
+# $Id: Makefile.in,v 1.11 2010/06/09 01:43:09 marka Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/isc/nothreads
@@ -28,9 +28,11 @@ CINCLUDES =  -I${srcdir}/include \
 CDEFINES =
 CWARNINGS =
 
-OBJS =         condition.@O@ mutex.@O@ thread.@O@
+THREADOPTOBJS = condition.@O@ mutex.@O@
+OBJS =         @THREADOPTOBJS@ thread.@O@
 
-SRCS =         condition.c mutex.c thread.c
+THREADOPTSRCS = condition.c mutex.c
+SRCS =         @THREADOPTSRCS@ thread.c
 
 SUBDIRS =      include
 TARGETS =      ${OBJS}