For platforms where tclsh is found but tclConfig.sh is not, set HAVE_TCL to 0. We...

FossilOrigin-Name: 04d2576b2e516fc5f5ba719d6bb01d25fd3b06b1c2d26acbec32bcdd65e9a01c

diff --git a/auto.def b/auto.def
index 88c08bef0986c181dcfbe5ad99761cf1726dae1c..59a4aae3fea35119450775008c328ead4ec1b79c 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -635,10 +635,14 @@ proc sqlite-check-tcl {} {
   }; # find TCLLIBDIR
 
   if {[file exists $with_tclsh]} {
-    msg-result "Using tclsh: $with_tclsh"
-    define HAVE_TCL 1
+    if {$cfg ne ""} {
+      msg-result "Using tclsh: $with_tclsh"
+      define HAVE_TCL 1
+    } else {
+      proj-warn "Found tclsh but no tclConfig.sh, so cannot build TCL components."
+    }
   } else {
-    proj-warn "Cannot find a usable tclsh, so cannot run tests."
+    proj-warn "Cannot find a usable tclsh, so cannot build TCL components."
   }
   show-notices
 }; # sqlite-check-tcl

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 5f44cf72cb7945b6443681260c28885d4a8d5d71..98ee998ebc18746a1461b6f68030d90791002fa3 100644 (file)
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1152,7 +1152,7 @@ proc proj-which-linenoise {dotH} {
 # In that make invocation, $(libdir) would, at make-time, normally be
 # hard-coded to /foo/lib, rather than /blah/lib. That happens because
 # the autosetup exports conventional $prefix-based values for the
-# numerious autoconfig-compatible XYZdir vars at configure-time.  What
+# numerous autoconfig-compatible XYZdir vars at configure-time.  What
 # we would normally want, however, is that --libdir derives from the
 # make-time $(prefix).  The distinction between configure-time and
 # make-time is the significant factor there.
@@ -1169,11 +1169,10 @@ proc proj-which-linenoise {dotH} {
 # reference, e.g.  libdir=${exec_prefix}/lib. Ergo, if
 # --exec-prefix=FOO is passed to configure, libdir will still derive,
 # at make-time, from whatever exec_prefix is passed to make, and will
-# use FOO if exec_prefix is not overridden.  Without this
+# use FOO if exec_prefix is not overridden at make-time.  Without this
 # post-processing, libdir would be cemented in as FOO/lib at
-# configure-time, so would be tedious to override properly via a make
+# configure-time, so could be tedious to override properly via a make
 # invocation.
-#
 proc proj-remap-autoconf-dir-vars {} {
   set prefix [get-define prefix]
   set exec_prefix [get-define exec_prefix $prefix]

diff --git a/manifest b/manifest
index e87ed5719757839f367fc813c41dfff8ca5d1ba8..079ede813e45c029426a1a79eec457b967be799d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sFTS3\scorruption\stest\scase\sthat\sdepends\son\sthe\sspecific\spseudo-random\nbyte\ssequence\sgenerated\sby\ssqlite3_randomness(),\swhich\sis\sdifferent\son\nbig-endian\splatforms\sthan\sit\sis\son\slittle-endian\splatforms.
-D 2024-11-06T19:19:49.300
+C For\splatforms\swhere\stclsh\sis\sfound\sbut\stclConfig.sh\sis\snot,\sset\sHAVE_TCL\sto\s0.\sWe\scan't\sbuild\sthe\sTCL\scomponents\son\sthose.\sProblem\sreported\sin\s[forum:5106aee3a8|forum\spost\s5106aee3a8].
+D 2024-11-07T05:26:09.487
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def 05eedbf203a070fc84d9d26071f7ddf2a30f2118ab0204db46e91dbfec8a50b8
+F auto.def 7d4399cfcf2d05abe17ee62f7164b02a435a5c6f4f7a4581c126510a9ac83ef5
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
 F autosetup/jimsh0.c d40e381ea4526a067590e7b91bd4b2efa6d4980d286f908054c647b3df4aee14
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 504fb46e15a0c6b4b161484a0a24f62b9c165fb901d189c0e523d9a93f1b24c2
+F autosetup/proj.tcl 2ee715f7fa7386879af0c651a22f9d451f980b8f2fed37d94f28b5b03cf5d703
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f
 F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9
@@ -2200,8 +2200,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 5495b12569c318d5020b4b5a625a392ef8e777b81c0200624fbbc2a6b5eddef9
-R fca9e17da314094528f1ce35ee0eadb3
-U drh
-Z d5ae46fbd1e85e01ddb44833f789fc17
+P 6216bfcb74273b7893735e265d3f04d1362fa625cd60cebccb866ce7d6c50e01
+R ebdad56d0bb2add7c241926e4c52fbe3
+U stephan
+Z 365df9597782f382d765b4f7c83a4a0c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0090ab059ae6c56a188ab5286821ac67b8ccb922..65e4c9a375f20b8551b65d7ba6449dffabbdf392 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6216bfcb74273b7893735e265d3f04d1362fa625cd60cebccb866ce7d6c50e01
+04d2576b2e516fc5f5ba719d6bb01d25fd3b06b1c2d26acbec32bcdd65e9a01c