Further consolidation of the main auto.def and the autoconf auto.def content into...

FossilOrigin-Name: 76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28

diff --git a/auto.def b/auto.def
index 6dab95eaa0de1233bbf63b96dbe4755127d198de..f868851e3d679b645b4a44d9176c94aae5111cd4 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -4,18 +4,17 @@
 # This is the main autosetup-compatible configure script for the
 # SQLite project.
 #
-# This script should be kept compatible with JimTCL, a copy of which
-# is included in this source tree as ./autosetup/jimsh0.c. The number
-# of incompatibilities between canonical TCL and JimTCL is very low
-# and alternative formulations of incompatible constructs have, so
-# far, been easy to find.
+# This script and all of its dependencies must be kept compatible with
+# JimTCL, a copy of which is included in this source tree as
+# ./autosetup/jimsh0.c. The number of incompatibilities between
+# canonical TCL and JimTCL is very low and alternative formulations of
+# incompatible constructs have, so far, been easy to find.
 #
 # JimTCL: https://jim.tcl.tk
 #
 
 use sqlite-config
 sqlite-config-bootstrap canonical
-sqlite-setup-default-cflags
 proj-if-opt-truthy dev {
   # --enable-dev needs to come early so that the downstream tests
   # which check for the following flags use their updated state.
@@ -27,7 +26,6 @@ proj-if-opt-truthy dev {
   # [proj-get-env] here because [sqlite-setup-default-cflags] uses
   # [proj-get-env] and we want this to supercede that.
 }
-
 sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk]
 sqlite-handle-wasi-sdk   ;# must run relatively early, as it changes the environment
 sqlite-check-common-system-deps
@@ -59,15 +57,6 @@ proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \
 
 define LINK_TOOLS_DYNAMICALLY [proj-opt-was-provided dynlink-tools]
 
-sqlite-handle-rpath
-sqlite-handle-soname
-sqlite-handle-debug
 sqlite-handle-tcl
-sqlite-handle-threadsafe
-sqlite-handle-tempstore
-sqlite-handle-line-editing
-sqlite-handle-load-extension
-sqlite-handle-math
-sqlite-handle-icu
 sqlite-handle-emsdk
 sqlite-config-finalize

diff --git a/autoconf/auto.def b/autoconf/auto.def
index 069f3e931f5216f65d6eb6cd3019950a054cf92a..8ba5bb619972ccd92e2e1607c382cbffb541afea 100644 (file)
--- a/autoconf/auto.def
+++ b/autoconf/auto.def
@@ -4,26 +4,15 @@
 # This is the main autosetup-compatible configure script for the
 # "autoconf" bundle of the SQLite project.
 #
-# This script must be kept compatible with JimTCL, a copy of which is
-# included in this source tree as ./autosetup/jimsh0.c.
+# This script and all of its dependencies must be kept compatible with
+# JimTCL, a copy of which is included in this source tree as
+# ./autosetup/jimsh0.c.
 #
 use sqlite-config
 sqlite-config-bootstrap autoconf
-sqlite-check-common-bins
-sqlite-check-common-system-deps
-sqlite-handle-rpath
-sqlite-handle-soname
-sqlite-setup-default-cflags
-sqlite-handle-debug
-sqlite-handle-threadsafe
-sqlite-handle-tempstore
-sqlite-handle-line-editing
-sqlite-handle-load-extension
-sqlite-handle-math
-sqlite-handle-icu
-
 define ENABLE_STATIC_SHELL [opt-bool static-shell]
 define ENABLE_LIB_SHARED [opt-bool shared]
 define ENABLE_LIB_STATIC [opt-bool static]
-
+sqlite-check-common-bins
+sqlite-check-common-system-deps
 sqlite-config-finalize

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 94e940a72d1932fe218429e3cde8b9f58a3db071..adf31a1ad6660ace2e8890f4b770a362cbd5cb55 100644 (file)
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1201,7 +1201,7 @@ proc proj-xfer-options-aliases {mapping} {
 # will use CC_FOR_BUILD=clang, instead of cc, for building in-tree
 # tools. This is based off of an email discussion and is thought to
 # be likely to cause less confusion than seeing 'cc' invocations
-# will when the user passes CC=clang.
+# when when the user passes CC=clang.
 #
 # Sidebar: if we do this before the cc package is installed, it gets
 # reverted by that package. Ergo, the cc package init will tell the

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 796fd5a4051c986bb9703117142c629dd71a45e0..14f515a2a24e4a638e565efa393c7fdc70d14cae 100644 (file)
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -13,6 +13,7 @@ if {[string first " " $autosetup(builddir)] != -1} {
 }
 
 use cc cc-db cc-shared cc-lib pkg-config proj
+#proj-redefine-cc-for-build; # arguable
 
 #
 # Object for communicating config-time state across various
@@ -364,6 +365,7 @@ proc sqlite-post-options-init {} {
   }
   set ::sqliteConfig(msg-debug-enabled) [proj-val-truthy [get-env msg-debug 0]]
   sqlite-setup-package-info
+  sqlite-setup-default-cflags
 }
 
 ########################################################################
@@ -1447,6 +1449,16 @@ proc sqlite-config-finalize {} {
 #    autoconf {
 #    }
 #  }
+
+  sqlite-handle-debug
+  sqlite-handle-rpath
+  sqlite-handle-soname
+  sqlite-handle-threadsafe
+  sqlite-handle-tempstore
+  sqlite-handle-line-editing
+  sqlite-handle-load-extension
+  sqlite-handle-math
+  sqlite-handle-icu
   sqlite-handle-env-quirks
   sqlite-process-dot-in-files
   sqlite-post-config-validation

diff --git a/manifest b/manifest
index f840036d3b045cbf7aaa04b9a959b3638d12e69e..fecfd569771d9bf99e88a79e073a8e07f7270411 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Configure-internal\sdoc\stweaks.\sFix\sthe\sdistclean\srules\sfor\slibsqlite3.dll.a\son\smsys/cygwin/mingw,\sbroken\swhen\sthe\sDLL\sbasename\swas\schanged\sfor\sthose\splatforms.
-D 2025-02-24T07:06:36.064
+C Further\sconsolidation\sof\sthe\smain\sauto.def\sand\sthe\sautoconf\sauto.def\scontent\sinto\ssqlite-config.tcl.
+D 2025-02-24T08:42:40.698
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def 37cd272e5a2179b4ae99511a0c70e724b24720ccb69e8238d800b52106537782
+F auto.def 165e8e8270b8256db1dd065e8a2f3b7af612421e8a23b8fe08b74d7cbbf12043
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
 F autoconf/Makefile.in c9a7007181df2a07d08bd63c6ba395ed38705aa218789726951aabebec32ee27
 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
-F autoconf/auto.def 64c1a116162da18783a5467b49e539538f7013ea50ae192f182987b5c2f66f9e
+F autoconf/auto.def 9d744a4eb4c8df797580d45c7c0be373f57a66eb26c28d4176fb50f0bddb2c0f
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl cc300c15633cb2835eb52c235c5abfd2de0e8e989e9b650e82df3c1d3b856d22
-F autosetup/sqlite-config.tcl e55569f6ab09a19af7b89c71c20b77b13c8594c9dd6ef2b4463611b8ee76b927
+F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e
+F autosetup/sqlite-config.tcl 02641273a8b03e76e90099acf3879661962ecea09034812cc73d3bec83bb38c6
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2210,8 +2210,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 6f904f0695c7e3396522c061170d6201b256af0294afeefcf8b6672e3ba15987
-R cf9fc5d44286845f3980ae6c5b3ec3e6
+P 8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49
+R 818a30faa9e290412a92ac5e650b3758
 U stephan
-Z 5fd2d1e9c016bedf0db0ccd156948622
+Z 9054f5a6c6f9641c08e70f76bffc8fa1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1632237ee303063606ec1530b6f8de2525c2c360..6674ad5ea65b32fc72a6d0be7d1330179bcd20c3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8641e2c7c868be67ebb367fe7c8ceeee0e0d96574c164191ce9e340e7a527f49
+76a4efa9668791f23de8d4db1788708891f5efa01ba73bced6abfc54391c3b28