From 2446d3e4c19bc8727f648e7fe66136a97247fcc5 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Wed, 7 Apr 2004 21:06:40 +0000
Subject: 	* win/configure: 	* win/configure.in: define
 TCL_LIB_FLAG, TCL_BUILD_LIB_SPEC, 	TCL_LIB_SPEC and TCL_PACKAGE_PATH in
 tclConfig.sh.

---
 ChangeLog        |  6 ++++++
 win/configure    | 20 ++++++++++++++++----
 win/configure.in | 22 +++++++++++++++++-----
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6fb73e0..a0aa961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-07  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* win/configure:
+	* win/configure.in: define TCL_LIB_FLAG, TCL_BUILD_LIB_SPEC,
+	TCL_LIB_SPEC and TCL_PACKAGE_PATH in tclConfig.sh.
+
 2004-04-06  Don Porter  <dgp@users.sourceforge.net>
 
 	* tests/unixInit.test (unixInit-3.1):	Default encoding on Darwin
diff --git a/win/configure b/win/configure
index d42a9f3..73899c7 100755
--- a/win/configure
+++ b/win/configure
@@ -1931,10 +1931,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}\""
@@ -1975,6 +1975,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 04752a9..8638586 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.68.2.7 2004/02/13 01:38:02 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.68.2.8 2004/04/07 21:06:41 hobbs Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.13)
@@ -307,10 +307,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}\""
@@ -351,6 +351,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)
-- 
cgit v0.12