Small adjustment to main.mk that facilitates giving non-standard compile-time

options to the shell.

FossilOrigin-Name: 7c7d53a9bbc27fde2dcc028cb7765c76cad0a784e53095b652c90d371968c53d

diff --git a/main.mk b/main.mk
index ae45ddbe95818923640849a091a76756a7057b7e..4bd2f54ce4538adafc02eec1e456a8cbeee4b19b 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -474,7 +474,7 @@ TESTOPTS = --verbose=file --output=test-out.txt
 
 # Extra compiler options for various shell tools
 #
-SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+SHELL_OPT += -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
 SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
 SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB

diff --git a/manifest b/manifest
index a6685636f43d433233e0a4f11bf811a64b6648ca..964137da5b99b4260a86837095b8858a06e0feb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\s(machine-generated)\skeywordhash.h\sfile\sto\sincrease\sthe\sscope\sof\sthe\ntables\sused\sfor\skeyword\smatching,\sso\sthat\sthe\stables\sare\saccessible\sto\nfunctions\sother\sthen\skeywordCode().
-D 2017-07-06T16:33:14.765
+C Small\sadjustment\sto\smain.mk\sthat\sfacilitates\sgiving\snon-standard\scompile-time\noptions\sto\sthe\sshell.
+D 2017-07-06T22:43:41.021
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -372,7 +372,7 @@ F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk b57f019e6cd9d8770b019726c544098fe38f3b5db997d2af739352bbd7c7a14c
+F main.mk 0288de0e6b44c2fa709b354d4fab5bce423259cc1653c35305c6e50d23ec561a
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1628,7 +1628,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 efb4aab0caa4145732a5438cc2a193bc12c455b4007220564d240e75900ea8ad
-R 77ecc187246c1c337a58790c9818d2e8
+P c5ed5ebdf660501fde7cc8aefaaaeae2a68e5899a64ac93f26684842a235281d
+R 6da9681a8300122608feae7ebbab4f3b
 U drh
-Z a448086e00aa693e2477a7bd0d12a0df
+Z d8379145f29f5d92b4d9b65e1352aa6d

diff --git a/manifest.uuid b/manifest.uuid
index eed343f04b88f097ed91ee6e642cd3e5217a5d84..3fae0fd438de8df91864dee0ad4f1a3d693b018d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5ed5ebdf660501fde7cc8aefaaaeae2a68e5899a64ac93f26684842a235281d
\ No newline at end of file
+7c7d53a9bbc27fde2dcc028cb7765c76cad0a784e53095b652c90d371968c53d
\ No newline at end of file