9.1.0b1

4 files changed, 45 insertions, 43 deletions

diff --git a/make/Makefile.in b/make/Makefile.in
index cd216e05..923926d7 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,19 +1,19 @@
 # Copyright (C) 1998-2000  Internet Software Consortium.
-# 
+#
 # Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM 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.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM 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: Makefile.in,v 1.10 2000/06/22 22:00:27 tale Exp $
+# $Id: Makefile.in,v 1.12 2000/08/01 01:33:19 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/make/includes.in b/make/includes.in
index c96d194e..8694ec75 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -1,21 +1,21 @@
 # Copyright (C) 1999, 2000  Internet Software Consortium.
-# 
+#
 # Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM 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.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM 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: includes.in,v 1.7 2000/06/22 22:00:29 tale Exp $
+# $Id: includes.in,v 1.10 2000/08/29 18:24:01 bwelling Exp $
 
-# Search for machine-generated header files in the build tree, 
+# Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).
 # We only need to look in OS-specific subdirectories for the
 # latter case, because there are no machine-generated OS-specific
@@ -25,7 +25,7 @@ ISC_INCLUDES = @BIND9_ISC_BUILDINCLUDE@ \
 	-I${top_srcdir}/lib/isc \
 	-I${top_srcdir}/lib/isc/include \
 	-I${top_srcdir}/lib/isc/unix/include \
-	-I${top_srcdir}/lib/isc/pthreads/include
+	-I${top_srcdir}/lib/isc/@ISC_THREAD_DIR@/include
 
 DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
 	-I${top_srcdir}/lib/dns/include \
diff --git a/make/mkdep.in b/make/mkdep.in
index 858b1725..60aea6fc 100644
--- a/make/mkdep.in
+++ b/make/mkdep.in
@@ -4,7 +4,7 @@
 ## -
 ## Copyright (c) 1987 Regents of the University of California.
 ## All rights reserved.
-## 
+##
 ## Redistribution and use in source and binary forms, with or without
 ## modification, are permitted provided that the following conditions
 ## are met:
@@ -33,14 +33,14 @@
 ## SUCH DAMAGE.
 ## -
 ## Portions Copyright (c) 1993 by Digital Equipment Corporation.
-## 
+##
 ## Permission to use, copy, modify, and 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, and that
 ## the name of Digital Equipment Corporation not be used in advertising or
 ## publicity pertaining to distribution of the document or software without
 ## specific, written prior permission.
-## 
+##
 ## THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 ## WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 ## OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/make/rules.in b/make/rules.in
index 2198f1d0..ab23a59b 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,19 +1,19 @@
 # Copyright (C) 1998-2000  Internet Software Consortium.
-# 
+#
 # Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM 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: rules.in,v 1.19 2000/06/22 22:00:30 tale Exp $
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM 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: rules.in,v 1.23 2000/11/09 17:49:37 gson Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -60,12 +60,12 @@ ALL_SUBDIRS = ${SUBDIRS} nulldir
 # We use a single-colon rule so that additional dependencies of
 # subdirectories can be specified after the inclusion of this file.
 # The "depend" target is treated the same way.
-# 
+#
 subdirs:
 	@for i in ${ALL_SUBDIRS}; do \
 		if [ "$$i" != "nulldir" -a -d $$i ]; then \
 			echo "making all in `pwd`/$$i"; \
-			(cd $$i; ${MAKE} ${MAKEDEFS} all); \
+			(cd $$i; ${MAKE} ${MAKEDEFS} all) || exit 1; \
 		fi \
 	done
 
@@ -73,7 +73,7 @@ install clean distclean::
 	@for i in ${ALL_SUBDIRS}; do \
 		if [ "$$i" != "nulldir" -a -d $$i ]; then \
 			echo "making $@ in `pwd`/$$i"; \
-			(cd $$i; ${MAKE} ${MAKEDEFS} $@); \
+			(cd $$i; ${MAKE} ${MAKEDEFS} $@) || exit 1; \
 		fi \
 	done
 
@@ -119,6 +119,8 @@ LIBTOOL = @LIBTOOL@
 
 MKDEP = ${SHELL} ${top_builddir}/make/mkdep
 
+cleandir: distclean
+
 clean distclean::
 	rm -f *.@O@ *.lo *.la core *.core
 	rm -rf .libs
@@ -130,7 +132,7 @@ depend:
 	@for i in ${ALL_SUBDIRS}; do \
 		if [ "$$i" != "nulldir" -a -d $$i ]; then \
 			echo "making depend in `pwd`/$$i"; \
-			(cd $$i; ${MAKE} ${MAKEDEFS} $@); \
+			(cd $$i; ${MAKE} ${MAKEDEFS} $@) || exit 1; \
 		fi \
 	done
 	@if [ X"${SRCS}" != X -a X"${PSRCS}" != X ] ; then \