From: drh <drh@noemail.net>
Date: Fri, 9 Oct 2015 13:39:51 +0000 (+0000)
Subject: Add the JSON1 and FTS5 extensions to the amalgamation.  Add new options
X-Git-Tag: version-3.9.0~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5c8d27c7d0b43845472a3c9f7799a77fa536a36;p=thirdparty%2Fsqlite.git

Add the JSON1 and FTS5 extensions to the amalgamation.  Add new options
to ./configure: --enable-json1 and --enable-fts5.

FossilOrigin-Name: 1eb769933108cf401b25c8d784ea23f27324a0bd
---

b5c8d27c7d0b43845472a3c9f7799a77fa536a36
diff --cc manifest
index 21a3f451d2,6fc180d764..a156fd5c23
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C In\sthe\sRBU\sextension,\suse\sMoveFile()\sinstead\sof\srename()\son\sWindows\sCE.
- D 2015-10-08T17:35:51.419
 -C Fix\sa\stypo\sin\sthe\sMSVC\sMakefile
 -D 2015-10-09T13:29:27.852
++C Add\sthe\sJSON1\sand\sFTS5\sextensions\sto\sthe\samalgamation.\s\sAdd\snew\soptions\nto\s./configure:\s--enable-json1\sand\s--enable-fts5.
++D 2015-10-09T13:39:51.526
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
+ F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b9054642ab305be4174d8b0433c9951c2839701d
+ F Makefile.msc cc5793c66d1d280d20c5a0652c176e0e115638df
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -1390,7 -1390,7 +1390,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 77b707b77496a08703fe9405e8e4521a4e5b419e
- R eb5e353b0e8d7971537e54b62cea0233
- U mistachkin
- Z 4af6b4774e4af64194b7825912a990a6
 -P a0c44f1d46f1f31043d66f20c8dc0df53db15c30
 -R 79fcc81444e121108889bba9b50309d6
++P df9ef61f1ba2e3a3420fae84e3eaa2e0e235bc28 c8a12082380991781b5ecd2f479ec65600f4f695
++R ff35e33c45066b639f8723b72567b740
++T +closed c8a12082380991781b5ecd2f479ec65600f4f695
+ U drh
 -Z 6994955bda3f00155718d20bf831c8ed
++Z 9e03a387129508847442535127adeb67
diff --cc manifest.uuid
index 2d8861387e,e1713c873f..c12eaca407
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- df9ef61f1ba2e3a3420fae84e3eaa2e0e235bc28
 -c8a12082380991781b5ecd2f479ec65600f4f695
++1eb769933108cf401b25c8d784ea23f27324a0bd