Move some of the in-comment configure script help text into the --help text. No funct...

FossilOrigin-Name: ee8449c482b6f9cfb82fa2417da194fc9aa56f54ef3ac83d368537181634ab1c

diff --git a/auto.def b/auto.def
index efdac7036aef794abdc6b47f0caba1b3ebe975b7..6b315f27f2f52b7019ef08dab7d651398b1801ba 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -122,6 +122,10 @@ set DUMP_DEFINES_JSON ""; #./config.defines.json
 #
 ########################################################################
 set flags {
+  # When writing {help text blocks}, be aware that autosetup formats
+  # them differently (left-aligned, under the --flag, if the block
+  # starts with a newline.
+
   # <build-modes>
   shared=1             => {Disable build of shared libary}
   static=1             => {Disable build of static library (mostly)}
@@ -146,20 +150,19 @@ set flags {
   all                  => {Enable FTS4, FTS5, Geopoly, RTree, Sessions}
   # </lib-feature>
   # <tcl>
-  # --with-tcl=DIR may be either a dir containing tclConfig.sh or a
-  # dir one level up from that from which we can derive a dir
-  # containing tclConfig.sh.
-  with-tcl:DIR         => {Directory containing tclConfig.sh}
-  # If --with-tclsh=X given, it is used for (A) trying to find
-  # tclConfig.sh and (B) all TCL-based code generation.  Warning: if
-  # its containing dir has multiple tclsh versions, it may select the
-  # wrong tclConfig.sh!
-  with-tclsh:PATH      => {Full pathname of tclsh to use}
-  # --disable-tcl disables building of components which require TCL,
-  # including tests. This tree requires TCL for code generation but
-  # can use the in-tree copy of autosetup/jimsh0.c for that. The
-  # SQLite TCL extension and the test code require a canonical tclsh.
-  tcl=1                => {Disable components which require TCL}
+  with-tcl:DIR         =>
+    {Directory containing tclConfig.sh or a directory one level up from
+     that, from which we can derive a directory containing tclConfig.sh.}
+  with-tclsh:PATH      =>
+    {Full pathname of tclsh to use.  It is used for (A) trying to find
+     tclConfig.sh and (B) all TCL-based code generation.  Warning: if
+     its containing dir has multiple tclsh versions, it may select the
+     wrong tclConfig.sh!}
+  tcl=1                =>
+    {Disable components which require TCL, including all tests.
+     This tree requires TCL for code generation but can use the in-tree
+     copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the
+     test code require a canonical tclsh.}
   # <tcl>
   # <line-editing>
   readline=1           => {Disable readline support}
@@ -192,11 +195,11 @@ set flags {
   with-emsdk:=auto     => {Top-most dir of the Emscripten SDK installation. Default = EMSDK env var.}
   # </alternative-builds>
   # <developer>
-  with-debug:=1        => {Enable debug build flags. --with-debug does more
-    than simply builds with a -g compilation flag and will impact
-    performance by as much as 4x, as it includes large numbers of
-    assert()s in performance-critical loops.  Never use --with-debug
-    for production builds.}
+  with-debug:=1        =>
+    {Enable debug build flags. This option will impact performance by
+     as much as 4x, as it includes large numbers of assert()s in
+     performance-critical loops.  Never use --with-debug for production
+     builds.}
   scanstatus           => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag}
   dev                  => {Enable dev-mode build: automatically enables certain other flags}
   test-status          => {Enable status of tests}

diff --git a/manifest b/manifest
index 0bfa840b55586c82ad954ef4b6b69190aaf88508..3f8f3a7d8d1bf2a2f4d886796922efc06638905b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\stweak\sto\s./configure\s--help\soutput.
-D 2024-11-26T16:04:02.500
+C Move\ssome\sof\sthe\sin-comment\sconfigure\sscript\shelp\stext\sinto\sthe\s--help\stext.\sNo\sfunctional\schanges.
+D 2024-11-26T16:12:05.631
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -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 4fa9375aac42aa422e1852ccd8218a275212db6ef3182bb666eb2874d8af3898
+F auto.def cb4d2a6a3809c3c015ad1d1e5a06836697f78e31b38f154cc20a7b0cb350e0d1
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2199,8 +2199,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 9225701cb88cb4629a12b45de5743378448b1d2ddb351916b77cfde638698070
-R 1fd1cba45dac3cc717428822f5c6efda
-U drh
-Z a193b2ce84a7cd5ee03073da19cb5fbf
+P 7e634d0569667ce1e17f4a611039cbb726078dc2e6be1f1b19655dc569170ce5
+R b03ff8f40892202b2bfdeabe2bfe4328
+U stephan
+Z e952930a3cd549b7813b14b13b6d132c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3d8eca1a4484270790c9e708c0f8c15a5478de12..baa37c305039d48d9ba4b16f11a650231eb8af73 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e634d0569667ce1e17f4a611039cbb726078dc2e6be1f1b19655dc569170ce5
+ee8449c482b6f9cfb82fa2417da194fc9aa56f54ef3ac83d368537181634ab1c