Fix the sqlite3(.EXE) build to honor --disable-amalgamation.

FossilOrigin-Name: bd66222721ad06e99c1b66a3a0fbde06532507aa067165f47fa5d6c41ba630e6

diff --git a/main.mk b/main.mk
index 8ed28d0bb6bfda3824f8655b25b7aaef632a3a75..aca8313f74d2fe60688c4bf01aa70c0f50584a6f 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1725,9 +1725,9 @@ threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
        $(T.link) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(LDFLAGS.libsqlite3)
 xbin: threadtest5
 
-sqlite3$(T.exe):       shell.c sqlite3.c
+sqlite3$(T.exe):       shell.c sqlite3.c $(LIBOBJ)
        $(T.link) -o $@ \
-               shell.c sqlite3.c \
+               shell.c $(LIBOBJ) \
                $(CFLAGS.readline) $(SHELL_OPT) \
                $(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
 

diff --git a/manifest b/manifest
index 96fccfbf924d10b55d8bb1330f6f44983623c7c8..890f776221ad3cf6e043d8dab9c2ea5fab3e3686 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\sautosetup\sbranch.
-D 2024-10-24T11:20:25.409
+C Fix\sthe\ssqlite3(.EXE)\sbuild\sto\shonor\s--disable-amalgamation.
+D 2024-10-24T12:03:02.198
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -707,7 +707,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk ece1eba12f6f0bba61a77a196abd88f665dd37124f767a28c2138d4860245059
+F main.mk 35a08d2d0c458205064f8b6ba453c540fcea21d6c389fba8ad8c5a71fb153082
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2236,8 +2236,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 56353bcffa1bad425b1645b09e7192aa418d6b989df5958e0a770226bfc2ce63 da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef
-R cc1b154ed902ce297ea76c4a560a28a4
-U drh
-Z 11c0afa471c73db054eb415d8e2d3805
+P d0554ac46866b5ad467b88de6fae06695fd81e7fdf38157702a395f7282cbe9d
+R 2faf1c48d071a03a05d748b2f0e797c7
+U stephan
+Z 0a7ea5c985771468eac3705a684f68b7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 54623038d2d1cff7ae14b9d74202e8692f581d15..5249bb4ead9721e85fe8ed6a65e2dec48e8ed319 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0554ac46866b5ad467b88de6fae06695fd81e7fdf38157702a395f7282cbe9d
+bd66222721ad06e99c1b66a3a0fbde06532507aa067165f47fa5d6c41ba630e6