Minor tweaks to the way auxiliary tools are built, to make it easier to

customize the builds without having to alter the code.

FossilOrigin-Name: 90b06b6f42918852cfb15258be462c6bed260c6a618b86fa9084bac72fa2f58f

diff --git a/manifest b/manifest
index 7d997fe1d81b5d78b230f421c0454ae92b7e8aed..4bc51a1e0c4d7ebca4cf63bde9c3d41111c0f5f8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sperformance\sregression\sin\srtree\sintroduced\sby\sthe\sprevious\scommit.
-D 2021-11-18T20:11:31.718
+C Minor\stweaks\sto\sthe\sway\sauxiliary\stools\sare\sbuilt,\sto\smake\sit\seasier\sto\ncustomize\sthe\sbuilds\swithout\shaving\sto\salter\sthe\scode.
+D 2021-11-18T20:56:59.677
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -559,7 +559,7 @@ F src/sqliteInt.h 42c8f4c05ddbe8214d439aa80d98914d1883104f8f518820ce2e9e4e183c31
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
-F src/tclsqlite.c 428e813dabf82804bc13196af35a0c3c6ef4347fe557fa6717c5c66bba6e8520
+F src/tclsqlite.c 50c2b759f4a918e41ed7a038baaef087ff264c7b3adddf39741315a53fd92e47
 F src/test1.c d6c945a8bb211ed72ea515f0b9743caeaf38c66da6418a7b1dcf3764e1368bbb
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@ -1899,7 +1899,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
 F tool/split-sqlite3c.tcl 3efcd4240b738f6bb2b5af0aea7e1e0ef9bc1c61654f645076cec883030b710c
 F tool/sqldiff.c 9c639de9fa541a947ea9776435c84adf00f43945e262556e15219ef09f0d912c
-F tool/sqlite3_analyzer.c.in 7eeaae8b0d7577662acaabbb11107af0659d1b41bc1dfdd4d91422de27127968
+F tool/sqlite3_analyzer.c.in f88615bf33098945e0a42f17733f472083d150b58bdaaa5555a7129d0a51621c
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
@@ -1933,7 +1933,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 509027e964f28efca088a41fe32f01c38316f7a919de63a8835e3bc7c3fb0787
-R c2cdaff31ea77237329e59841c0f182a
-U dan
-Z 4c54e10f3cfe7975c8bc532dcc527100
+P 7f42b8e1a25c0830fe81e4668318998af595826784a50780a5c1c0b4d95a2482
+R 7fc4ecd1448b6305c428d5164e326f71
+U drh
+Z 3efafb7c09c67bd8bd80d6c3aff384ef

diff --git a/manifest.uuid b/manifest.uuid
index 979a1d53c17f592b712b226b046e5f9f793fd0b1..d39645383242cdf0a21e8846a445d7d97ead2b24 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f42b8e1a25c0830fe81e4668318998af595826784a50780a5c1c0b4d95a2482
\ No newline at end of file
+90b06b6f42918852cfb15258be462c6bed260c6a618b86fa9084bac72fa2f58f
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index b9b78b42b948156229330d80a74c2f1f91ba3b0f..1934944841d47c705d7bab3db68c1e769effeb0c 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -3975,7 +3975,9 @@ static const char *tclsh_main_loop(void){
   return zMainloop;
 }
 
-#define TCLSH_MAIN main   /* Needed to fake out mktclapp */
+#ifndef TCLSH_MAIN
+# define TCLSH_MAIN main
+#endif
 int SQLITE_CDECL TCLSH_MAIN(int argc, char **argv){
   Tcl_Interp *interp;
   int i;

diff --git a/tool/sqlite3_analyzer.c.in b/tool/sqlite3_analyzer.c.in
index e830521e08aff96f5b0b99312678e5e5d823df8e..d8b000209f8669fde28dba2bac29a792adf36d5a 100644 (file)
--- a/tool/sqlite3_analyzer.c.in
+++ b/tool/sqlite3_analyzer.c.in
@@ -14,7 +14,7 @@
 #define SQLITE_DEFAULT_MEMSTATUS 0
 #define SQLITE_MAX_EXPR_DEPTH 0
 #define SQLITE_OMIT_LOAD_EXTENSION 1
-#ifndef USE_EXTERNAL_SQLITE
+#if !defined(SQLITE_AMALGAMATION) && !defined(USE_EXTERNAL_SQLITE)
 INCLUDE sqlite3.c
 #endif
 INCLUDE $ROOT/src/tclsqlite.c