From 69f23df0ea31e3489c8a760a0abc0b71987c8062 Mon Sep 17 00:00:00 2001
From: wart <wart>
Date: Fri, 30 Jul 1999 23:31:32 +0000
Subject: Added definitions for some symbols in tclConfig.sh that never got
 values in Windows.

---
 win/aclocal.m4   |  1 +
 win/configure.in | 14 +++++++++++++-
 win/tcl.m4       |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/win/aclocal.m4 b/win/aclocal.m4
index 9fad38c..50a23cf 100644
--- a/win/aclocal.m4
+++ b/win/aclocal.m4
@@ -361,6 +361,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	SHLIB_LD_LIBS="user32.lib advapi32.lib"
 	LIBS="user32.lib advapi32.lib"
 	AR="lib -nologo"
+	STLIB_LD="lib -nologo"
 	RC="rc"
 	MAKE_LIB="\${AR} -out:\[$]@"
 	MAKE_EXE="\${CC} -Fe\[$]@"
diff --git a/win/configure.in b/win/configure.in
index d6047af..91f0ffd 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,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.10 1999/07/09 18:24:01 redman Exp $
+# RCS: @(#) $Id: configure.in,v 1.11 1999/07/30 23:31:32 wart Exp $
 
 AC_INIT(../generic/tcl.h)
 
@@ -76,6 +76,10 @@ TCL_DBGX=${DBGX}
 # Perform final evaluations of variables with possible substitutions.
 #--------------------------------------------------------------------
 
+TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
+TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
+TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
+
 eval "TCL_SRC_DIR=`cd $srcdir; pwd`"
 eval "TCL_STUB_LIB_FILE=tclstub$VER${LIBSUFFIX}"
 eval "TCL_DLL_FILE=tcl$VER${DLLSUFFIX}"
@@ -84,6 +88,10 @@ eval "DLLSUFFIX=${DLLSUFFIX}"
 eval "LIBSUFFIX=${LIBSUFFIX}"
 eval "EXESUFFIX=${EXESUFFIX}"
 
+CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}
+CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}
+CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}
+
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_MAJOR_VERSION)
 AC_SUBST(TCL_MINOR_VERSION)
@@ -94,12 +102,16 @@ AC_SUBST(TCL_STUB_LIB_FILE)
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_BIN_DIR)
 AC_SUBST(TCL_DBGX)
+AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
+AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
+AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
 
 AC_SUBST(PATHTYPE)
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)
 AC_SUBST(CFLAGS_WARNING)
 AC_SUBST(EXTRA_CFLAGS)
+AC_SUBST(STLIB_LD)
 AC_SUBST(SHLIB_LD)
 AC_SUBST(SHLIB_LD_LIBS)
 AC_SUBST(SHLIB_CFLAGS)
diff --git a/win/tcl.m4 b/win/tcl.m4
index 9fad38c..50a23cf 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -361,6 +361,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	SHLIB_LD_LIBS="user32.lib advapi32.lib"
 	LIBS="user32.lib advapi32.lib"
 	AR="lib -nologo"
+	STLIB_LD="lib -nologo"
 	RC="rc"
 	MAKE_LIB="\${AR} -out:\[$]@"
 	MAKE_EXE="\${CC} -Fe\[$]@"
-- 
cgit v0.12