From: stephan <stephan@noemail.net>
Date: Thu, 21 Aug 2025 17:59:28 +0000 (+0000)
Subject: Add config as an alias for the reconfigure makefile target. Minor makefile doc tweaks... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8376b87ae3ffc1d9cb274966465eaf950551d195;p=thirdparty%2Fsqlite.git

Add config as an alias for the reconfigure makefile target. Minor makefile doc tweaks. Random typo fixes in shell.c.in and tclsqlite.h pointed out by the misspell makefile target. No code changes.

FossilOrigin-Name: 9f15182776b30676c9aae9bcb5d4ad7580359fbdd607c2a9227c9cf2c81a4054
---

diff --git a/Makefile.in b/Makefile.in
index ef10da7a32..a597a86a35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,10 +11,6 @@
 #
 all:
 ########################################################################
-#
-# Known TODOs/FIXMEs/TOIMPROVEs for the autosetup port, in no
-# particular order...
-#
 # Maintenance reminders:
 #
 # - This makefile should remain as POSIX-make-compatible as possible:
@@ -257,8 +253,8 @@ AS_AUTO_DEF = $(TOP)/auto.def
 # invoked with to produce this makefile.
 #
 AS_AUTORECONFIG = @SQLITE_AUTORECONFIG@
-.PHONY: reconfigure
-reconfigure:
+.PHONY: config reconfigure
+config reconfigure:
 	$(AS_AUTORECONFIG)
 USE_AMALGAMATION ?= @USE_AMALGAMATION@
 LINK_TOOLS_DYNAMICALLY ?= @LINK_TOOLS_DYNAMICALLY@
@@ -317,9 +313,8 @@ fiddle: sqlite3.c shell.c
 ./custom.rws: ./tool/custom.txt
 	@echo 'Updating custom dictionary from tool/custom.txt'
 	aspell --lang=en create master ./custom.rws < ./tool/custom.txt
-# Note that jimsh does not work here:
-# https://github.com/msteveb/jimtcl/issues/319
 misspell: ./custom.rws has_tclsh84
+# $(JIMSH) does not work with spellsift.tcl
 	$(TCLSH_CMD) ./tool/spellsift.tcl ./src/*.c ./src/*.h ./src/*.in
 
 #
@@ -336,7 +331,7 @@ distclean: distclean-autosetup
 
 #
 # tool/version-info: a utility for emitting sqlite3 version info
-# in various forms.
+# in various forms. It's used by ext/wasm/.
 #
 version-info$(T.exe): $(TOP)/tool/version-info.c Makefile sqlite3.h
 	$(T.link) $(ST_OPT) -o $@ $(TOP)/tool/version-info.c
diff --git a/manifest b/manifest
index 7c0f96525d..d4a8f2bf99 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Remove\ssome\sresolved\sTODOs\sfrom\sthe\smakefile.\sEnsure\sthat\stestfixture\slinks\sagainst\sTCL_LIBS.
-D 2025-08-21T17:39:44.181
+C Add\sconfig\sas\san\salias\sfor\sthe\sreconfigure\smakefile\starget.\sMinor\smakefile\sdoc\stweaks.\sRandom\stypo\sfixes\sin\sshell.c.in\sand\stclsqlite.h\spointed\sout\sby\sthe\smisspell\smakefile\starget.\sNo\scode\schanges.
+D 2025-08-21T17:59:28.172
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
-F Makefile.in fe6bed3183c8fa49476cb66c9895100bcbbb59681b5f72dbb47f1c8ea440fd93
+F Makefile.in 3ce07126d7e87c7464301482e161fdae6a51d0a2aa06b200b8f0000ef4d6163b
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 F Makefile.msc b87ac9041d87f61fabd6074e6d8b71dd7f78c884a2307bbb9301f9d436ce9242
 F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
@@ -742,7 +742,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 639bac342c1fdc6be97ee806f5e9e4b0ed325889a3f24a17e955a6e9be99f510
-F src/shell.c.in 7918c9355667b3b348e5850f0dad9095476ef942ee3b96ee9b8bc2710adda1da
+F src/shell.c.in 0636915df0dbac6c780f04959f5d1055f206fb281b2c8fc8b113fe7bfc7d44ef
 F src/sqlite.h.in ebfc0358de0e18aabee7fa918f2f846894e23bebc74160fbe265c99046ee61b8
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
@@ -751,7 +751,7 @@ F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cd
 F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 3c604c49e6cf4211960a9ddb9505280fd22cde32175f40884c641c0f5a286036
-F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
+F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
 F src/test1.c 82d8aab7162a758d030728cab6ae6011785234854b7d6d2aebd877f985d1016a
 F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
 F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a
@@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 4e473cf0c21dd78d457f5728086372464e82de95c5431a2587efd580f5076291
-R 0466857e280658b283850635040c4085
+P b7751d144330593b5d41cb50e44b5134baad722be65173a7f55887f5e86a8c9d
+R 359a172be743a2ba56fdf6cd3ef60701
 U stephan
-Z 72805da7d58402f56ee1e19fad798bf6
+Z 9023dae810be69b855f77befd01945fa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fe11111a55..7fae32f095 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7751d144330593b5d41cb50e44b5134baad722be65173a7f55887f5e86a8c9d
+9f15182776b30676c9aae9bcb5d4ad7580359fbdd607c2a9227c9cf2c81a4054
diff --git a/src/shell.c.in b/src/shell.c.in
index 3b797223ad..dae0431996 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1905,7 +1905,7 @@ static void output_hex_blob(FILE *out, const void *pBlob, int nBlob){
 ** Output the given string as a quoted string using SQL quoting conventions:
 **
 **   (1)   Single quotes (') within the string are doubled
-**   (2)   The whle string is enclosed in '...'
+**   (2)   The while string is enclosed in '...'
 **   (3)   Control characters other than \n, \t, and \r\n are escaped
 **         using \u00XX notation and if such substitutions occur,
 **         the whole string is enclosed in unistr('...') instead of '...'.
@@ -2151,7 +2151,7 @@ static void output_json_string(FILE *out, const char *z, i64 n){
 ** other than \t, \n, and \r\n
 **
 ** If no escaping is needed (the common case) then set *ppFree to NULL
-** and return the original string.  If escapingn is needed, write the
+** and return the original string.  If escaping is needed, write the
 ** escaped string into memory obtained from sqlite3_malloc64() or the
 ** equivalent, and return the new string and set *ppFree to the new string
 ** as well.
diff --git a/src/tclsqlite.h b/src/tclsqlite.h
index a9a1262931..f71ec9a7c2 100644
--- a/src/tclsqlite.h
+++ b/src/tclsqlite.h
@@ -32,7 +32,7 @@
 
 /******  Any edits to this file must mirrored in tclsqlite.c ***********/
 
-/* Compatability between Tcl8.6 and Tcl9.0 */
+/* Compatibility between Tcl8.6 and Tcl9.0 */
 #if TCL_MAJOR_VERSION==9
 # define CONST const
 #elif !defined(Tcl_Size)