* win/configure: define TCL_LIB_FLAG, TCL_BUILD_LIB_SPEC,

	* win/configure.in: TCL_LIB_SPEC, TCL_PACKAGE_PATH in tclConfig.sh.

3 files changed, 55 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index bb4cb6f..60e7625 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-07  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* win/configure:    define TCL_LIB_FLAG, TCL_BUILD_LIB_SPEC,
+	* win/configure.in: TCL_LIB_SPEC, TCL_PACKAGE_PATH in tclConfig.sh.
+
 2004-04-06  Don Porter  <dgp@users.sourceforge.net>
 
 	Patch 922727 committed.  Implements three changes:
@@ -57,10 +62,10 @@
 
 2004-04-01  Vince Darley  <vincentdarley@users.sourceforge.net>
 
-        * generic/tclIOUtil.c:   Fix to privately reported vfs bug with
-        'glob -type d -dir . *' across a vfs boundary.  No tests for
-        this are currently possible without effectively moving tclvfs
-        into Tcl's test suite.
+	* generic/tclIOUtil.c:	 Fix to privately reported vfs bug with
+	'glob -type d -dir . *' across a vfs boundary.	No tests for
+	this are currently possible without effectively moving tclvfs
+	into Tcl's test suite.
 
 2004-03-31  Don Porter  <dgp@users.sourceforge.net>
 
@@ -104,20 +109,20 @@
 
 2004-03-30  Vince Darley  <vincentdarley@users.sourceforge.net>
 
-        * generic/tclFileName.c:  Fix to Windows glob where the pattern is
-        * generic/tclIOUtil.c:    a volume relative path or a network
-        * tests/fileName.test:    share [Bug 898238]. On windows 'glob'
-        * tests/fileSystem.test:  will now return the results of 
-        'glob /foo/bar' and 'glob \\foo\\bar' as 'C:/foo/bar', i.e. a 
-        correct absolute path (rather than a volume relative path).
+	* generic/tclFileName.c:  Fix to Windows glob where the pattern is
+	* generic/tclIOUtil.c:	  a volume relative path or a network
+	* tests/fileName.test:	  share [Bug 898238]. On windows 'glob'
+	* tests/fileSystem.test:  will now return the results of 
+	'glob /foo/bar' and 'glob \\foo\\bar' as 'C:/foo/bar', i.e. a 
+	correct absolute path (rather than a volume relative path).
 
-        Note that the test suite does not test commands like 
-        'glob //Machine/Shared/*' (on a network share).  
+	Note that the test suite does not test commands like 
+	'glob //Machine/Shared/*' (on a network share).	 
 
 2004-03-30  Vince Darley  <vincentdarley@users.sourceforge.net>
 
-        * generic/tclPathObj.c:   Fix to filename bugs recently
-        * tests/fileName.test:    introduced [Bug 918320].
+	* generic/tclPathObj.c:	  Fix to filename bugs recently
+	* tests/fileName.test:	  introduced [Bug 918320].
 
 2004-03-29  Don Porter  <dgp@users.sourceforge.net>
 
@@ -151,9 +156,9 @@
 
 2004-03-26  Vince Darley  <vincentdarley@users.sourceforge.net>
 
-        * generic/tclPathObj.c:   Fix to Windows-only volume relative
-        * tests/fileSystem.test:  path normalization. [Bug 923586].
-        Also fixed another volume relative bug found while testing.
+	* generic/tclPathObj.c:	  Fix to Windows-only volume relative
+	* tests/fileSystem.test:  path normalization. [Bug 923586].
+	Also fixed another volume relative bug found while testing.
 
 2004-03-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
diff --git a/win/configure b/win/configure
index 11ae24a..c141665 100755
--- a/win/configure
+++ b/win/configure
@@ -4082,10 +4082,10 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; pwd`\""
 eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
 
 eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}"
-# FIMXE: These variables decls are missing
-#TCL_LIB_FLAG
-#TCL_BUILD_LIB_SPEC
-#TCL_LIB_SPEC
+
+eval "TCL_LIB_FLAG=\"-ltcl${VER}${LIBFLAGSUFFIX}\""
+eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` ${TCL_LIB_FLAG}\""
+eval "TCL_LIB_SPEC=\"-L${libdir} ${TCL_LIB_FLAG}\""
 
 eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
 eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\""
@@ -4126,6 +4126,18 @@ else
     fi
 fi
 
+#--------------------------------------------------------------------
+#	The statements below define the symbol TCL_PACKAGE_PATH, which
+#	gives a list of directories that may contain packages.  The list
+#	consists of one directory for machine-dependent binaries and
+#	another for platform-independent scripts.
+#--------------------------------------------------------------------
+
+if test "$prefix" != "$exec_prefix"; then
+    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+else
+    TCL_PACKAGE_PATH="${prefix}/lib"
+fi
 
 
 
diff --git a/win/configure.in b/win/configure.in
index c2d5021..bad0cfd 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.79 2004/03/26 19:47:29 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.80 2004/04/07 21:10:17 hobbs Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.57)
@@ -378,10 +378,10 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; pwd`\""
 eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
 
 eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}"
-# FIMXE: These variables decls are missing
-#TCL_LIB_FLAG
-#TCL_BUILD_LIB_SPEC
-#TCL_LIB_SPEC
+
+eval "TCL_LIB_FLAG=\"-ltcl${VER}${LIBFLAGSUFFIX}\""
+eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` ${TCL_LIB_FLAG}\""
+eval "TCL_LIB_SPEC=\"-L${libdir} ${TCL_LIB_FLAG}\""
 
 eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
 eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\""
@@ -422,6 +422,18 @@ else
     fi
 fi
 
+#--------------------------------------------------------------------
+#	The statements below define the symbol TCL_PACKAGE_PATH, which
+#	gives a list of directories that may contain packages.  The list
+#	consists of one directory for machine-dependent binaries and
+#	another for platform-independent scripts.
+#--------------------------------------------------------------------
+
+if test "$prefix" != "$exec_prefix"; then
+    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+else
+    TCL_PACKAGE_PATH="${prefix}/lib"
+fi
 
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_MAJOR_VERSION)