Configure doc tweaks. Move the package version/build dir output so that it does not...

FossilOrigin-Name: 826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index d9201518ff6daa7c5b75ba9fc1fbc0aff4a100c0..24362e01589be97a7c1fb9ad8f233ee68658a82d 100644 (file)
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -28,10 +28,6 @@ proc sqlite-setup-package-info {} {
   msg-result "Source dir = $srcdir"
   msg-result "Build dir  = $::autosetup(builddir)"
 }
-sqlite-setup-package-info
-
-use cc cc-db cc-shared cc-lib pkg-config
-#proj-redefine-cc-for-build; # arguable
 
 #
 # Object for communicating config-time state across various
@@ -256,9 +252,10 @@ proc sqlite-config-bootstrap {buildMode} {
         # build
         with-wasi-sdk:=/opt/wasi-sdk
           => {Top-most dir of the wasi-sdk for a WASI build}
+
         with-emsdk:=auto
           => {Top-most dir of the Emscripten SDK installation.
-              Default = EMSDK env var.}
+              Needed only by ext/wasm build. Default=EMSDK env var.}
       }
     }
 
@@ -282,8 +279,7 @@ proc sqlite-config-bootstrap {buildMode} {
               e.g. --soname=9.10 equates to "libsqlite3.so.9.10".}
         # dll-basename: https://sqlite.org/forum/forumpost/828fdfe904
         dll-basename:=auto
-          => {Specifies the base name of the resulting DLL file, defaulting to a
-              platform-depending name (libsqlite3 on most Unix-style platforms).
+          => {Specifies the base name of the resulting DLL file.
               If not provided, libsqlite3 is usually assumed but on some platforms
               a platform-dependent default is used. On some platforms this flag
               gets automatically enabled if it is not provided. Use "default" to
@@ -354,6 +350,14 @@ proc sqlite-config-bootstrap {buildMode} {
     # called from deeper than the global scope.
     return -code break
   }
+  sqlite-setup-package-info
+  uplevel 1 {
+    # The odd placement of this block is so that we can emit the
+    # output from sqlite-setup-package-info after --help is processed
+    # but before any other info is emitted, e.g. the host/target
+    # system info and the C compiler check.
+    use cc cc-db cc-shared cc-lib pkg-config
+  }
   sqlite-post-options-init
 }; # sqlite-config-bootstrap
 
@@ -1319,10 +1323,11 @@ proc sqlite-handle-dll-basename {} {
 #
 # Platform notes:
 #
-# - cygwin packages historically install no .dll.a file.
+# - cygwin sqlite packages historically install no .dll.a file.
 #
-# - msys2 packages historically install /usr/lib/libsqlite3.dll.a
-#   despite the DLL being in /usr/bin/msys-sqlite3-0.dll.
+# - msys2 and mingw sqlite packages historically install
+#   /usr/lib/libsqlite3.dll.a despite the DLL being in
+#   /usr/bin/msys-sqlite3-0.dll.
 proc sqlite-handle-out-implib {} {
   define LDFLAGS_OUT_IMPLIB ""
   define SQLITE_OUT_IMPLIB ""
@@ -1331,6 +1336,9 @@ proc sqlite-handle-out-implib {} {
     set olBaseName [join [opt-val out-implib] ""]
     if {$olBaseName in {auto ""}} {
       set olBaseName "libsqlite3" ;# [get-define SQLITE_DLL_BASENAME]
+      # Based on discussions with mingw/msys users, the import lib
+      # should always be called libsqlite3.dll.a even on platforms
+      # which rename libsqlite3.dll to something else.
     }
     if {$olBaseName ne "none"} {
       cc-with {-link 1} {

diff --git a/manifest b/manifest
index 38de687a343c43c8eb018ff7e5547cc71e816e4e..ed7fb2cd97e109fb682e8a8737f9e96ae537312f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sconsolidation\sof\sauto.def\sand\sautoconf/auto.def.\sNote\sin\sconfigure\s--help\sthat\s--disable-largefile\sis\sa\slegacy\soption\swhich\shas\sno\seffect\son\sthe\slibrary\sbut\smay\sinfluence\sthe\sgenerated\ssqlite_cfg.h.
-D 2025-02-24T11:21:32.119
+C Configure\sdoc\stweaks.\sMove\sthe\spackage\sversion/build\sdir\soutput\sso\sthat\sit\sdoes\snot\sappear\sat\sthe\sstart\sof\s--help\stext,\sbut\sotherwise\sstill\sappears\sbefore\sthe\sfirst\soutput\sfrom\slow-level\sconfig\sinitialization.
+D 2025-02-24T12:19:06.652
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e
-F autosetup/sqlite-config.tcl 7207843e3e4ca80df4f4e65585dbc33d858c52a105f7b649911c2476dc872cd0
+F autosetup/sqlite-config.tcl 5ea649be4e1111fb7a901fc27334a468545a46397b872a8aaa625b8f6ff46684
 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 83e0f3d138abf33751f735169aee752ba1677c5df37c3947f2c8be3ea3629822
-R 9adef019cb4ebe2274efa08aba0bf1a4
+P 17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd
+R 7df87f1f103b72910ba69cc1b491c805
 U stephan
-Z c421f79f7ead56e5e7976de7916f8519
+Z 00962c02ea8650e5ddad857abc8c633a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2448c62e2426984e7030e71715aab36169e3b106..c2382c94d80bc427070c15247e805a658aedb377 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17fd6836f362c646d6dadb40adc0a8a31e2bfc9416651dde2c156400b3aa06dd
+826bad10e9ccd6f71e6dad90d41fb7d4a941e459d2e080901345ed8877ad5e38