Cleanup of substitutions in tkConfig.sh

FossilOrigin-Name: 09af977d7ca35655276edfb60ad0e2457e17f8bd

3 files changed, 23 insertions, 9 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index a45b448..4529699 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.24 2000/04/25 22:30:42 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.24.2.1 2000/07/11 04:53:13 welch Exp $
 
 TCLVERSION		= @TCL_VERSION@
 VERSION			= @TK_VERSION@
@@ -172,13 +172,14 @@ LDFLAGS_CONSOLE	= @LDFLAGS_CONSOLE@
 LDFLAGS_WINDOW	= @LDFLAGS_WINDOW@
 EXEEXT		= @EXEEXT@
 OBJEXT		= @OBJEXT@
+GRAPHIC_LIBS	= @GRAPHIC_LIBS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ $(TCL_STUB_LIB_FILE) gdi32.lib comdlg32.lib
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ $(TCL_STUB_LIB_FILE) $(GRAPHIC_LIBS)
 SHLIB_SUFFIX	= @SHLIB_SUFFIX@
 VER		= @TK_MAJOR_VERSION@@TK_MINOR_VERSION@
 DOTVER		= @TK_MAJOR_VERSION@.@TK_MINOR_VERSION@
-LIBS		= @LIBS@ gdi32.lib comdlg32.lib
+LIBS		= @LIBS@ $(GRAPHIC_LIBS)
 RMDIR		= rm -rf
 MKDIR		= mkdir -p
 SHELL		= @SHELL@
diff --git a/win/configure.in b/win/configure.in
index aa256d8..a649fdf 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.16 2000/04/19 09:25:54 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.16.2.1 2000/07/11 04:53:13 welch Exp $
 
 AC_INIT(../generic/tk.h)
 
@@ -101,6 +101,17 @@ eval "TCL_LIB_FILE=tcl$VER${LIBSUFFIX}"
 eval "TCL_STUB_LIB_FILE=tclstub$VER${LIBSUFFIX}"
 eval "EXESUFFIX=${EXESUFFIX}"
 
+if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
+    TK_BUILD_LIB_SPEC="`pwd`/${TK_LIB_FILE}"
+    TK_LIB_SPEC="${exec_prefix}/lib/${TK_LIB_FILE}"
+else
+    TK_BUILD_LIB_SPEC="`pwd`/${TK_DLL_FILE}"
+    TK_LIB_SPEC="${exec_prefix}/lib/${TK_DLL_FILE}"
+fi
+TK_SHARED_BUILD=${SHARED_BUILD}
+
+GRAPHIC_LIBS="gdi32.lib comdlg32.lib"
+
 AC_SUBST(TK_VERSION)
 AC_SUBST(TK_MAJOR_VERSION)
 AC_SUBST(TK_MINOR_VERSION)
@@ -111,6 +122,10 @@ AC_SUBST(TK_DLL_FILE)
 AC_SUBST(TK_STUB_LIB_FILE)
 AC_SUBST(TK_SRC_DIR)
 AC_SUBST(TK_BIN_DIR)
+AC_SUBST(TK_BUILD_LIB_SPEC)
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_SHARED_BUILD)
+AC_SUBST(GRAPHIC_LIBS)
 
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_MAJOR_VERSION)
diff --git a/win/tkConfig.sh.in b/win/tkConfig.sh.in
index 09e4a90..3b2a964 100644
--- a/win/tkConfig.sh.in
+++ b/win/tkConfig.sh.in
@@ -11,7 +11,7 @@
 #
 # The information in this file is specific to a single platform.
 #
-# RCS: @(#) $Id: tkConfig.sh.in,v 1.1 1999/06/16 22:54:03 surles Exp $
+# RCS: @(#) $Id: tkConfig.sh.in,v 1.1.10.1 2000/07/11 04:53:13 welch Exp $
 
 # Tk's version number.
 TK_VERSION='@TK_VERSION@'
@@ -32,7 +32,8 @@ TK_DBGX=@TK_DBGX@
 TK_LIB_FILE='@TK_LIB_FILE@'
 
 # Additional libraries to use when linking Tk.
-TK_LIBS='@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@'
+TK_LIBS='@LIBS@ @GRAPHIC_LIBS@'
+GRAPHIC_LIBS='@GRAPHIC_LIBS@'
 
 # Top-level directory in which Tcl's platform-independent files are
 # installed.
@@ -45,9 +46,6 @@ TK_EXEC_PREFIX='@exec_prefix@'
 # -I switch(es) to use to make all of the X11 include files accessible:
 TK_XINCLUDES='@XINCLUDES@'
 
-# Linker switch(es) to use to link with the X11 library archive.
-TK_XLIBSW='@XLIBSW@'
-
 # -l flag to pass to the linker to pick up the Tcl library
 TK_LIB_FLAG='@TK_LIB_FLAG@'