Merge recent enhancements from trunk, and especially the fix for

ticket [1b266395d6bc10].

FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977

main.mk

@@ -461,7 +461,7 @@ FUZZDATA = \
 # Extra arguments for including json1 in the build of tools
 #
 JSON1_DEP = $(TOP)/ext/misc/json1.c sqlite3ext.h
-JSON1_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_CORE
+JSON1_OPT = -DSQLITE_SHELL_JSON1 -DSQLITE_CORE
 JSON1_SRC = $(TOP)/ext/misc/json1.c
 
 # Standard options to testfixture
@@ -540,6 +540,9 @@ sqlite3.c:	target_source $(TOP)/tool/mksqlite3c.tcl
 	echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
 	cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
 
+sqlite3ext.h:	target_source
+	cp tsrc/sqlite3ext.h .
+
 sqlite3.c-debug:	target_source $(TOP)/tool/mksqlite3c.tcl
 	tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros
 	echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c