diff --git a/Makefile.in b/Makefile.in
index a4221176a5..10e949070d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,7 +250,7 @@ TLINK_shared = $(TLINK) @SHOBJ_LDFLAGS@
 AS_AUTO_DEF = $(TOP)/auto.def
 
 USE_AMALGAMATION = @USE_AMALGAMATION@
-AMALGAMATION_LINE_MACROS = @AMALGAMATION_LINE_MACROS@
+AMALGAMATION_LINE_MACROS = --linemacros=@AMALGAMATION_LINE_MACROS@
 
 #
 # Object files for the SQLite library (non-amalgamation).
@@ -275,11 +275,11 @@ LIBOBJS0 = alter.o analyze.o attach.o auth.o \
          random.o resolve.o rowset.o rtree.o \
          sqlite3session.o select.o sqlite3rbu.o status.o stmt.o \
          table.o threads.o tokenize.o treeview.o trigger.o \
-         update.o userauth.o upsert.o util.o vacuum.o \
+         update.o upsert.o userauth.o utf.o util.o vacuum.o \
          vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
-         vdbetrace.o vdbevtab.o \
+         vdbetrace.o vdbevtab.o vtab.o \
          wal.o walker.o where.o wherecode.o whereexpr.o \
-         window.o utf.o vtab.o
+         window.o
 
 # Object files for the amalgamation.
 #
@@ -1015,23 +1015,22 @@ dbfuzz2$(TEXE):	$(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
 	cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
 fuzzy: dbfuzz2$(TEXE)
 
-#XX#mptester$(TEXE):	sqlite3.lo $(TOP)/mptest/mptest.c
-#XX#	$(TLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.lo \
-#XX#		$(TLIBS) -rpath "$(libdir)"
-#XX#
-#XX#MPTEST1=./mptester$(TEXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20
-#XX#MPTEST2=./mptester$(TEXE) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20
-#XX#mptest:	mptester$(TEXE)
-#XX#	rm -f mptest.db
-#XX#	$(MPTEST1) --journalmode DELETE
-#XX#	$(MPTEST2) --journalmode WAL
-#XX#	$(MPTEST1) --journalmode WAL
-#XX#	$(MPTEST2) --journalmode PERSIST
-#XX#	$(MPTEST1) --journalmode PERSIST
-#XX#	$(MPTEST2) --journalmode TRUNCATE
-#XX#	$(MPTEST1) --journalmode TRUNCATE
-#XX#	$(MPTEST2) --journalmode DELETE
-#XX#
+mptester$(TEXE):	$(libsqlite3.LIB) $(TOP)/mptest/mptest.c
+	$(TLINK) -o $@ -I. $(TOP)/mptest/mptest.c $(libsqlite3.LIB) \
+		$(LDFLAGS_libsqlite3)
+
+MPTEST1=./mptester$(TEXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20
+MPTEST2=./mptester$(TEXE) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20
+mptest:	mptester$(TEXE)
+	rm -f mptest.db
+	$(MPTEST1) --journalmode DELETE
+	$(MPTEST2) --journalmode WAL
+	$(MPTEST1) --journalmode WAL
+	$(MPTEST2) --journalmode PERSIST
+	$(MPTEST1) --journalmode PERSIST
+	$(MPTEST2) --journalmode TRUNCATE
+	$(MPTEST1) --journalmode TRUNCATE
+	$(MPTEST2) --journalmode DELETE
 
 has_tclsh84:
 	sh $(TOP)/tool/cktclsh.sh 8.4 $(TCLSH_CMD)
diff --git a/auto.def b/auto.def
index 3b4befb652..95be21f7b5 100644
--- a/auto.def
+++ b/auto.def
@@ -307,7 +307,7 @@ hwaci-define-if-opt-truthy test-status TSTRNNR_OPTS \
   "test-runner flags:" {--status} {}
 
 hwaci-define-if-opt-truthy linemacros AMALGAMATION_LINE_MACROS \
-  "Use #line macros in the amalgamation:" {--linemacros=1} {--linemacros=0}
+  "Use #line macros in the amalgamation:"
 
 msg-checking "Debug build? "
 
diff --git a/manifest b/manifest
index 8e82fed1e4..c0854a57f0 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Remove\sthe\sproblematic\sdbfuzz2-asan/msan\stargets,\swhich\sRichard\ssays\sare\snot\sused\sanymore.
-D 2024-10-18T16:47:54.809
+C Get\smptest(er)\sbuilding.
+D 2024-10-19T00:49:01.662
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in b070ca8dd62ca803547f888f4e44391bf73d806789b3ea754bc6392140fdf3a6
+F Makefile.in d4188c8e3ff9bfd24deccf3512bd013d93cfa83d5c838618c45efe8638406a6e
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -14,7 +14,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 74a6b53f7050ab342e21e96fd67fa7044421e8c700b0ba7a2bfa28253319db6c
+F auto.def 0aea47e732fe1f71630413f9aba879fef838b8bac6c7b3c6199f23b37e541f67
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2238,8 +2238,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 3e843452927aaea152eab60213337912c34966e2c77d3cfd50d2ee9eb77c6796
-R f96b7f8acba78c395f1ccebf70c56c0a
+P 503ce205a1efe0d52b184b1b6a23b4b6b5adb7acf6f4617249a5fa1d81e523ef
+R 903ee20ca58e95a3ec54b2ae83b8cf71
 U stephan
-Z 8726b6ffa28a328589337a2d1c2ae656
+Z 1c47ba01bcf0515056dd5c051b8e0105
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 357fce43f0..5758713a30 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-503ce205a1efe0d52b184b1b6a23b4b6b5adb7acf6f4617249a5fa1d81e523ef
+f740f6a4447543751800465ddfa11c9e3c89fb7054a9dfb5450938885b8f9633