* README:

	* generic/tcl.h:
	* tools/tcl.wse.in:
	* unix/configure.in:
	* unix/tcl.spec:
	* win/configure.in:
	* win/README.binary: bumped version to 8.3.1

	* win/tcl.hpj.in: updated copyright date

	* generic/tclEnv.c: environment support for Mac OS/X
	* unix/tclUnixPort.h: environment support for Mac OS/X
	* unix/tclLoadDyld.c: new file for Mac OS/X dl functions
	* unix/Makefile.in: added install-strip target; bindir, libdir,
	mandir, includedir vars; tclLoadDyld.c target [Bug: 2527]

	* unix/tclUnixChan.c (CreateSocket): force a socket back into
	blocking mode (default state) after a -async connect succeeds.
	[Bug: 4388]

	* generic/tclEvent.c (TclInitSubsystems): Moved tclLibraryPath to
	thread-local storage to prevent thread-related race condition.
	[Bug: 5033]
	* unix/tclAppInit.c (main): removed #ifdef TCL_TEST that sets the
	library path as it was unnecessary and conflicts with move of
	tclLibraryPath to thread-local storage.

1 files changed, 83 insertions, 71 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 7b5d57b..d2c828f 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.61 2000/04/05 00:42:38 welch Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.62 2000/04/19 08:32:45 hobbs Exp $
 
 VERSION 		= @TCL_VERSION@
 
@@ -20,10 +20,15 @@ VERSION 		= @TCL_VERSION@
 # specific files (exec_prefix) and machine-independent files such
 # as scripts (prefix).  The values specified here may be overridden
 # at configure-time with the --exec-prefix and --prefix options
-# to the "configure" script.
+# to the "configure" script.  The *dir vars are standard configure
+# substitutions that are based off prefix and exec_prefix.
 
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
+bindir			= @bindir@
+libdir			= @libdir@
+includedir		= @includedir@
+mandir			= @mandir@
 
 # The following definition can be set to non-null for special systems
 # like AFS with replication.  It allows the pathnames used for installation
@@ -32,37 +37,38 @@ exec_prefix		= @exec_prefix@
 # when installing files.
 INSTALL_ROOT		=
 
-TCL_LIBRARY =		$(prefix)/lib/tcl$(VERSION)
+# Path for the platform independent Tcl scripting libraries:
+TCL_LIBRARY		= $(prefix)/lib/tcl$(VERSION)
 
 # Path to use at runtime to refer to LIB_INSTALL_DIR:
-LIB_RUNTIME_DIR = $(exec_prefix)/lib
+LIB_RUNTIME_DIR		= $(libdir)
 
 # Directory in which to install the program tclsh:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR		= $(INSTALL_ROOT)$(bindir)
 
 # Directory in which to install libtcl.so or libtcl.a:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR		= $(INSTALL_ROOT)$(libdir)
 
 # Path name to use when installing library scripts.  Don't
 # include $(prefix) here since it's already part of $(TCL_LIBRARY)
-SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
+SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
 
 # Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 
 # Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)@mandir@
+MAN_INSTALL_DIR		= $(INSTALL_ROOT)$(mandir)
 
 # Directory in which to install manual entry for tclsh:
-MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
+MAN1_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man1
 
 # Directory in which to install manual entries for Tcl's C library
 # procedures:
-MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
+MAN3_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man3
 
 # Directory in which to install manual entries for the built-in
 # Tcl commands:
-MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
+MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/mann
 
 # Package search path.
 TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
@@ -79,23 +85,23 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
 
 # To change the compiler switches, for example to change from optimization to
 # debugging symbols, change the following line:
-#CFLAGS = 		$(CFLAGS_DEBUG)
-#CFLAGS = 		$(CFLAGS_OPTIMIZE)
-#CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@
+#CFLAGS			= $(CFLAGS_DEBUG)
+#CFLAGS			= $(CFLAGS_OPTIMIZE)
+#CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+CFLAGS			= @CFLAGS@
 
 # To disable ANSI-C procedure prototypes reverse the comment characters
 # on the following lines:
-PROTO_FLAGS =
-#PROTO_FLAGS = -DNO_PROTOTYPE
+PROTO_FLAGS		=
+#PROTO_FLAGS		= -DNO_PROTOTYPE
 
 # Mathematical functions like sin and atan2 are enabled for expressions
 # by default.  To disable them, reverse the comment characters on the
 # following pairs of lines:
-MATH_FLAGS =
-#MATH_FLAGS = -DTCL_NO_MATH
-MATH_LIBS = @MATH_LIBS@
-#MATH_LIBS =
+MATH_FLAGS		=
+#MATH_FLAGS		= -DTCL_NO_MATH
+MATH_LIBS		= @MATH_LIBS@
+#MATH_LIBS		=
 
 # If you use the setenv, putenv, or unsetenv procedures to modify
 # environment variables in your application and you'd like those
@@ -124,41 +130,41 @@ NOTIFY_OBJS = tclUnixNotfy.o
 # lines.  Warning:  if you enable memory debugging, you must do it
 # *everywhere*, including all the code that calls Tcl, and you must use
 # ckalloc and ckfree everywhere instead of malloc and free.
-MEM_DEBUG_FLAGS =
-#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG
+MEM_DEBUG_FLAGS		=
+#MEM_DEBUG_FLAGS	= -DTCL_MEM_DEBUG
 
 # To enable support for stubs in Tcl.
-STUB_LIB_FILE = @STUB_LIB_FILE@
+STUB_LIB_FILE		= @STUB_LIB_FILE@
 
-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
-#TCL_STUB_LIB_FILE = libtclstub.a
+TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
+#TCL_STUB_LIB_FILE	= libtclstub.a
 
-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@
-#TCL_STUB_LIB_FLAG = -ltclstub
+TCL_STUB_LIB_FLAG	= @TCL_STUB_LIB_FLAG@
+#TCL_STUB_LIB_FLAG	= -ltclstub
 
 # To enable compilation debugging reverse the comment characters on
 # one of the following lines.
-COMPILE_DEBUG_FLAGS =
-#COMPILE_DEBUG_FLAGS = -DTCL_COMPILE_STATS
-#COMPILE_DEBUG_FLAGS = -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
+COMPILE_DEBUG_FLAGS	=
+#COMPILE_DEBUG_FLAGS	= -DTCL_COMPILE_STATS
+#COMPILE_DEBUG_FLAGS	= -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
 
 # To compile without backward compatibility and deprecated code
 # uncomment the following
-NO_DEPRECATED_FLAGS=
-#NO_DEPRECATED_FLAGS= -DTCL_NO_DEPRECATED
+NO_DEPRECATED_FLAGS	=
+#NO_DEPRECATED_FLAGS	= -DTCL_NO_DEPRECATED
 
 # Some versions of make, like SGI's, use the following variable to
 # determine which shell to use for executing commands:
-SHELL =		/bin/sh
+SHELL			= /bin/sh
 
 # Tcl used to let the configure script choose which program to use
 # for installing, but there are just too many different versions of
 # "install" around;  better to use the install-sh script that comes
 # with the distribution, which is slower but guaranteed to work.
 
-INSTALL =		@srcdir@/install-sh -c
-INSTALL_PROGRAM =	${INSTALL}
-INSTALL_DATA =		${INSTALL} -m 644
+INSTALL			= @srcdir@/install-sh -c
+INSTALL_PROGRAM		= ${INSTALL}
+INSTALL_DATA		= ${INSTALL} -m 644
 
 # The symbols below provide support for dynamic loading and shared
 # libraries.  See configure.in for a description of what the
@@ -166,31 +172,31 @@ INSTALL_DATA =		${INSTALL} -m 644
 # configure script.  You shouldn't normally need to modify any of
 # these definitions by hand.
 
-STLIB_LD = @STLIB_LD@
-SHLIB_LD = @SHLIB_LD@
-SHLIB_CFLAGS = @SHLIB_CFLAGS@
+STLIB_LD		= @STLIB_LD@
+SHLIB_LD		= @SHLIB_LD@
+SHLIB_CFLAGS		= @SHLIB_CFLAGS@
 
-SHLIB_SUFFIX = @SHLIB_SUFFIX@
-#SHLIB_SUFFIX =
+SHLIB_SUFFIX		= @SHLIB_SUFFIX@
+#SHLIB_SUFFIX		=
 
-DLTEST_TARGETS = dltest/pkg5${SHLIB_SUFFIX} dltest/Makefile
+DLTEST_TARGETS		= dltest/pkg5${SHLIB_SUFFIX} dltest/Makefile
 
 # The following symbol is defined to "$(DLTEST_TARGETS)" if dynamic
 # loading is available;  this causes everything in the "dltest"
 # subdirectory to be built when making "tcltest.  If dynamic loading
 # isn't available, configure defines this symbol to an empty string,
 # in which case the shared libraries aren't built.
-BUILD_DLTEST = @BUILD_DLTEST@
-#BUILD_DLTEST =
+BUILD_DLTEST		= @BUILD_DLTEST@
+#BUILD_DLTEST		=
 
-TCL_LIB_FILE = @TCL_LIB_FILE@
-#TCL_LIB_FILE = libtcl.a
+TCL_LIB_FILE		= @TCL_LIB_FILE@
+#TCL_LIB_FILE		= libtcl.a
 
-TCL_LIB_FLAG = @TCL_LIB_FLAG@
-#TCL_LIB_FLAG = -ltcl
+TCL_LIB_FLAG		= @TCL_LIB_FLAG@
+#TCL_LIB_FLAG		= -ltcl
 
-TCL_EXP_FILE = @TCL_EXP_FILE@
-TCL_BUILD_EXP_FILE = @TCL_BUILD_EXP_FILE@
+TCL_EXP_FILE		= @TCL_EXP_FILE@
+TCL_BUILD_EXP_FILE	= @TCL_BUILD_EXP_FILE@
 
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
@@ -198,23 +204,23 @@ TCL_BUILD_EXP_FILE = @TCL_BUILD_EXP_FILE@
 # modify any of this stuff by hand.
 #----------------------------------------------------------------
 
-COMPAT_OBJS =		@LIBOBJS@
+COMPAT_OBJS		= @LIBOBJS@
 
-AC_FLAGS =		@EXTRA_CFLAGS@ @DEFS@
-RANLIB =		@RANLIB@
-SRC_DIR =		@srcdir@
-TOP_DIR =		@srcdir@/..
-GENERIC_DIR = 		$(TOP_DIR)/generic
-COMPAT_DIR =		$(TOP_DIR)/compat
-TOOL_DIR =		$(TOP_DIR)/tools
-UNIX_DIR = 		$(TOP_DIR)/unix
+AC_FLAGS		= @EXTRA_CFLAGS@ @DEFS@
+RANLIB			= @RANLIB@
+SRC_DIR			= @srcdir@
+TOP_DIR			= @srcdir@/..
+GENERIC_DIR		= $(TOP_DIR)/generic
+COMPAT_DIR		= $(TOP_DIR)/compat
+TOOL_DIR		= $(TOP_DIR)/tools
+UNIX_DIR		= $(TOP_DIR)/unix
 # Must be absolute because of the cd dltest $(DLTEST_DIR)/configure below.
-DLTEST_DIR =		@TCL_SRC_DIR@/unix/dltest
+DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
 # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
-TCL_BUILDTIME_LIBRARY=  @TCL_SRC_DIR@/library
+TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
 
-#CC =			purify -best-effort @CC@
-CC =			@CC@
+#CC			= purify -best-effort @CC@
+CC			= @CC@
 
 #----------------------------------------------------------------
 # The information below should be usable as is.  The configure
@@ -223,7 +229,7 @@ CC =			@CC@
 #----------------------------------------------------------------
 
 
-CC_SWITCHES =	${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${GENERIC_DIR} -I${SRC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
 ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} ${ENV_FLAGS} \
@@ -234,9 +240,9 @@ STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
 ${COMPILE_DEBUG_FLAGS} ${ENV_FLAGS} -DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
 
-LIBS =		@DL_LIBS@ @LIBS@ $(MATH_LIBS) -lc
+LIBS		= @DL_LIBS@ @LIBS@ $(MATH_LIBS) -lc
 
-DEPEND_SWITCHES = ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
+DEPEND_SWITCHES	= ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} \
 ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
 -DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
@@ -371,6 +377,7 @@ DL_SRCS = \
 	$(UNIX_DIR)/tclLoadDl.c \
 	$(UNIX_DIR)/tclLoadDl2.c \
 	$(UNIX_DIR)/tclLoadDld.c \
+	$(UNIX_DIR)/tclLoadDyld.c \
 	$(GENERIC_DIR)/tclLoadNone.c \
 	$(UNIX_DIR)/tclLoadOSF.c \
 	$(UNIX_DIR)/tclLoadShl.c
@@ -460,7 +467,7 @@ topDirName:
 gendate:
 	yacc -l $(GENERIC_DIR)/tclGetDate.y
 	sed -e 's/yy/TclDate/g' -e '/^#include <values.h>/d' \
-	    -e 's?SCCSID?RCS: @(#) $$Id: Makefile.in,v 1.61 2000/04/05 00:42:38 welch Exp $$?' \
+	    -e 's?SCCSID?RCS: @(#) $$Id: Makefile.in,v 1.62 2000/04/19 08:32:45 hobbs Exp $$?' \
 	    -e '/#ifdef __STDC__/,/#endif/d' -e '/TclDateerrlab:/d' \
 	    -e '/TclDatenewstate:/d' -e '/#pragma/d' \
 	    -e '/#include <inttypes.h>/d' -e 's/const /CONST /g' \
@@ -487,6 +494,9 @@ dltest/Makefile: $(DLTEST_DIR)/configure $(DLTEST_DIR)/Makefile.in tclConfig.sh
 
 install: install-binaries install-libraries install-doc
 
+install-strip:
+	$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s"
+
 # Note: before running ranlib below, must cd to target directory because
 # some ranlibs write to current directory, and this might not always be
 # possible (e.g. if installing as root).
@@ -524,8 +534,7 @@ install-binaries: binaries
 	    fi
 
 install-libraries: libraries
-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
-		$(SCRIPT_INSTALL_DIR); \
+	@for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
@@ -803,6 +812,9 @@ tclLoadDl2.o: $(UNIX_DIR)/tclLoadDl2.c
 tclLoadDld.o: $(UNIX_DIR)/tclLoadDld.c
 	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDld.c
 
+tclLoadDyld.o: $(UNIX_DIR)/tclLoadDyld.c
+	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDyld.c
+
 tclLoadNone.o: $(GENERIC_DIR)/tclLoadNone.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclLoadNone.c