From cbb182fef291aa36a6fa90e19a78f77506d11439 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 25 Oct 2024 23:13:12 +0000
Subject: [PATCH] When --with-tclsh=X is used, use X for all TCL purposes,
 including in-tree code generation, per developer request.

FossilOrigin-Name: 12498e55c0c689f43c78002fb850a58dda337feae51194b9cade7f5dff15e833
---
 auto.def      | 63 +++++++++++++++++++++++++++------------------------
 manifest      | 12 +++++-----
 manifest.uuid |  2 +-
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/auto.def b/auto.def
index 8b429f18a2..acc5d476d2 100644
--- a/auto.def
+++ b/auto.def
@@ -649,42 +649,45 @@ hwaci-check-tcl
 # jimsh0.c defines JIM_COMPAT automatically (prior to that it intended
 # to but a typo of JIM_TCL_COMPAT made it a no-op).
 define CFLAGS_JIMSH {}
-set useOwnJimsh 0
 msg-result "Which TCL to use for code generation... "
-set cgtcl jimtcl
-if {[cc-check-functions realpath]} {
-  define-append CFLAGS_JIMSH -DHAVE_REALPATH
-  define BTCLSH "\$(JIMSH)"
-  set useOwnJimsh 1
-} elseif {[cc-check-functions _fullpath]} {
-  # _fullpath() is a Windows API
-  define-append CFLAGS_JIMSH -DHAVE__FULLPATH
-  define BTCLSH "\$(JIMSH)"
-  set useOwnJimsh 1
-} elseif {[file exists [get-define TCLSH_CMD]]} {
-  set cgtcl [get-define TCLSH_CMD]
+set cgtcl [opt-val with-tclsh jimsh]
+if {"jimsh" ne $cgtcl} {
+  # When --with-tclsh=X is used, use that for all TCL purposes,
+  # including in-tree code generation, per developer request.
   define BTCLSH "\$(TCLSH_CMD)"
 } else {
-  # One last-ditch effort to find TCLSH_CMD: use info from
-  # tclConfig.sh to try to find a tclsh
-  if {"" eq [get-define TCLSH_CMD]} {
-    set tpre [get-define TCL_EXEC_PREFIX]
-    if {"" ne $tpre} {
-      set tv [get-define TCL_VERSION]
-      if {[file-isexec "${tpre}/bin/tclsh${tv}"]} {
-        define TCLSH_CMD "${tpre}/bin/tclsh${tv}"
-      } elseif {[file-isexec "${tpre}/bin/tclsh"]} {
-        define TCLSH_CMD "${tpre}/bin/tclsh"
+  if {[cc-check-functions realpath]} {
+    define-append CFLAGS_JIMSH -DHAVE_REALPATH
+    define BTCLSH "\$(JIMSH)"
+  } elseif {[cc-check-functions _fullpath]} {
+    # _fullpath() is a Windows API
+    define-append CFLAGS_JIMSH -DHAVE__FULLPATH
+    define BTCLSH "\$(JIMSH)"
+  } elseif {[file exists [get-define TCLSH_CMD]]} {
+    set cgtcl [get-define TCLSH_CMD]
+    define BTCLSH "\$(TCLSH_CMD)"
+  } else {
+    # One last-ditch effort to find TCLSH_CMD: use info from
+    # tclConfig.sh to try to find a tclsh
+    if {"" eq [get-define TCLSH_CMD]} {
+      set tpre [get-define TCL_EXEC_PREFIX]
+      if {"" ne $tpre} {
+        set tv [get-define TCL_VERSION]
+        if {[file-isexec "${tpre}/bin/tclsh${tv}"]} {
+          define TCLSH_CMD "${tpre}/bin/tclsh${tv}"
+        } elseif {[file-isexec "${tpre}/bin/tclsh"]} {
+          define TCLSH_CMD "${tpre}/bin/tclsh"
+        }
+        unset tv
       }
-      unset tv
+      unset tpre
     }
-    unset tpre
+    set cgtcl [get-define TCLSH_CMD]
+    if {![file exists $cgtcl]} {
+      hwaci-fatal "Cannot find a tclsh to use for code generation."
+    }
+    define BTCLSH "\$(TCLSH_CMD)"
   }
-  set cgtcl [get-define TCLSH_CMD]
-  if {![file exists $cgtcl]} {
-    hwaci-fatal "Cannot find a tclsh to use for code generation."
-  }
-  define BTCLSH "\$(TCLSH_CMD)"
 }
 msg-result "TCL for code generation: $cgtcl"
 unset cgtcl
diff --git a/manifest b/manifest
index 40bf020b12..e0298815fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sBUILD_CFLAGS\s(for\sB.cc)\sto\snot\sinherent\sCFLAGS\s(which\sare\sonly\sfor\sT.cc).
-D 2024-10-25T23:04:50.934
+C When\s--with-tclsh=X\sis\sused,\suse\sX\sfor\sall\sTCL\spurposes,\sincluding\sin-tree\scode\sgeneration,\sper\sdeveloper\srequest.
+D 2024-10-25T23:13:12.897
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -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 91a723897b2f2230fe200e9cbda9e7b4063bc0af42768d6fe0f376b813c80b9b
+F auto.def 6f81ce2f8d9dfa59d4fa9ea423e9e3228be41e23a63f457472d28b7e267d99cd
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a49bee68418f9e8c3813a60f76de265b8e6a98a15ab9b246aa42d9e9558a03eb
-R c14c5d9afdf9f83be57f58112a477cbb
+P ffdce13deb8a1fbce717da9ca44fd34409bedad4db805722100647372c06f4f5
+R 547a5fbc8c084efef7911861f5f974f8
 U stephan
-Z fa7cc103b1950703dd62a0222c63e168
+Z ecd9048bff7dc4b2fb9935c4a4daef26
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f3078dd72f..1f50f34e30 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffdce13deb8a1fbce717da9ca44fd34409bedad4db805722100647372c06f4f5
+12498e55c0c689f43c78002fb850a58dda337feae51194b9cade7f5dff15e833