2915. [cleanup] Be smarter about which objects we attempt to compile

                        based on configure options. [RT #21444]

diff --git a/CHANGES b/CHANGES
index 485b50089c7c3de8fec925739362b263d277d5b1..a17e51a47627016284701d7ee2e8a97f07b2b87b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2915.  [cleanup]       Be smarter about which objects we attempt to compile
+                       based on configure options. [RT #21444]
+
 2914.  [bug]           Make the "autosign" system test more portable.
                        [RT #20997]
 

diff --git a/configure b/configure
index dca6ddc8bf15ded92e459a08307a41ae3ae43528..392cb7b3d8152b29660c7ba4ca56956455290e22 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.473.22.7 2010/06/03 13:28:35 marka Exp $
+# $Id: configure,v 1.473.22.8 2010/06/09 01:51:37 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.489.22.8 .
+# From configure.in Revision: 1.489.22.9 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.62.
 #
@@ -915,6 +915,8 @@ ISC_PLATFORM_NEEDSYSSELECTH
 LWRES_PLATFORM_NEEDSYSSELECTH
 USE_OPENSSL
 DST_OPENSSL_INC
+OPENSSLLINKOBJS
+OPENSSLLINKSRCS
 ISC_PLATFORM_OPENSSLHASH
 ISC_OPENSSL_INC
 USE_PKCS11
@@ -929,6 +931,8 @@ DNS_GSSAPI_LIBS
 DNS_CRYPTO_LIBS
 ALWAYS_DEFINES
 ISC_PLATFORM_USETHREADS
+THREADOPTOBJS
+THREADOPTSRCS
 ISC_THREAD_DIR
 MKDEPCC
 MKDEPCFLAGS
@@ -4090,7 +4094,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4093 "configure"' > conftest.$ac_ext
+  echo '#line 4097 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7088,11 +7092,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7091: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7095: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7095: \$? = $ac_status" >&5
+   echo "$as_me:7099: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7378,11 +7382,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7381: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7385: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7385: \$? = $ac_status" >&5
+   echo "$as_me:7389: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7482,11 +7486,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7485: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7489: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7489: \$? = $ac_status" >&5
+   echo "$as_me:7493: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9882,7 +9886,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9885 "configure"
+#line 9889 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9982,7 +9986,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9985 "configure"
+#line 9989 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12395,11 +12399,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12398: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12402: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12402: \$? = $ac_status" >&5
+   echo "$as_me:12406: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12499,11 +12503,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12502: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12506: \$? = $ac_status" >&5
+   echo "$as_me:12510: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14082,11 +14086,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14085: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14089: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14089: \$? = $ac_status" >&5
+   echo "$as_me:14093: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14186,11 +14190,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14193: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14193: \$? = $ac_status" >&5
+   echo "$as_me:14197: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16405,11 +16409,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16408: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16412: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16412: \$? = $ac_status" >&5
+   echo "$as_me:16416: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16695,11 +16699,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16698: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16702: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16702: \$? = $ac_status" >&5
+   echo "$as_me:16706: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16799,11 +16803,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16802: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16806: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16806: \$? = $ac_status" >&5
+   echo "$as_me:16810: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23167,10 +23171,14 @@ case "$use_openssl" in
 $as_echo "no" >&6; }
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLLINKOBJS=""
+               OPENSSLLINKSRCS=""
                ;;
        auto)
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLLINKOBJS=""
+               OPENSSLLINKSRCS=""
                { { $as_echo "$as_me:$LINENO: error: OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
 If you don't want OpenSSL, use --without-openssl" >&5
 $as_echo "$as_me: error: OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
@@ -23620,6 +23628,8 @@ done
 
                CFLAGS="$saved_cflags"
                LIBS="$saved_libs"
+               OPENSSLLINKOBJS='${OPENSSLLINKOBJS}'
+               OPENSSLLINKSRCS='${OPENSSLLINKSRCS}'
 
                ;;
 esac
@@ -23631,6 +23641,8 @@ esac
 
 
 
+
+
 DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
 
 #
@@ -25366,6 +25378,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
@@ -26197,11 +26211,15 @@ fi
 else
        ISC_PLATFORM_USETHREADS="#undef ISC_PLATFORM_USETHREADS"
        thread_dir=nothreads
+       THREADOPTOBJS=""
+       THREADOPTSRCS=""
        ALWAYS_DEFINES=""
 fi
 
 
 
+
+
 ISC_THREAD_DIR=$thread_dir
 
 

diff --git a/configure.in b/configure.in
index e386e0a42a4ce691e060361f3ca0e61866f86a0c..4803deb6c06ed13c4a42cce4e0e5839ec6c72083 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.489.22.8 $)
+AC_REVISION($Revision: 1.489.22.9 $)
 
 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..86684deffefe5509b58da6f6ba0bbd23f7c29188 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.169.2.1 2010/06/09 01:50:01 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..25d5137fc66049923e85ad31ad84490aa355c439 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.4.2.1 2010/06/09 01:50:01 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..b2608d3aae5b866f3dc38551298f240f07bbcd93 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.5.2.1 2010/06/09 01:50:01 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..68a463fa87fb5d8672cad43457d65b14442b46a8 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.3.104.1 2010/06/09 01:50:01 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 32dd7c14411bc2727c2e01b7187ffcfab3c51997..b0604131f7326a862f76483dfd79c02ef0e023e8 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.104.2.3 2010/02/22 23:48:29 tbox Exp $
+# $Id: Makefile.in,v 1.104.2.4 2010/06/09 01:50:01 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..7cae5e68e1f36617f582aacdc532eb85a4c33a07 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.10.2.1 2010/06/09 01:50:01 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}