Add #ifdefs to allow a test build to succeed even if SQLITE_ENABLE_FTS3 is

not defined.

FossilOrigin-Name: fb121980e48af368353431fd04924e414b65c852

diff --git a/ext/fts3/fts3_test.c b/ext/fts3/fts3_test.c
index 0fe63c1c755a3e95679f1b8764aa2386d6114f84..2244c9f736b4ea59a414e4a912a7543cb750a9c8 100644 (file)
--- a/ext/fts3/fts3_test.c
+++ b/ext/fts3/fts3_test.c
@@ -22,7 +22,8 @@
 #include <string.h>
 #include <assert.h>
 
-#ifdef SQLITE_TEST
+#if defined(SQLITE_TEST)
+#if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
 
 /* Required so that the "ifdef SQLITE_ENABLE_FTS3" below works */
 #include "fts3Int.h"
@@ -530,4 +531,5 @@ int Sqlitetestfts3_Init(Tcl_Interp *interp){
   );
   return TCL_OK;
 }
+#endif                  /* SQLITE_ENABLE_FTS3 || SQLITE_ENABLE_FTS4 */
 #endif                  /* ifdef SQLITE_TEST */

diff --git a/manifest b/manifest
index e8742476363d5eadc7cb9b61e12a132daacf8d6b..d8e545b9dc2b1cbca88417ed1c946d63f18f0949 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompiler\swarning\sby\sremoving\sa\sredundant\svariable.
-D 2012-03-31T19:12:23.626
+C Add\s#ifdefs\sto\sallow\sa\stest\sbuild\sto\ssucceed\seven\sif\sSQLITE_ENABLE_FTS3\sis\nnot\sdefined.
+D 2012-04-02T17:18:23.248
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -74,7 +74,7 @@ F ext/fts3/fts3_icu.c 62ec177c55f6a5c6e994dd3e5fd3194b4045c347
 F ext/fts3/fts3_porter.c a465b49fcb8249a755792f87516eff182efa42b3
 F ext/fts3/fts3_snippet.c 51a3a34c217e24678a133782c1dfb6f2f70fe559
 F ext/fts3/fts3_term.c 41e82ad335213d1c24356cf310dca1d3c13e7366
-F ext/fts3/fts3_test.c f3ef8ae1b802383c4d24fd70774cb87d52841d5f
+F ext/fts3/fts3_test.c f153a121c763993e3d94cc99c012ee68d13231ae
 F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
 F ext/fts3/fts3_tokenizer.h 66dec98e365854b6cd2d54f1a96bb6d428fc5a68
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
@@ -1000,7 +1000,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P d2bf0efa7da59448a62f5be795403be4e5b7fb7f
-R eb9cf6d41e33e7a95085e4fba3205ff0
+P af602d87736b52802a4e760ffeeaa28112b99d9a
+R 1de8fb5482810a4710e15863a31ff0ee
 U drh
-Z 4e3dd4b5d13ad4c124b7a657b2e6b48c
+Z 057914300e7aa29e2f4f5068087794b4

diff --git a/manifest.uuid b/manifest.uuid
index bb3edf477e2a17ab35eb1be88eb0040415b2d8ef..a74c90f45f457332b42bf44517575ce684692334 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-af602d87736b52802a4e760ffeeaa28112b99d9a
\ No newline at end of file
+fb121980e48af368353431fd04924e414b65c852
\ No newline at end of file