When --disable-threads is passed, use "nothreads" instead of "pthreads" in

the build process.

configure.in

@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.182 $)
+AC_REVISION($Revision: 1.183 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -479,12 +479,17 @@ Please install the devel/unproven-pthreads package and rerun configure.
 			;;
 		esac
 	fi
-
+	thread_dir=pthreads
+else
+	thread_dir=nothreads
 fi
 # 
 # End of pthreads stuff.
 #
 
+ISC_THREAD_DIR=$thread_dir
+AC_SUBST(ISC_THREAD_DIR)
+
 #
 # NLS
 #
@@ -1137,9 +1142,9 @@ AC_OUTPUT(
 	lib/isc/unix/include/Makefile
 	lib/isc/unix/include/isc/Makefile
 	lib/isc/nls/Makefile
-	lib/isc/pthreads/Makefile
-	lib/isc/pthreads/include/Makefile
-	lib/isc/pthreads/include/isc/Makefile
+	lib/isc/$thread_dir/Makefile
+	lib/isc/$thread_dir/include/Makefile
+	lib/isc/$thread_dir/include/isc/Makefile
 	lib/dns/Makefile
 	lib/dns/include/Makefile
 	lib/dns/include/dns/Makefile

lib/isc/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.64 2000/08/01 01:29:12 tale Exp $
+# $Id: Makefile.in,v 1.65 2000/08/29 18:23:58 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -24,7 +24,7 @@ top_srcdir =	@top_srcdir@
 @LIBISC_API@
 
 CINCLUDES =	-I${srcdir}/unix/include \
-		-I${srcdir}/pthreads/include \
+		-I${srcdir}/@ISC_THREAD_DIR@/include \
 		-I./include \
 		-I${srcdir}/include
 CDEFINES =
@@ -41,7 +41,7 @@ UNIXOBJS =	@ISC_ISCIPV6_O@ \
 
 NLSOBJS =	nls/msgcat.@O@
 
-PTHREADOBJS =	pthreads/condition.@O@ pthreads/thread.@O@
+THREADOBJS =	@ISC_THREAD_DIR@/condition.@O@ @ISC_THREAD_DIR@/thread.@O@
 
 WIN32OBJS = 	win32/condition.@O@ win32/dir.@O@ win32/file.@O@ \
 		win32/fsaccess.@O@ win32/once.@O@ win32/stdtime.@O@ \
@@ -58,7 +58,7 @@ OBJS =		@ISC_EXTRA_OBJS@ \
 		ratelimiter.@O@ result.@O@ rwlock.@O@ \
 		serial.@O@ sha1.@O@ sockaddr.@O@ string.@O@ symtab.@O@ \
 		task.@O@ taskpool.@O@ timer.@O@ version.@O@ \
-		${UNIXOBJS} ${NLSOBJS} ${PTHREADOBJS}
+		${UNIXOBJS} ${NLSOBJS} ${THREADOBJS}
 
 # Alphabetically
 SRCS =		@ISC_EXTRA_SRCS@ \
@@ -74,7 +74,7 @@ SRCS =		@ISC_EXTRA_SRCS@ \
 
 LIBS =		@LIBS@
 
-SUBDIRS =	include unix nls pthreads
+SUBDIRS =	include unix nls @ISC_THREAD_DIR@
 TARGETS =	timestamp
 
 @BIND9_MAKE_RULES@

lib/isc/unix/Makefile.in

@@ -13,14 +13,14 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.31 2000/08/01 01:31:10 tale Exp $
+# $Id: Makefile.in,v 1.32 2000/08/29 18:23:59 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
 CINCLUDES =	-I${srcdir}/include \
-		-I${srcdir}/../pthreads/include \
+		-I${srcdir}/../@ISC_THREAD_DIR@/include \
 		-I../include \
 		-I${srcdir}/../include \
 		-I${srcdir}/..

make/includes.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: includes.in,v 1.9 2000/08/01 01:33:20 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,
 # and for normal headers in the source tree (${top_srcdir}).
@@ -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 \