1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00

Ensure that the post-config checks for @UNEXPANDED_VARS@ pass even if --disable-tcl is used, as reported in [forum:74ef8059fc|forum post 74ef8059fc].

FossilOrigin-Name: a38606bf44a1b5d0f684f67174c33f8c88c7927e23fc6a715e8d3ae7a6614bbd
This commit is contained in:
stephan
2024-12-06 00:09:05 +00:00
parent eed134c4d3
commit 0448e00aaf
3 changed files with 15 additions and 8 deletions

View File

@ -563,6 +563,13 @@ proc sqlite-check-tcl {} {
define HAVE_TCL 0 ; # Will be enabled via --tcl or a successful search
define TCLLIBDIR "" ; # Installation dir for TCL extension lib
define TCL_CONFIG_SH ""; # full path to tclConfig.sh
# Clear out all vars which would be set by tclConfigToAutoDef.sh, so that the late-config
# validation of @VARS@ works...
foreach k {TCL_INCLUDE_SPEC TCL_LIB_SPEC TCL_STUB_LIB_SPEC TCL_EXEC_PREFIX TCL_VERSION} {
define $k ""
}
file delete -force ".tclenv.sh"; # ensure no stale state from previous configures.
if {![opt-bool tcl]} {
proj-indented-notice {

View File

@ -1,5 +1,5 @@
C Fix\sthe\sbuild\sof\ssqlite3_analyzer.exe\son\sWindows\sthat\swas\sbroken\sby\ncheck-in\s[80f3bf8c2ee31ba1].
D 2024-12-05T23:53:16.868
C Ensure\sthat\sthe\spost-config\schecks\sfor\s@UNEXPANDED_VARS@\spass\seven\sif\s--disable-tcl\sis\sused,\sas\sreported\sin\s[forum:74ef8059fc|forum\spost\s74ef8059fc].
D 2024-12-06T00:09:05.046
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@ -14,7 +14,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
F auto.def 6de760c0b88ace5550403544a2eb83eb6834be99997c845d824c19774e056dc5
F auto.def 9f72325769bb436b895e59830754420bbcf511e97cad46d3d02b8238c74fb2de
F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@ -2202,8 +2202,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 3b82d2c6b732617b9be205efadd07326057c93b71c47ffd42de63fc05093667b
R 24123a0459182d20f8acb8c7b97c6d23
U drh
Z 4aebafa1987ff29c0a240fdab74f1ca1
P 223f47b2db8d80629d60a642942eb8b288611e3e466cf904964285229a5809fc
R 5615d7d2067b25d2e740958008f1a1e0
U stephan
Z d55afe31ff3364c8edd502e77c937df9
# Remove this line to create a well-formed Fossil manifest.

View File

@ -1 +1 @@
223f47b2db8d80629d60a642942eb8b288611e3e466cf904964285229a5809fc
a38606bf44a1b5d0f684f67174c33f8c88c7927e23fc6a715e8d3ae7a6614bbd