From: mistachkin <mistachkin@noemail.net>
Date: Fri, 5 Jan 2018 01:22:37 +0000 (+0000)
Subject: Revise detection of 'tclsh.exe' in the Makefile for MSVC.
X-Git-Tag: version-3.22.0~108^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47be3b23e9c935930cc0dcb76c853512eabadc98;p=thirdparty%2Fsqlite.git

Revise detection of 'tclsh.exe' in the Makefile for MSVC.

FossilOrigin-Name: 45fabd868dc690894f5a911d373a3d6410ba2d95d177307a42009afc8ae296cc
---

diff --git a/Makefile.msc b/Makefile.msc
index c476f54f9e..8f0fd1b82d 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -93,12 +93,12 @@ SPLIT_AMALGAMATION = 0
 
 # <<mark>>
 # Set this non-0 to have this makefile assume the Tcl shell executable
-# (tclsh*.exe) is available in the PATH.  By default, this is enabled
+# (tclsh*.exe) is available in the PATH.  By default, this is disabled
 # for compatibility with older build environments.  This setting only
 # applies if TCLSH_CMD is not set manually.
 #
 !IFNDEF USE_TCLSH_IN_PATH
-USE_TCLSH_IN_PATH = 1
+USE_TCLSH_IN_PATH = 0
 !ENDIF
 
 # Set this non-0 to use zlib, possibly compiling it from source code.
@@ -909,7 +909,7 @@ LIBICU = icuuc.lib icuin.lib
 # specific Tcl shell to use.
 #
 !IFNDEF TCLSH_CMD
-!IF $(USE_TCLSH_IN_PATH)!=0
+!IF $(USE_TCLSH_IN_PATH)!=0 || !EXIST("$(TCLDIR)\bin\tclsh.exe")
 TCLSH_CMD = tclsh
 !ELSE
 TCLSH_CMD = $(TCLDIR)\bin\tclsh.exe
diff --git a/manifest b/manifest
index c97886d88f..13547fdc1b 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Enhance\sthe\s'zlib'\sbuild\starget\sfor\sMSVC.
-D 2018-01-05T01:00:17.962
+C Revise\sdetection\sof\s'tclsh.exe'\sin\sthe\sMakefile\sfor\sMSVC.
+D 2018-01-05T01:22:37.774
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 1b11037c5ed3399a79433cc82c59b5e36a7b3a3e4e195bb27640d0d2145e03e1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc e8b973cd249b0db11c221c1bd7e9f738e8dac369275160342e1011f3932074c9
+F Makefile.msc c4eaeff29b73d76437cf9c13d7a9654fc0e9e2578e20c12d0067c3d510e4e8e4
 F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
 F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1694,7 +1694,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a0e18aea0950f5ebdf4112f826ff64d24e8660b341031132dcb65bb15579ef1c
-R ae30dd8990fa7c0deb74a2452807863c
+P 0bc3b76ec9b83f3034e282ea0369a53673e2cb64dde42e8cf5e800f6d642d527
+R ea85632748cb8c061fa075c4e05b7d5d
 U mistachkin
-Z 062c561092c9190b73f85a153a52c8b7
+Z a7a75d6fbb0bbc541be826de9dbf52e8
diff --git a/manifest.uuid b/manifest.uuid
index eacddc6a99..d4f3a5c95c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0bc3b76ec9b83f3034e282ea0369a53673e2cb64dde42e8cf5e800f6d642d527
\ No newline at end of file
+45fabd868dc690894f5a911d373a3d6410ba2d95d177307a42009afc8ae296cc
\ No newline at end of file