Minor configure-internal cleanups to support the autosetup port of the TEA build.

FossilOrigin-Name: 244c2b75c10c68bc0499d60b707a925836a4b9d490813785587522109fc11fe2

diff --git a/auto.def b/auto.def
index 8281888cc7de9f14ba6e8721d588ad7b86e2fa1b..43c597551bd80154beaa48e116a6612d3575fd81 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -61,4 +61,4 @@ sqlite-configure canonical {
   proj-define-for-opt static-tclsqlite3 STATIC_TCLSQLITE3 "Statically link tclsqlite3?"
   proj-define-for-opt static-cli-shell STATIC_CLI_SHELL "Statically link CLI shell?"
 
-}
+}; # sqlite-configure

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index b759f9bff67ff54377961de6f3ba174c71a597ac..b8b9d3dcb7ec53051cfea7e4426ad2c1444ba7d0 100644 (file)
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1443,7 +1443,8 @@ proc proj-tclConfig-sh-to-autosetup {tclConfigSh} {
 # @proj-tweak-default-env-dirs
 #
 # This function is not useful before [use system] is called to set up
-# --prefix and friends.
+# --prefix and friends. It should be called as soon after [use system]
+# as feasible.
 #
 # For certain target environments, if --prefix is _not_ passed in by
 # the user, set the prefix to an environment-specific default. For

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 036352a62c54657deb339c8fd8707c1e0aa2d065..3b07621bac89c9d8479ff9812b350d08fd2e6c90 100644 (file)
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -2088,12 +2088,11 @@ proc sqlite-determine-codegen-tcl {} {
 }; # sqlite-determine-codegen-tcl
 
 ########################################################################
-# Runs sqlite-check-tcl and, if $alsoCheckCodeGen is true,
-# sqlite-determine-codegen-tcl (intended only for the canonical
-# build).
-proc sqlite-handle-tcl {{alsoCheckCodeGen 1}} {
+# Runs sqlite-check-tcl and, if this is the canonical build,
+# sqlite-determine-codegen-tcl.
+proc sqlite-handle-tcl {} {
   sqlite-check-tcl
-  if {$alsoCheckCodeGen} {
+  if {"canonical" eq $::sqliteConfig(build-mode)} {
     msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]"
   }
 }

diff --git a/manifest b/manifest
index 34318f8d3a78bbe4b84216d3d92b6958ba961c19..bcf2bc662d0bd80f079c49e50e29ec15cfb88d15 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sconfigure\sscript\sinternal\sdoc\sedits.\sNo\sfunctional\schanges.
-D 2025-04-04T03:26:20.472
+C Minor\sconfigure-internal\scleanups\sto\ssupport\sthe\sautosetup\sport\sof\sthe\sTEA\sbuild.
+D 2025-04-04T13:08:43.411
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -15,7 +15,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def 30d67e36e62a5db6a4faa0594d81386046a988ad2c20c76d8c9fa426b4106911
+F auto.def 82c32443a91c1062f7a48beec37dbb2d8d03447b1286bce8df5ebb6d8d353f8a
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
 F autoconf/Makefile.in 10e274d965584af947be20213e0052112ee8dec928134d20e256f5fc4c51b758
 F autoconf/Makefile.msc 5bc67d3912444c40c6f96d003e5c90663e51abb83d204a520110b1b2038dcd8b
@@ -51,8 +51,8 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl dfead6099674665c1b59f54e740b47bc6d00dded5e58460528140725fefcb4bf
-F autosetup/sqlite-config.tcl c197e3275b1723e7a2c1cc9c9f8aeca67b7159617924e1db78ba02901c6a69c3
+F autosetup/proj.tcl 89b1822a66b4d6a286c959b3c26093e35926bf86db56cc1887ddcb130001f76a
+F autosetup/sqlite-config.tcl 858c567f0b945e690c693c8e0860ae591596e9221760de643d3f4c1a46ce238c
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@ -2216,8 +2216,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 b78a474ecba6cae4f0e867a515c214fbfe229808145df1870315328d4e13d462
-R 9aa2d52ba180605dad925fa228fdde81
+P 357563bc7c01a744d4038ed3ccc475260b819e98cf90a4270764f79c73d2497e
+R ef52006426abfa48ef858a065d3f7a17
 U stephan
-Z 2db58c825c2b8a1bbf25d32c18ff3da7
+Z 0cc8fc7951010a8bd69a18e1e79e4610
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 27edce24a07b893d6cf380d1d14e7f9a53b04ba3..ddea5dc6c444cf880e46b44967144374c2836a7f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-357563bc7c01a744d4038ed3ccc475260b819e98cf90a4270764f79c73d2497e
+244c2b75c10c68bc0499d60b707a925836a4b9d490813785587522109fc11fe2