* unix/configure:

	* unix/configure.in:
	* win/configure:
	* win/configure.in:
	* win/tkConfig.sh.in: reworked to be a little cleaner in
	comparison to each other, and to AC_SUBST even empty vars for
	win/tkConfig.sh

3 files changed, 30 insertions, 13 deletions

diff --git a/win/configure b/win/configure
index ae25dfa..cb4c242 100755
--- a/win/configure
+++ b/win/configure
@@ -1724,6 +1724,14 @@ fi
 
 
 
+# undefined at this point for win
+
+
+
+
+
+
+
 
 
 trap '' 1 2 15
@@ -1945,8 +1953,14 @@ s%@MAKE_LIB@%$MAKE_LIB%g
 s%@POST_MAKE_LIB@%$POST_MAKE_LIB%g
 s%@MAKE_DLL@%$MAKE_DLL%g
 s%@MAKE_EXE@%$MAKE_EXE%g
-s%@TK_XINCLUDES@%$TK_XINCLUDES%g
-s%@XINCLUDES@%$XINCLUDES%g
+s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
+s%@TK_CC_SEARCH_FLAGS@%$TK_CC_SEARCH_FLAGS%g
+s%@TK_LD_SEARCH_FLAGS@%$TK_LD_SEARCH_FLAGS%g
+s%@TK_LIB_FLAG@%$TK_LIB_FLAG%g
+s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
+s%@TK_STUB_LIB_SPEC@%$TK_STUB_LIB_SPEC%g
+s%@TK_BUILD_STUB_LIB_PATH@%$TK_BUILD_STUB_LIB_PATH%g
+s%@TK_STUB_LIB_PATH@%$TK_STUB_LIB_PATH%g
 
 CEOF
 EOF
diff --git a/win/configure.in b/win/configure.in
index cede0ee..74efc03 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -1,8 +1,9 @@
+#! /bin/bash -norc
 # This file is an input file used by the GNU "autoconf" program to
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.36 2001/08/08 18:41:10 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.37 2001/10/15 21:19:16 hobbs Exp $
 
 AC_INIT(../generic/tk.h)
 
@@ -251,7 +252,15 @@ AC_SUBST(MAKE_LIB)
 AC_SUBST(POST_MAKE_LIB)
 AC_SUBST(MAKE_DLL)
 AC_SUBST(MAKE_EXE)
-AC_SUBST(TK_XINCLUDES)
-AC_SUBST(XINCLUDES)
+
+# undefined at this point for win
+AC_SUBST(TK_BUILD_LIB_SPEC)
+AC_SUBST(TK_CC_SEARCH_FLAGS)
+AC_SUBST(TK_LD_SEARCH_FLAGS)
+AC_SUBST(TK_LIB_FLAG)
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_STUB_LIB_SPEC)
+AC_SUBST(TK_BUILD_STUB_LIB_PATH)
+AC_SUBST(TK_STUB_LIB_PATH)
 
 AC_OUTPUT(Makefile tkConfig.sh)
diff --git a/win/tkConfig.sh.in b/win/tkConfig.sh.in
index 09e4a90..919a9d6 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.2 2001/10/15 21:19:16 hobbs Exp $
 
 # Tk's version number.
 TK_VERSION='@TK_VERSION@'
@@ -32,7 +32,7 @@ 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@ @LIBS_GUI@'
 
 # Top-level directory in which Tcl's platform-independent files are
 # installed.
@@ -42,12 +42,6 @@ TK_PREFIX='@prefix@'
 # executables) are installed.
 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@'