diff --git a/auto.def b/auto.def
index e703a276d1..e605d1b158 100644
--- a/auto.def
+++ b/auto.def
@@ -345,15 +345,13 @@ if {"" eq [hwaci-bin-define install]} {
 # cross-compiling.
 define BUILD_CC [get-define CC_FOR_BUILD]
 define BUILD_CFLAGS [get-env BUILD_CFLAGS {-g}]
-define ENABLE_SHARED [opt-bool shared]
-define HAVE_TCL 0
 
 ########################################################################
 # Handle --with-wasi-sdk=DIR
 #
 # This must be early because it may change the toolchain and disable
 # several config options.
-proc hwaci-check-wasi-sdk {} {
+proc sqlite-check-wasi-sdk {} {
   set wasiSdkDir [opt-val with-wasi-sdk] ; # ??? [lindex [opt-val with-wasi-sdk] end]
   define HAVE_WASI_SDK 0
   #puts "x wasiSdkDir=$wasiSdkDir foo=[lindex [opt-val with-wasi-sdk] end]"
@@ -368,12 +366,11 @@ proc hwaci-check-wasi-sdk {} {
   msg-result "Using wasi-sdk clang, disabling: tcl, CLI shell, DLL, loadable extensions, threading"
   define HAVE_WASI_SDK 1
   define WASI_SDK_DIR $wasiSdkDir
-  hwaci-opt-set load-extension 0; # ==> --disable-load-extension
-  hwaci-opt-set threadsafe 0; # ==> --threadsafe=0
-  hwaci-opt-set tcl 0; # ==> --disable-tcl
-  define HAVE_TCL 0
+  hwaci-opt-set load-extension 0 ;# ==> --disable-load-extension
+  hwaci-opt-set threadsafe 0     ;# ==> --threadsafe=0
+  hwaci-opt-set tcl 0            ;# ==> --disable-tcl
+  hwaci-opt-set shared 0         ;# ==> --disable-shared
   set cross_compiling 1
-  define ENABLE_SHARED 0
 
   # Changing --host and --target have no effect here except to possibly
   # cause confusion. autoconf has finished processing them by this
@@ -391,8 +388,8 @@ proc hwaci-check-wasi-sdk {} {
   define LD "${wasiSdkDir}/bin/wasm-ld"
   #define STRIP "${wasiSdkDir}/bin/strip"
   return 1
-}; # hwaci-check-wasi-sdk
-hwaci-check-wasi-sdk
+}; # sqlite-check-wasi-sdk
+sqlite-check-wasi-sdk
 
 #
 # Enable large file support (if special flags are necessary)
@@ -446,6 +443,9 @@ if {[cc-check-includes zlib.h] && [hwaci-check-function-in-lib deflate z]} {
 #
 hwaci-check-rpath
 
+hwaci-define-if-opt-truthy shared ENABLE_SHARED \
+  "Build shared library?"
+
 hwaci-define-if-opt-truthy amalgamation USE_AMALGAMATION \
   "Use amalgamation for builds?"
 
@@ -498,6 +498,7 @@ hwaci-if-opt-truthy with-debug {
 #    components.
 #
 define TCLSH_CMD {exit 1}
+define HAVE_TCL [opt-bool tcl]
 proc sqlite-check-tcl {} {
   # TODO: document the steps this is taking.
   if {![opt-bool tcl]} {
diff --git a/manifest b/manifest
index f93c6a631f..9e4b351c9f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\s--disable-tcl\sis\shonored.\sMove\sLDFLAGS.icu\sfrom\sthe\sCLI\sshell\starget\sto\sLDFLAGS.libsqlite3.
-D 2024-10-27T08:10:56.809
+C Generic\sauto.def\scleanups.
+D 2024-10-27T08:29:18.130
 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 18ca9a2671add80c3b2b4c9731cf07b117aa548fc3256f1a456675358f2a0212
+F auto.def 609cdc6d06e1e51ac56477d524e27f741cb88a0bc60d59cda2fbc503f29039a1
 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 2a881a2e1b7355c7733c3a41a82290ba6f3983232a9ec378d9a1b62ee4109f54
-R 2a289c2467c69f1c5ce59b8bade64652
+P 39ce3f6350d811f27e5104e3dd01de2b04ce2a36edcbefd08596b8ca6c6226ff
+R 20239e0cf9be7057ef4c04014869eaaa
 U stephan
-Z c7b47ea7fee87be569801383233f37ef
+Z dcb9b16969f6593d9a8aab48eccda49c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f374054532..1afc6ef1fb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39ce3f6350d811f27e5104e3dd01de2b04ce2a36edcbefd08596b8ca6c6226ff
+19a5377e608e7ab8fb5733a87ab02a6a69511570c3829e2c1befecc582a6f8ee