Automatically register the FTS module if it is compiled into the build. (CVS 3384)

FossilOrigin-Name: 8a96bdb72439c0b337cbaa2d07897d0896ea3024

diff --git a/manifest b/manifest
index 7cd9d439f447ab2935318609364da539f3bb14c5..4e01f2ac86084745aa0260176b523e8bd68855bd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Construct\sthe\s.def\sfiles\sbefore\scalling\sdllwrap\sto\sbuild\sthe\s.dll\sfiles.\nTicket\s#1951.\s(CVS\s3383)
-D 2006-09-02T13:22:29
+C Automatically\sregister\sthe\sFTS\smodule\sif\sit\sis\scompiled\sinto\sthe\sbuild.\s(CVS\s3384)
+D 2006-09-02T13:58:07
 F Makefile.in 659b63368cfbb95a224c9d2f2a9897802d96a4ea
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -63,7 +63,7 @@ F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c e9526ced19978a55687b55faea969b6ff2a53fb4
 F src/legacy.c 10e01a902d7f2c872c7922fedf19a2df70935857
 F src/loadext.c 7a41142266dd2570fedf00108e1772047f98a673
-F src/main.c 96ab5f29fe903aa8a28f6e1463a3b8245bf1c416
+F src/main.c f780d73b3093807bd177d21af703665b3b15a452
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 3fd6a022bafd620fdfd779a51dccb42f31c97f75
@@ -395,7 +395,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P e98b0cf292f6dc9deb6ae9b773c52b16867f7556
-R d30765d3536c7164bd9433463202374c
+P e6e49a3811d4b26518026cc1692c654e8edbf741
+R 300b9738759115b8e19a01418309b320
 U drh
-Z 9802cd201774000537322344bd2335b3
+Z 653f283d344be54f865316af17b0e6ad

diff --git a/manifest.uuid b/manifest.uuid
index 909e9fd8a9b007254de71ccf446b62147500d8e3..3841d7b47ff1e2545a891472ab9290c9a27d0a58 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6e49a3811d4b26518026cc1692c654e8edbf741
\ No newline at end of file
+8a96bdb72439c0b337cbaa2d07897d0896ea3024
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index c9b997dabce9d129ec6a2c5bf62dbcdcae0de9ab..b7e2cf16d5bdde1d0d83266ed188b00e18218328 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.355 2006/08/23 20:07:22 drh Exp $
+** $Id: main.c,v 1.356 2006/09/02 13:58:07 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -917,6 +917,13 @@ static int openDatabase(
   */
   sqlite3AutoLoadExtensions(db);
 
+#ifdef SQLITE_ENABLE_FTS1
+  {
+    extern int sqlite3Fts1Init(sqlite3*);
+    sqlite3Fts1Init(db);
+  }
+#endif
+
 opendb_out:
   if( SQLITE_NOMEM==(rc = sqlite3_errcode(db)) ){
     sqlite3_close(db);