Shift some bootstrapping configure bits to avoid emitting extra output if --help...

FossilOrigin-Name: 69e83ab859ca37c047defdaba84e80d028b30045631e773bd8dfa286c41a57e8

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index c56ef889920fe4bb0884daedd8b6fcdd50d08960..52f82126945de27184a6429fd00654220ee0d82c 100644 (file)
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -12,19 +12,7 @@ if {[string first " " $autosetup(builddir)] != -1} {
               may not contain space characters"
 }
 
-# The mixing of output and 'use' here is largely cosmetic, the intent
-# being to put the most-frequently-useful info at the top.
 use proj
-define PACKAGE_VERSION [proj-file-content -trim $::autosetup(srcdir)/VERSION]
-msg-result "Configuring SQLite version [get-define PACKAGE_VERSION]"
-use system ; # Will output "Host System" and "Build System" lines
-msg-result "Source dir = $::autosetup(srcdir)"
-msg-result "Build dir  = $::autosetup(builddir)"
-use cc cc-db cc-shared cc-lib pkg-config
-define PACKAGE_NAME "sqlite"
-define PACKAGE_URL {https://sqlite.org}
-define PACKAGE_BUGREPORT [get-define PACKAGE_URL]/forum
-define PACKAGE_STRING "[get-define PACKAGE_NAME] [get-define PACKAGE_VERSION]"
 
 #
 # Object for communicating config-time state across various
@@ -345,12 +333,23 @@ proc sqlite-configure {buildMode configScript} {
     }
   }
   #lappend opts "soname:=duplicateEntry => {x}"; #just testing
-  if {[catch {options $opts} msg opts]} {
+  if {[catch {options $opts} msg xopts]} {
     # Workaround for <https://github.com/msteveb/autosetup/issues/73>
     # where [options] behaves oddly on _some_ TCL builds when it's
     # called from deeper than the global scope.
-    dict incr opts -level
-    return {*}$opts $msg
+    dict incr xopts -level
+    return {*}$xopts $msg
+  }
+  # The following uplevel is largely cosmetic, the intent being to put
+  # the most-frequently-useful info at the top of the ./configure
+  # output, but also avoiding outputing it if --help is used.
+  uplevel 1 {
+    define PACKAGE_VERSION [proj-file-content -trim $::autosetup(srcdir)/VERSION]
+    msg-result "Configuring SQLite version [get-define PACKAGE_VERSION]"
+    use system ; # Will output "Host System" and "Build System" lines
+    msg-result "Source dir = $::autosetup(srcdir)"
+    msg-result "Build dir  = $::autosetup(builddir)"
+    use cc cc-db cc-shared cc-lib pkg-config
   }
   sqlite-post-options-init
   uplevel 1 $configScript
@@ -422,6 +421,10 @@ proc sqlite-configure-finalize {} {
 # top-level build and the "autoconf" build, but it's not intended to
 # be a catch-all dumping ground for such.
 proc sqlite-post-options-init {} {
+  define PACKAGE_NAME "sqlite"
+  define PACKAGE_URL {https://sqlite.org}
+  define PACKAGE_BUGREPORT [get-define PACKAGE_URL]/forum
+  define PACKAGE_STRING "[get-define PACKAGE_NAME] [get-define PACKAGE_VERSION]"
   #
   # Carry values from hidden --flag aliases over to their canonical
   # flag forms. This list must include only options which are common
@@ -1957,7 +1960,7 @@ proc sqlite-handle-tcl {} {
 # Handle the --enable/disable-rpath flag.
 proc sqlite-handle-rpath {} {
   proj-check-rpath
-  # autosetup/cc-chared.tcl sets the rpath flag definition in
+  # autosetup/cc-shared.tcl sets the rpath flag definition in
   # [get-define SH_LINKRPATH], but it does so on a per-platform basis
   # rather than as a compiler check. Though we should do a proper
   # compiler check (as proj-check-rpath does), we may want to consider

diff --git a/manifest b/manifest
index a0144787aa5c029e766a439f77842056b88058a0..e42357e3033512a61334331e73bfa35e7a72e8d6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\smkwasmbuilds.c\swhich\scaused\ssqlite3.wasm\sto\sget\sdeleted\sdirectly\safter\sit\swas\sbuilt.
-D 2025-02-26T03:20:26.791
+C Shift\ssome\sbootstrapping\sconfigure\sbits\sto\savoid\semitting\sextra\soutput\sif\s--help\sis\sspecified.
+D 2025-02-26T09:14:26.443
 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 aaa2e014d0490a3a5fbb6b144fb3836ee758d643c5eeb2816ec43e187a20f497
+F autosetup/sqlite-config.tcl f86956a902fe0c01a674b571ebe185a979b4f2cf2362e45f4bd0550438c473f7
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2213,8 +2213,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 5856251a7e8a69aa181f89533bc2a78812d8b450a407b4b2f73f0c146cd78072
-R b840bd624d9384d1c2e20ee14054bc6d
+P 1a72d1d13e42f69f02861f8ac3058e69b78d4fd2050ca8c53a1ce016b7e0863d
+R 6be0fd59d2238d0e8714620d2b90535a
 U stephan
-Z b6a8d00e4e4586215158387bb7650244
+Z 5ebdccbee6edfa6daea2a6438d80974e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b18861f2f0913b7902793bf6691052a80aaa9cca..fe3c17d67dc8f276110cce3850ebd8c4573e0c93 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a72d1d13e42f69f02861f8ac3058e69b78d4fd2050ca8c53a1ce016b7e0863d
+69e83ab859ca37c047defdaba84e80d028b30045631e773bd8dfa286c41a57e8