Sync up the MSVC autoconf makefile.

FossilOrigin-Name: 44cebc6e684bcc1b6a4230f04b8ae9de237486476f5fe4ae4cfec4d899644c73

diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index 9f867986d7160c13ea15c2303f68635225656709..f0f9a01ee0029fcde9b2e4f4a79ef76106809013 100644 (file)
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -927,7 +927,7 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 !ENDIF
 
 

diff --git a/manifest b/manifest
index ab36828d3fbdd96b7a06db618c7f89fea668101b..245e3193bd15b417847c9bd0888718739e66b5d9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sconsistent\scolumn\snames.\s\sCherry-pick\sof\n[09834279]\sand\s[0c38dde45]\sas\sa\sfix\sfor\sticket\s[de3403bf5ae].
-D 2017-07-31T17:40:15.444
+C Sync\sup\sthe\sMSVC\sautoconf\smakefile.
+D 2017-07-31T19:34:27.984
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
-F autoconf/Makefile.msc 1014be616b420a5f48611d21b62ca2f50ec97ee795087ecb8a4d6bf6375ba11d
+F autoconf/Makefile.msc b77aec100e4fb4739748a2461b5aa82c179fcde35bc0e08ce52ae7322d218701
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac 2893b823ecc86cea13739f6c8109a41392254d1db08235c5615e0af5722c8578
@@ -1637,7 +1637,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5c8cb1ff5da872fb5ab3f77f678b9df3b68525433f6d5d918f2911a5622bdd14 0c38dde4543d6183a6ab0b7b3b75819f56c47704756a2426d54d3f20468d78d8
-R 8550eb0362d36c7e3ef03e8f100c7ce0
+P be0e24a0293f31b81fc5608a1d5aa1e57d3f5f7dddef6b368ae2e207bbdaf44c
+Q +b3b89f4ff92ee4b76f467d4e70fb42267470aef77af645f1ce71f9b1a675aabb
+R 1f295e828b184a6c74fcbbb8722d6e99
 U drh
-Z be23c278f6fcd3e72481f62a234ad5ef
+Z 0c4d0891e158e0355e09d09cdb3e351f

diff --git a/manifest.uuid b/manifest.uuid
index 3755f1c36dbd91d652d9b7ca1af3d6f6453493a7..9be6b7fcffe7ec331f762e4ec097f2da8bea4268 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-be0e24a0293f31b81fc5608a1d5aa1e57d3f5f7dddef6b368ae2e207bbdaf44c
\ No newline at end of file
+44cebc6e684bcc1b6a4230f04b8ae9de237486476f5fe4ae4cfec4d899644c73
\ No newline at end of file