From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 4 Aug 2008 11:49:20 +0000 (+0000)
Subject: Make it easier to build with the icu extension enabled. Include icu.c in the amalgama... 
X-Git-Tag: version-3.6.10~644
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c8a5d089383e4983342238ce393dd7df44e2a5e;p=thirdparty%2Fsqlite.git

Make it easier to build with the icu extension enabled. Include icu.c in the amalgamation source. Ticket #3245. (CVS 5533)

FossilOrigin-Name: e42ff97ba7d9fcda699a63fc8bc609d559498180
---

diff --git a/main.mk b/main.mk
index 7a18f2f542..be78b8d6ea 100644
--- a/main.mk
+++ b/main.mk
@@ -58,7 +58,7 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o bitvec.o btmutex.o btree.o build.o \
          select.o status.o table.o $(TCLOBJ) tokenize.o trigger.o \
          update.o util.o vacuum.o \
          vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbefifo.o vdbemem.o \
-         where.o utf.o legacy.o vtab.o rtree.o
+         where.o utf.o legacy.o vtab.o rtree.o icu.o
 
 EXTOBJ = icu.o
 EXTOBJ += fts1.o \
diff --git a/manifest b/manifest
index 724e15b217..f3b41702b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sassert()\sstatement\sthat\swill\salert\sus\sif\sthe\spotential\sproblem\sidentified\sby\s#3243\sever\sbecomes\sa\sreality.\s(CVS\s5532)
-D 2008-08-04T04:39:49
+C Make\sit\seasier\sto\sbuild\swith\sthe\sicu\sextension\senabled.\sInclude\sicu.c\sin\sthe\samalgamation\ssource.\sTicket\s#3245.\s(CVS\s5533)
+D 2008-08-04T11:49:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -76,7 +76,7 @@ F ext/rtree/rtree_util.tcl ee0a0311eb12175319d78bfb37302320496cee6e
 F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
-F main.mk ece0e4f0b8ba76c690c3332bded6291f2d391a6a
+F main.mk eace65a99d12045ca496069dc707405a63197006
 F mkdll.sh ce8c8cc3528d63eda1702eb65b17c2d710eb3b89
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -602,7 +602,7 @@ F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c ef93810fc41fb3d3dbacf9a33a29be88ea99ffa9
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
-F tool/mksqlite3c.tcl dbc5c9a6752e729f09bf4422a04fac4b84ee61e4
+F tool/mksqlite3c.tcl bc5a951735e78eb37cd47f539b2400318c436872
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 5a25ea687df5da8dd9b94bf1683f5cf2c210e51d
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 540c9d4c0daf9ddf07c95bb3eb9f294a2dd0285d
-R 4c6ed43221defe5cb2ad688acec376b6
+P 34208f0ba420ca6bef16991eba200d5ed68d5430
+R afddfaf2852ede007adbb58923e9cce3
 U danielk1977
-Z 98925fc3ae9fdb0af8d49d1de0df3909
+Z 291ffe5c183aae756520564690b07267
diff --git a/manifest.uuid b/manifest.uuid
index 325a243a46..f3b0b4fbc6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-34208f0ba420ca6bef16991eba200d5ed68d5430
\ No newline at end of file
+e42ff97ba7d9fcda699a63fc8bc609d559498180
\ No newline at end of file
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 14efc7157c..98aede2a79 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -280,6 +280,7 @@ foreach file {
    fts3_tokenizer1.c
 
    rtree.c
+   icu.c
 } {
   copy_file tsrc/$file
 }