2805. [bug] Fixed namespace problems encountered when building

			external programs using non-exported BIND9 libraries
			(i.e., built without --enable-exportlib). [RT #20679]

diff --git a/CHANGES b/CHANGES
index 4db91ab469cc69e35d97fea255e56fa41dd8ab39..4f7ddf6b382c9b45b1759849624d4d79f0a248db 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2805.  [bug]           Fixed namespace problems encountered when building
+                       external programs using non-exported BIND9 libraries
+                       (i.e., built without --enable-exportlib). [RT #20679]
+
 2804.  [bug]           Send notifies when a zone is signed with "rndc sign"
                        or as a result of a scheduled key change. [RT #20700]
 

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index b586b5badcfabfcf28bb5d061594bacc9b8a6032..403933b2ed7d4ce74ed58e4b8739c3e7ce9013ac 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/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.35 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -26,7 +26,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
                ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9 -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
+CDEFINES =     -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index ed790a01ce7018258e2859cdabd300164a96ffb3..64ddf760a067b2482704d057d5c08d4902e08bfe 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/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.7 2009/09/22 08:47:55 fdupont Exp $
+# $Id: Makefile.in,v 1.8 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
        ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 8945efbb97ad1959da62584184702ef5ec2eb056..19dc61c4353f8ada6e6a1f675cf6fbb330d21598 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/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.46 2009/09/22 08:47:55 fdupont Exp $
+# $Id: Makefile.in,v 1.47 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -26,7 +26,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    -I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
                ${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
 
-CDEFINES =     -DBIND9 -DVERSION=\"${VERSION}\"
+CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 39471eedfe63940064ef244e17065129cb99d211..6bfd162d8d358294ebd1fcc8308fc87393da1ed0 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/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.41 2009/10/05 17:30:49 fdupont Exp $
+# $Id: Makefile.in,v 1.42 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9 -DVERSION=\"${VERSION}\" @USE_PKCS11@
+CDEFINES =     -DVERSION=\"${VERSION}\" @USE_PKCS11@
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 235126a0726931f51c6ebcafcf91499f264ff98f..5562c70cc937a975237b9afade4c176b40b94bcc 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/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 2009/11/05 02:59:04 marka Exp $
+# $Id: Makefile.in,v 1.109 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -45,7 +45,7 @@ CINCLUDES =   -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
                ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
 
-CDEFINES =      -DBIND9 @USE_DLZ@ @USE_PKCS11@
+CDEFINES =      @USE_DLZ@ @USE_PKCS11@
 
 CWARNINGS =
 

diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
index dc1bf2b9c1466d4f648cedea0d6e98c194a351cf..11c14b18c7c8f5da7adba9240e0092928190de6b 100644 (file)
--- a/bin/named/unix/Makefile.in
+++ b/bin/named/unix/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.12 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.13 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -24,7 +24,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    -I${srcdir}/include -I${srcdir}/../include \
                ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 OBJS =         os.@O@

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 5f896a464cc5e011e1361e8029cf130536499536..e86731bedd7581d3af6684ffc1aee0ef20651994 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/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.35 2009/09/22 08:47:55 fdupont Exp $
+# $Id: Makefile.in,v 1.36 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -26,7 +26,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
                ${ISC_INCLUDES} ${ISCCFG_INCLUDES} @DST_GSSAPI_INC@
 
-CDEFINES =     -DBIND9 @USE_GSSAPI@
+CDEFINES =     @USE_GSSAPI@
 CWARNINGS =
 
 LWRESLIBS =    ../../lib/lwres/liblwres.@A@

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 3334e445b6ac3a554e59f4a0caae47d9e907e2db..e67bad7efc59b7938dd8d33231ee1323293e80d6 100644 (file)
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/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.48 2009/09/01 18:40:25 jinmei Exp $
+# $Id: Makefile.in,v 1.49 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -26,7 +26,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
        ${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index f92b3d133ecfddaa411881a40c71dbba508f0745..6c8055b9bc574b9477afff9bc274d00dce08c028 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/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.137 2009/09/01 22:30:28 jinmei Exp $
+# $Id: Makefile.in,v 1.138 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -24,7 +24,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
                ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index 9120510edd4fc75d098b571ad10517606ca5ff51..78c4a93a0cc717dcf67adf9b88916ac28ff40bb1 100644 (file)
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/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.31 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.32 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 72e6e42373622f9367e3ac1c522858a90b4b90ef..7eb069ec416276c4740ec91b8dda2828019e143c 100644 (file)
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/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.49 2009/09/01 00:22:25 jinmei Exp $
+# $Id: Makefile.in,v 1.50 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -24,7 +24,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} \
                ${ISC_INCLUDES} @DST_GSSAPI_INC@
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 8fbe3aa0b273423adcff0c50af82214db6aeec1a..411d91543edffb1cfdef141383e9ea1bc093b8da 100644 (file)
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/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.30 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api

diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index 71b9f9b0ecb40339a80e90b8725c03fc3d63269d..6c9164787b85ab1357ac1e5824515ccddd7b908d 100644 (file)
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/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.36 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.37 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index c901d8d93b23c32903987629f493d173c855875c..e02a795378c58312b699f6707cc41f7cecd89741 100644 (file)
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/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.30 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api

diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in
index 59660f05a7aceb9cb082ae60eb46dc3d305f0195..9c9ec97ada58714d7f018c2e22e802298711ffb5 100644 (file)
--- a/bin/tests/net/Makefile.in
+++ b/bin/tests/net/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.18 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.19 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../../lib/isc/libisc.@A@

diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index fbf3c1d6a5df477124d9d8ba49d38496d683e10f..a23ab02ec8816f5c0e643626f950680c1e1ca309 100644 (file)
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/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.30 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 # Note that we do not want to use libtool for libt_api

diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
index 83b76f11753a06076a892dbf46c4234b1d7be5ad..42c75b53420788e91a4a8cfd72a80e91415ad980 100644 (file)
--- a/bin/tests/sockaddr/Makefile.in
+++ b/bin/tests/sockaddr/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.24 2009/09/01 00:22:25 jinmei Exp $
+# $Id: Makefile.in,v 1.25 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
index d81598c8e5cded87520f026853ccb9bde003b48f..b45a46a6de16730bbd1b44cd4f242a2aebb0e81d 100644 (file)
--- a/bin/tests/system/lwresd/Makefile.in
+++ b/bin/tests/system/lwresd/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.21 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.22 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${LWRES_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 LWRESLIBS =    ../../../../lib/lwres/liblwres.@A@

diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index 84996c0a288a346e329e1aec3584c7a22a6f19c9..d8672c7b124590646c81185c80ddc68563b2188a 100644 (file)
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/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.13 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.14 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index 8806b6a80835529130e49d3223cd9b7ee0f4edbc..4aadc3a99ef84b5102620b08eb1a9c94927bd923 100644 (file)
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/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.33 2009/09/01 00:22:26 jinmei Exp $
+# $Id: Makefile.in,v 1.34 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index 7924067796e835c489881926abb96e60938cc32d..6498ca788762a15fd08b7724e5579971a87f232d 100644 (file)
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/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.31 2009/09/01 00:22:26 jinmei Exp $
+# $Id: Makefile.in,v 1.32 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${TEST_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 7d6c9c055913253c1d7ff96d2b329da9df955c4a..6e1cab4c0dbfb4f21eb2d8ce5bce1bf1a83c5372 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/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.10 2009/12/04 21:59:23 marka Exp $
+# $Id: Makefile.in,v 1.11 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
                ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in
index f0e20c294ccdca15004890a34bf669b3cf568b96..1fef2c7266f579f5b968218c95f7f29c73752c0f 100644 (file)
--- a/contrib/dlz/bin/dlzbdb/Makefile.in
+++ b/contrib/dlz/bin/dlzbdb/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 2009/09/01 00:22:26 jinmei Exp $
+# $Id: Makefile.in,v 1.5 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -28,7 +28,7 @@ DLZINCLUDES = @DLZ_DRIVER_INCLUDES@
 CINCLUDES =    -I${srcdir}/include -I${srcdir}/unix/include \
                 ${ISC_INCLUDES} ${DLZINCLUDES}
 
-CDEFINES =      -DBIND9 @USE_DLZ@
+CDEFINES =      @USE_DLZ@
 CWARNINGS =
 
 DLZLIBS =      @DLZ_DRIVER_LIBS@

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index 91e20836324a2956782e4c1c6072e203aa5de523..35c40223cdb8c778a1ae95b54356e207110183e4 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/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.13 2009/09/02 23:48:01 tbox Exp $
+# $Id: Makefile.in,v 1.14 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -28,7 +28,7 @@ top_srcdir =  @top_srcdir@
 CINCLUDES =    -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
                ${ISCCFG_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../lib/isc/libisc.@A@

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 548b32ed8747359f2aacac2dc450e9de714b45b7..2290ab4072a7c1f64b188a9cafca4742a0ff5b62 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.168 2009/10/08 23:13:06 marka Exp $
+# $Id: Makefile.in,v 1.169 2009/12/05 23:31:40 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -34,8 +34,7 @@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
 CINCLUDES =    -I. -Iinclude ${DNS_INCLUDES} \
                ${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 
-CDEFINES =     -DBIND9 -DUSE_MD5 @USE_OPENSSL@ @USE_GSSAPI@ \
-               ${USE_ISC_SPNEGO}
+CDEFINES =     -DUSE_MD5 @USE_OPENSSL@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 
 CWARNINGS =
 

diff --git a/lib/export/dns/Makefile.in b/lib/export/dns/Makefile.in
index 9d0cce2ec468f89d4f85f997aad892c3d7a5ceb8..7445e303e1fa65c79bbd6d7bb58cbbc0e28c2fa7 100644 (file)
--- a/lib/export/dns/Makefile.in
+++ b/lib/export/dns/Makefile.in
@@ -12,10 +12,11 @@
 # 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 2009/12/05 23:31:40 each Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/dns
+export_srcdir =        @top_srcdir@/lib/export
 
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
@@ -27,7 +28,7 @@ srcdir =      @top_srcdir@/lib/dns
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    -I. -Iinclude ${DNS_INCLUDES} \
+CINCLUDES =    -I. -Iinclude ${DNS_INCLUDES} -I${export_srcdir}/isc/include \
                ${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 
 CDEFINES =     -DUSE_MD5 @USE_OPENSSL@ @USE_GSSAPI@

diff --git a/lib/export/irs/Makefile.in b/lib/export/irs/Makefile.in
index 2cdc5818b03a279183a8e551d9e220f1e5151e30..58a9b212ab20033e1c36ce9a5f06ef98b740bd73 100644 (file)
--- a/lib/export/irs/Makefile.in
+++ b/lib/export/irs/Makefile.in
@@ -12,10 +12,11 @@
 # 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 2009/12/05 23:31:40 each Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/irs
+export_srcdir =        @top_srcdir@/lib/export
 
 @BIND9_VERSION@
 
@@ -25,7 +26,7 @@ srcdir =      @top_srcdir@/lib/irs
 
 CINCLUDES =    -I. -I./include -I${srcdir}/include \
                ${ISCCFG_INCLUDES} -I../dns/include ${DNS_INCLUDES} \
-               ${ISC_INCLUDES}
+               -I${export_srcdir}/isc/include ${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 

diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in
index 52f6b37b1f404df1fee8c9b768470c45d47f93ad..ca199818ee14c962b3906b32bf605fffcb3096a5 100644 (file)
--- a/lib/export/isc/Makefile.in
+++ b/lib/export/isc/Makefile.in
@@ -12,10 +12,11 @@
 # 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/09/03 20:28:46 each Exp $
+# $Id: Makefile.in,v 1.5 2009/12/05 23:31:41 each Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/isc
+export_srcdir =        @top_srcdir@/lib/export
 
 @BIND9_VERSION@
 
@@ -24,7 +25,8 @@ srcdir =      @top_srcdir@/lib/isc
 CINCLUDES =    -I${srcdir}/unix/include \
                -I${srcdir}/@ISC_THREAD_DIR@/include \
                -I${srcdir}/@ISC_ARCH_DIR@/include \
-               -I${srcdir}/include @ISC_OPENSSL_INC@
+               -I${export_srcdir}/isc/include -I${srcdir}/include \
+               @ISC_OPENSSL_INC@
 CDEFINES =     @USE_OPENSSL@ -DUSE_APPIMPREGISTER -DUSE_MEMIMPREGISTER \
                -DUSE_SOCKETIMPREGISTER -DUSE_TASKIMPREGISTER \
                -DUSE_TIMERIMPREGISTER

diff --git a/lib/export/isc/include/isc/Makefile.in b/lib/export/isc/include/isc/Makefile.in
index 1e0ff001ead184516abc87cb6ee072ca2a5f60ad..249918535d435185df8126f2569d4cc1e569fa46 100644 (file)
--- a/lib/export/isc/include/isc/Makefile.in
+++ b/lib/export/isc/include/isc/Makefile.in
@@ -12,10 +12,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $
+# $Id: Makefile.in,v 1.3 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 top_srcdir =   @top_srcdir@
+export_srcdir =        @top_srcdir@/lib/export
 
 @BIND9_VERSION@
 
@@ -24,8 +25,8 @@ top_srcdir =  @top_srcdir@
 # machine generated.  The latter are handled specially in the
 # install target below.
 #
-HEADERS =      app.h assertions.h base64.h bitstring.h boolean.h buffer.h \
-               bufferlist.h commandline.h entropy.h error.h event.h \
+HEADERS =      app.h assertions.h base64.h bitstring.h boolean.h \
+               buffer.h bufferlist.h commandline.h entropy.h error.h event.h \
                eventclass.h file.h formatcheck.h fsaccess.h \
                hash.h heap.h hex.h hmacmd5.h \
                httpd.h \
@@ -58,6 +59,8 @@ install:: installdirs
        ${DESTDIR}${export_includedir}/isc
        ${INSTALL_DATA} ${top_srcdir}/lib/isc/@ISC_ARCH_DIR@/include/isc/atomic.h \
        ${DESTDIR}${export_includedir}/isc
+       ${INSTALL_DATA} ${export_srcdir}/isc/include/isc/bind9.h \
+       ${DESTDIR}${export_includedir}/isc
 
 distclean::
        rm -f platform.h

diff --git a/lib/export/isc/include/isc/bind9.h b/lib/export/isc/include/isc/bind9.h
new file mode 100644 (file)
index 0000000..e96789b
--- /dev/null
+++ b/lib/export/isc/include/isc/bind9.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 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.
+ */
+
+/* $Id: bind9.h,v 1.2 2009/12/05 23:31:41 each Exp $ */
+
+#ifndef ISC_BIND9_H
+#define ISC_BIND9_H 1
+
+/*
+ * This determines whether we are building BIND9 or using the exported
+ * libisc/libdns libraries.  The version of this file included in the
+ * standard BIND9 build defines BIND9; the version included with the
+ * exportable libraries does not.
+ */
+#undef BIND9
+
+#endif /* ISC_BIND9_H */

diff --git a/lib/export/isccfg/Makefile.in b/lib/export/isccfg/Makefile.in
index d15b6433b0790ed52bd0539d443cfe90a9193973..c5bd997358bef8ff20b87e923db6306424bd8282 100644 (file)
--- a/lib/export/isccfg/Makefile.in
+++ b/lib/export/isccfg/Makefile.in
@@ -12,10 +12,11 @@
 # 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 2009/12/05 23:31:41 each Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/isccfg
+export_srcdir =        @top_srcdir@/lib/export
 
 @BIND9_VERSION@
 
@@ -23,7 +24,8 @@ srcdir =      @top_srcdir@/lib/isccfg
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
+CINCLUDES =    -I. ${DNS_INCLUDES} -I${export_srcdir}/isc/include \
+               ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/export/samples/Makefile.in b/lib/export/samples/Makefile.in
index 4ab0286cd57ff43ebb0d4d2846806ddd9ee778f8..c60baac509685afdc78307108bf9328ed1abe595 100644 (file)
--- a/lib/export/samples/Makefile.in
+++ b/lib/export/samples/Makefile.in
@@ -12,16 +12,18 @@
 # 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 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 top_srcdir =   @top_srcdir@
+export_srcdir =        @top_srcdir@/lib/export
 
 @BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I${srcdir}/include -I../dns/include \
+               -I${export_srcdir}/isc/include \
                ${DNS_INCLUDES} ${ISC_INCLUDES} \
                -I${top_srcdir}/lib/irs/include
 

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 15f5a7dc3bdc88e0d04223ab4d0cfa1fa81679ba..614b3d9f6ebeb1b54ca44b0bae86003e02a8c67e 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.103 2009/09/04 18:13:44 jinmei Exp $
+# $Id: Makefile.in,v 1.104 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -28,7 +28,7 @@ CINCLUDES =   -I${srcdir}/unix/include \
                -I${srcdir}/@ISC_ARCH_DIR@/include \
                -I./include \
                -I${srcdir}/include @ISC_OPENSSL_INC@
-CDEFINES =     -DBIND9 @USE_OPENSSL@
+CDEFINES =     @USE_OPENSSL@
 CWARNINGS =
 
 # Alphabetically

diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 65828b14b45c6ed29ee78d730129cd67394a63a3..a4b117ceedb37835476d0e8684a07c9836996d20 100644 (file)
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/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.67 2009/11/30 21:34:57 marka Exp $
+# $Id: Makefile.in,v 1.68 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -26,8 +26,8 @@ top_srcdir =  @top_srcdir@
 # machine generated.  The latter are handled specially in the
 # install target below.
 #
-HEADERS =      app.h assertions.h base64.h bitstring.h boolean.h buffer.h \
-               bufferlist.h commandline.h entropy.h error.h event.h \
+HEADERS =      app.h assertions.h base64.h bind9.h bitstring.h boolean.h \
+               buffer.h bufferlist.h commandline.h entropy.h error.h event.h \
                eventclass.h file.h formatcheck.h fsaccess.h \
                hash.h heap.h hex.h hmacmd5.h \
                httpd.h \

diff --git a/lib/isc/include/isc/bind9.h b/lib/isc/include/isc/bind9.h
new file mode 100644 (file)
index 0000000..00bcb24
--- /dev/null
+++ b/lib/isc/include/isc/bind9.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 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.
+ */
+
+/* $Id: bind9.h,v 1.2 2009/12/05 23:31:41 each Exp $ */
+
+#ifndef ISC_BIND9_H
+#define ISC_BIND9_H 1
+
+/*
+ * This determines whether we are building BIND9 or using the exported
+ * libisc/libdns libraries.  The version of this file included in the
+ * standard BIND9 build defines BIND9; the version included with the
+ * exportable libraries does not.
+ */
+#define BIND9 1
+
+#endif /* ISC_BIND9_H */

diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 906bad176fc9adc6970608181828444b4d275778..019023152cd5d88335c3d4560bb119e607d21e47 100644 (file)
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -15,11 +15,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.51 2009/10/01 01:30:01 sar Exp $ */
+/* $Id: types.h,v 1.52 2009/12/05 23:31:41 each Exp $ */
 
 #ifndef ISC_TYPES_H
 #define ISC_TYPES_H 1
 
+#include <isc/bind9.h>
 #include <isc/namespace.h>
 
 /*! \file isc/types.h

diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index 8302a927bb2210a5abc569c986dbfedb0a6fc270..aca4a273ecf70eef5b4248f1c5a5ff2eed014d35 100644 (file)
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/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.16 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.17 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -24,7 +24,7 @@ CINCLUDES =   -I../unix/include \
                -I../include \
                -I${srcdir}/../include
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 OBJS =         msgcat.@O@

diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index eef176522effc22d2bd893f783348087f061c415..ad2b253579596336a13eacb37d3f8f8f5c0ed3f0 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.9 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.10 2009/12/05 23:31:41 each Exp $
 
 top_srcdir =   @top_srcdir@
 srcdir =       @top_srcdir@/lib/isc/nothreads
@@ -25,7 +25,7 @@ CINCLUDES =   -I${srcdir}/include \
                -I${srcdir}/../include \
                -I${srcdir}/..
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 OBJS =         condition.@O@ mutex.@O@ thread.@O@

diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index 2cbda99fc4709a1dd2d64a9ca7cd8aa13a22dab4..d6e7c760bbced1746f0d76ebbef42ce23bbe940b 100644 (file)
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/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.21 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.22 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ CINCLUDES =   -I${srcdir}/include \
                -I${srcdir}/../include \
                -I${srcdir}/..
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 OBJS =         condition.@O@ mutex.@O@ thread.@O@

diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index d47e5726a71160b6953fea35ee6790a9bf05ce63..9884ca90c78d40250afb7f8b3553d687ce6ed156 100644 (file)
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/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.43 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.44 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ CINCLUDES =   -I${srcdir}/include \
                -I${srcdir}/../include \
                -I${srcdir}/..
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 # Alphabetically

diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index acfbf32bc9b2dd415dd5cb4ce5bae741cea5c73f..3396db1e35721af57c5311bd8199352b8d71bc0f 100644 (file)
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/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.13 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.14 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -23,7 +23,7 @@ CINCLUDES =   -I${srcdir}/.. \
                -I./include \
                -I${srcdir}/include \
                -I${srcdir}/../include
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 # Alphabetically

diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 31713e1abc165615d78dc557190ba43cca2881c2..297d9e37ff732fad6a978a626017f92858bdd17a 100644 (file)
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/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.11 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.12 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -27,7 +27,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCC_INCLUDES}
 
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../lib/isc/libisc.@A@

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index d7dbb65a3e9bbba9cc6b7697803f0b75a77eb0d9..2f1547650cfa7ff44f55b205bb6de9ebc02c0a17 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/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.20 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.21 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -27,7 +27,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
 
-CDEFINES =     -DBIND9 @USE_DLZ@
+CDEFINES =     @USE_DLZ@
 CWARNINGS =
 
 ISCLIBS =      ../../lib/isc/libisc.@A@

diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index b336c9f3e8fb9a6be32105767b27f8a2d4d849bc..105d567da3329b9b372f18e76334889046c3d7d7 100644 (file)
--- a/lib/tests/Makefile.in
+++ b/lib/tests/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.27 2009/09/02 23:48:03 tbox Exp $
+# $Id: Makefile.in,v 1.28 2009/12/05 23:31:41 each Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -22,7 +22,7 @@ top_srcdir =  @top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${TEST_INCLUDES}
-CDEFINES =     -DBIND9
+CDEFINES =
 CWARNINGS =
 
 ISCLIBS =      ../../lib/isc/libisc.@A@