merge trunk

5 files changed, 8 insertions, 4 deletions

diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index bd5a746..070974f 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -82,7 +82,7 @@ TCL_DL_LIBS='@DL_LIBS@'
 # an executable tclsh or tcltest binary.
 TCL_LD_FLAGS='@LDFLAGS@'
 
-# Flags to pass to ld, such as "-R /usr/local/tcl/lib", that tell the
+# Flags to pass to cc/ld, such as "-R /usr/local/tcl/lib", that tell the
 # run-time dynamic linker where to look for shared libraries such as
 # libtcl.so.  Used when linking applications.  Only works if there
 # is a variable "LIB_RUNTIME_DIR" defined in the Makefile.
diff --git a/win/configure b/win/configure
index af4ab97..ac665cf 100755
--- a/win/configure
+++ b/win/configure
@@ -639,6 +639,7 @@ TCL_EXP_FILE
 TCL_BUILD_EXP_FILE
 TCL_NEEDS_EXP_FILE
 TCL_LD_SEARCH_FLAGS
+TCL_CC_SEARCH_FLAGS
 TCL_BUILD_LIB_SPEC
 MAKE_EXE
 MAKE_DLL
@@ -5283,6 +5284,7 @@ TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.0`echo $TCL_PATCH_LEVEL | tr -d
 
 
 
+
 # win only
 
 
diff --git a/win/configure.ac b/win/configure.ac
index 84df590..f5b5d3c 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -425,6 +425,7 @@ AC_SUBST(MAKE_EXE)
 
 # empty on win, but needs sub'ing
 AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_CC_SEARCH_FLAGS)
 AC_SUBST(TCL_LD_SEARCH_FLAGS)
 AC_SUBST(TCL_NEEDS_EXP_FILE)
 AC_SUBST(TCL_BUILD_EXP_FILE)
diff --git a/win/makefile.vc b/win/makefile.vc
index 59400ab..06a5e11 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -877,6 +877,7 @@ $(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
 @SHLIB_SUFFIX@       .dll

 @DL_LIBS@

 @LDFLAGS@

+@TCL_CC_SEARCH_FLAGS@

 @TCL_LD_SEARCH_FLAGS@

 @LIBOBJS@

 @RANLIB@

diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index 1ab28bf..454f1f1 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -93,12 +93,12 @@ TCL_DL_LIBS='@DL_LIBS@'
 # an executable tclsh or tcltest binary.
 TCL_LD_FLAGS='@LDFLAGS@'
 
-# Flags to pass to ld, such as "-R /usr/local/tcl/lib", that tell the
+# Flags to pass to cc/ld, such as "-R /usr/local/tcl/lib", that tell the
 # run-time dynamic linker where to look for shared libraries such as
 # libtcl.so.  Used when linking applications.  Only works if there
 # is a variable "LIB_RUNTIME_DIR" defined in the Makefile.
-TCL_CC_SEARCH_FLAGS='@CC_SEARCH_FLAGS@'
-TCL_LD_SEARCH_FLAGS='@LD_SEARCH_FLAGS@'
+TCL_CC_SEARCH_FLAGS='@TCL_CC_SEARCH_FLAGS@'
+TCL_LD_SEARCH_FLAGS='@TCL_LD_SEARCH_FLAGS@'
 
 # Additional object files linked with Tcl to provide compatibility
 # with standard facilities from ANSI C or POSIX.