Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -171,10 +171,11 @@
          expr.lo fault.lo fkey.lo \
          fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
          fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
          fts3_tokenize_vtab.lo \
          fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
+	 fts5.lo \
          func.lo global.lo hash.lo \
          icu.lo insert.lo journal.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
          memjournal.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
@@ -345,26 +346,10 @@
   $(TOP)/ext/rtree/rtree.c
 SRC += \
   $(TOP)/ext/ota/sqlite3ota.h \
   $(TOP)/ext/ota/sqlite3ota.c
 
-SRC += \
-   $(TOP)/ext/fts5/fts5.h \
-   $(TOP)/ext/fts5/fts5Int.h \
-   $(TOP)/ext/fts5/fts5_aux.c \
-   $(TOP)/ext/fts5/fts5_buffer.c \
-   $(TOP)/ext/fts5/fts5_main.c \
-   $(TOP)/ext/fts5/fts5_config.c \
-   $(TOP)/ext/fts5/fts5_expr.c \
-   $(TOP)/ext/fts5/fts5_hash.c \
-   $(TOP)/ext/fts5/fts5_index.c \
-   fts5parse.c fts5parse.h \
-   $(TOP)/ext/fts5/fts5_storage.c \
-   $(TOP)/ext/fts5/fts5_tokenize.c \
-   $(TOP)/ext/fts5/fts5_unicode2.c \
-   $(TOP)/ext/fts5/fts5_vocab.c 
-
 
 # Generated source code files
 #
 SRC += \
   keywordhash.h \
@@ -427,10 +412,11 @@
   $(TOP)/ext/misc/amatch.c \
   $(TOP)/ext/misc/closure.c \
   $(TOP)/ext/misc/eval.c \
   $(TOP)/ext/misc/fileio.c \
   $(TOP)/ext/misc/fuzzer.c \
+  $(TOP)/ext/fts5/fts5_tcl.c \
   $(TOP)/ext/misc/ieee754.c \
   $(TOP)/ext/misc/nextchar.c \
   $(TOP)/ext/misc/percentile.c \
   $(TOP)/ext/misc/regexp.c \
   $(TOP)/ext/misc/spellfix.c \
@@ -988,10 +974,29 @@
 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_write.c
 
 rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
 
+# FTS5 things
+#
+FTS5_SRC = \
+   $(TOP)/ext/fts5/fts5.h \
+   $(TOP)/ext/fts5/fts5Int.h \
+   $(TOP)/ext/fts5/fts5_aux.c \
+   $(TOP)/ext/fts5/fts5_buffer.c \
+   $(TOP)/ext/fts5/fts5_main.c \
+   $(TOP)/ext/fts5/fts5_config.c \
+   $(TOP)/ext/fts5/fts5_expr.c \
+   $(TOP)/ext/fts5/fts5_hash.c \
+   $(TOP)/ext/fts5/fts5_index.c \
+   fts5parse.c fts5parse.h \
+   $(TOP)/ext/fts5/fts5_storage.c \
+   $(TOP)/ext/fts5/fts5_tokenize.c \
+   $(TOP)/ext/fts5/fts5_unicode2.c \
+   $(TOP)/ext/fts5/fts5_varint.c \
+   $(TOP)/ext/fts5/fts5_vocab.c  \
+
 fts5parse.c:	$(TOP)/ext/fts5/fts5parse.y lemon 
 	cp $(TOP)/ext/fts5/fts5parse.y .
 	rm -f fts5parse.h
 	./lemon $(OPTS) fts5parse.y
 	mv fts5parse.c fts5parse.c.orig
@@ -1000,10 +1005,16 @@
 		| sed 's/TOKEN/FTS5TOKEN/g' >> fts5parse.c
 	echo "#endif /* SQLITE_ENABLE_FTS5 */" >> fts5parse.c
 
 fts5parse.h: fts5parse.c
 
+fts5.c: $(FTS5_SRC)
+	$(TCLSH_CMD) $(TOP)/ext/fts5/tool/mkfts5c.tcl
+
+fts5.lo:	fts5.c $(HDR) $(EXTHDR)
+	$(LTCOMPILE) -DSQLITE_CORE -c fts5.c
+
 
 # Rules to build the 'testfixture' application.
 #
 # If using the amalgamation, use sqlite3.c directly to build the test
 # fixture.  Otherwise link against libsqlite3.la.  (This distinction is

Index: ext/fts5/test/fts5_common.tcl
==================================================================
--- ext/fts5/test/fts5_common.tcl
+++ ext/fts5/test/fts5_common.tcl
@@ -12,10 +12,11 @@
 
 if {![info exists testdir]} {
   set testdir [file join [file dirname [info script]] .. .. .. test]
 }
 source $testdir/tester.tcl
+
 
 catch { sqlite3_fts5_may_be_corrupt 0 }
 
 proc fts5_test_poslist {cmd} {
   set res [list]

Index: ext/fts5/test/fts5alter.test
==================================================================
--- ext/fts5/test/fts5alter.test
+++ ext/fts5/test/fts5alter.test
@@ -14,10 +14,15 @@
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5alter
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 #-------------------------------------------------------------------------
 # Test renaming regular, contentless and columnsize=0 FTS5 tables.
 #
 do_execsql_test 1.1.0 {

Index: ext/fts5/test/fts5aux.test
==================================================================
--- ext/fts5/test/fts5aux.test
+++ ext/fts5/test/fts5aux.test
@@ -12,10 +12,16 @@
 # Tests focusing on the auxiliary function APIs.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5aux
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 proc inst {cmd i} { 
   $cmd xInst $i
 }
 sqlite3_fts5_create_function db inst inst

Index: ext/fts5/test/fts5auxdata.test
==================================================================
--- ext/fts5/test/fts5auxdata.test
+++ ext/fts5/test/fts5auxdata.test
@@ -12,10 +12,16 @@
 # Tests focusing on the fts5 xSetAuxdata() and xGetAuxdata() APIs.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5auxdata
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE f1 USING fts5(a, b);
   INSERT INTO f1(rowid, a, b) VALUES(1, 'a', 'b1');
   INSERT INTO f1(rowid, a, b) VALUES(2, 'a', 'b2');

Index: ext/fts5/test/fts5bigpl.test
==================================================================
--- ext/fts5/test/fts5bigpl.test
+++ ext/fts5/test/fts5bigpl.test
@@ -14,10 +14,16 @@
 # required, these tests only run on 64-bit platforms.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5bigpl
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 if { $tcl_platform(wordSize)<8 } {
   finish_test
   return
 }

Index: ext/fts5/test/fts5columnsize.test
==================================================================
--- ext/fts5/test/fts5columnsize.test
+++ ext/fts5/test/fts5columnsize.test
@@ -12,10 +12,16 @@
 # Tests focusing on fts5 tables with the columnsize=0 option.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5columnsize
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 #-------------------------------------------------------------------------
 # Check that the option can be parsed and that the %_docsize table is
 # only created if it is set to true.
 #

Index: ext/fts5/test/fts5config.test
==================================================================
--- ext/fts5/test/fts5config.test
+++ ext/fts5/test/fts5config.test
@@ -13,10 +13,16 @@
 # with parsing the various configuration and CREATE TABLE options.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5config
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 #-------------------------------------------------------------------------
 # Try different types of quote characters.
 #
 do_execsql_test 1.0 {

Index: ext/fts5/test/fts5content.test
==================================================================
--- ext/fts5/test/fts5content.test
+++ ext/fts5/test/fts5content.test
@@ -12,10 +12,16 @@
 # This file contains tests for the content= and content_rowid= options.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5content
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 #-------------------------------------------------------------------------
 # Contentless tables
 #
 do_execsql_test 1.1 {

Index: ext/fts5/test/fts5corrupt.test
==================================================================
--- ext/fts5/test/fts5corrupt.test
+++ ext/fts5/test/fts5corrupt.test
@@ -13,10 +13,16 @@
 # inconsistencies (corruption) in the on-disk backing tables.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE t1 USING fts5(x);
   INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
 }

Index: ext/fts5/test/fts5corrupt2.test
==================================================================
--- ext/fts5/test/fts5corrupt2.test
+++ ext/fts5/test/fts5corrupt2.test
@@ -14,10 +14,16 @@
 # "correctly" means without crashing.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt2
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 sqlite3_fts5_may_be_corrupt 1
 
 # Create a simple FTS5 table containing 100 documents. Each document 
 # contains 10 terms, each of which start with the character "x".
 #

Index: ext/fts5/test/fts5corrupt3.test
==================================================================
--- ext/fts5/test/fts5corrupt3.test
+++ ext/fts5/test/fts5corrupt3.test
@@ -14,10 +14,16 @@
 # "correctly" means without crashing.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt3
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 sqlite3_fts5_may_be_corrupt 1
 
 # Create a simple FTS5 table containing 100 documents. Each document 
 # contains 10 terms, each of which start with the character "x".
 #

Index: ext/fts5/test/fts5dlidx.test
==================================================================
--- ext/fts5/test/fts5dlidx.test
+++ ext/fts5/test/fts5dlidx.test
@@ -12,10 +12,16 @@
 # This test is focused on uses of doclist-index records.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5dlidx
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 if { $tcl_platform(wordSize)<8 } {
   finish_test
   return
 }

Index: ext/fts5/test/fts5doclist.test
==================================================================
--- ext/fts5/test/fts5doclist.test
+++ ext/fts5/test/fts5doclist.test
@@ -12,10 +12,16 @@
 # This test is focused on edge cases in the doclist format.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5doclist
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 
 #-------------------------------------------------------------------------
 # Create a table with 1000 columns. Then add some large documents to it.
 # All text is in the right most column of the table.

Index: ext/fts5/test/fts5full.test
==================================================================
--- ext/fts5/test/fts5full.test
+++ ext/fts5/test/fts5full.test
@@ -14,10 +14,16 @@
 # crisismerge are both disabled.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5full
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE x8 USING fts5(i);
   INSERT INTO x8(x8, rank) VALUES('automerge', 0);
   INSERT INTO x8(x8, rank) VALUES('crisismerge', 100000);

Index: ext/fts5/test/fts5hash.test
==================================================================
--- ext/fts5/test/fts5hash.test
+++ ext/fts5/test/fts5hash.test
@@ -12,10 +12,16 @@
 # The tests in this file are focused on the code in fts5_hash.c.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5hash
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 #-------------------------------------------------------------------------
 # Return a list of tokens (a vocabulary) that all share the same hash
 # key value. This can be used to test hash collisions.
 #

Index: ext/fts5/test/fts5integrity.test
==================================================================
--- ext/fts5/test/fts5integrity.test
+++ ext/fts5/test/fts5integrity.test
@@ -12,10 +12,16 @@
 # This file containst tests focused on the integrity-check procedure.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5integrity
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE xx USING fts5(x);
   INSERT INTO xx VALUES('term');
 }

Index: ext/fts5/test/fts5merge.test
==================================================================
--- ext/fts5/test/fts5merge.test
+++ ext/fts5/test/fts5merge.test
@@ -12,10 +12,16 @@
 # Test that focus on incremental merges of segments.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5merge
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 db func repeat [list string repeat]
 
 #-------------------------------------------------------------------------
 # Create an fts index so that:

Index: ext/fts5/test/fts5near.test
==================================================================
--- ext/fts5/test/fts5near.test
+++ ext/fts5/test/fts5near.test
@@ -12,10 +12,16 @@
 # Tests focused on the NEAR operator.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5near
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 proc do_near_test {tn doc near res} {
   uplevel [list do_execsql_test $tn "
     DELETE FROM t1;
     INSERT INTO t1 VALUES('$doc');

Index: ext/fts5/test/fts5optimize.test
==================================================================
--- ext/fts5/test/fts5optimize.test
+++ ext/fts5/test/fts5optimize.test
@@ -11,10 +11,16 @@
 #
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5optimize
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 proc rnddoc {nWord} {
   set vocab {a b c d e f g h i j k l m n o p q r s t u v w x y z}
   set nVocab [llength $vocab]
   set ret [list]

Index: ext/fts5/test/fts5plan.test
==================================================================
--- ext/fts5/test/fts5plan.test
+++ ext/fts5/test/fts5plan.test
@@ -12,10 +12,16 @@
 # This file focuses on testing the planner (xBestIndex function).
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5plan
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE TABLE t1(x, y);
   CREATE VIRTUAL TABLE f1 USING fts5(ff);
 }

Index: ext/fts5/test/fts5porter.test
==================================================================
--- ext/fts5/test/fts5porter.test
+++ ext/fts5/test/fts5porter.test
@@ -14,10 +14,16 @@
 #   http://tartarus.org/martin/PorterStemmer/
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5porter
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 set test_vocab {
   a               a               aaron           aaron          
   abaissiez       abaissiez       abandon         abandon        
   abandoned       abandon         abase           abas           

Index: ext/fts5/test/fts5porter2.test
==================================================================
--- ext/fts5/test/fts5porter2.test
+++ ext/fts5/test/fts5porter2.test
@@ -15,10 +15,16 @@
 # improve test coverage of the porter stemmer implementation.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5porter2
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 set test_vocab {
   tion          tion
   ation         ation
   vation        vation

Index: ext/fts5/test/fts5prefix.test
==================================================================
--- ext/fts5/test/fts5prefix.test
+++ ext/fts5/test/fts5prefix.test
@@ -12,10 +12,16 @@
 # This file containst tests focused on prefix indexes.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5prefix
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE xx USING fts5(x, prefix=1);
   INSERT INTO xx VALUES('one two three');
   INSERT INTO xx VALUES('four five six');

Index: ext/fts5/test/fts5rank.test
==================================================================
--- ext/fts5/test/fts5rank.test
+++ ext/fts5/test/fts5rank.test
@@ -12,10 +12,16 @@
 # This file focuses on testing queries that use the "rank" column.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5rank
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 
 #-------------------------------------------------------------------------
 # "ORDER BY rank" + highlight() + large poslists.
 #

Index: ext/fts5/test/fts5rebuild.test
==================================================================
--- ext/fts5/test/fts5rebuild.test
+++ ext/fts5/test/fts5rebuild.test
@@ -11,10 +11,16 @@
 #
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5rebuild
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.1 {
   CREATE VIRTUAL TABLE f1 USING fts5(a, b);
   INSERT INTO f1(a, b) VALUES('one',   'o n e');
   INSERT INTO f1(a, b) VALUES('two',   't w o');

Index: ext/fts5/test/fts5restart.test
==================================================================
--- ext/fts5/test/fts5restart.test
+++ ext/fts5/test/fts5restart.test
@@ -12,10 +12,16 @@
 # This file focuses on testing the planner (xBestIndex function).
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5restart
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE f1 USING fts5(ff);
 }
 

Index: ext/fts5/test/fts5rowid.test
==================================================================
--- ext/fts5/test/fts5rowid.test
+++ ext/fts5/test/fts5rowid.test
@@ -12,10 +12,16 @@
 # Tests of the scalar fts5_rowid() and fts5_decode() functions.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5rowid
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 do_catchsql_test 1.1 {
   SELECT fts5_rowid()
 } {1 {should be: fts5_rowid(subject, ....)}}
 

Index: ext/fts5/test/fts5tokenizer.test
==================================================================
--- ext/fts5/test/fts5tokenizer.test
+++ ext/fts5/test/fts5tokenizer.test
@@ -12,10 +12,16 @@
 # Tests focusing on the built-in fts5 tokenizers. 
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5tokenizer
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE ft1 USING fts5(x, tokenize=porter);
   DROP TABLE ft1;

Index: ext/fts5/test/fts5unicode.test
==================================================================
--- ext/fts5/test/fts5unicode.test
+++ ext/fts5/test/fts5unicode.test
@@ -12,10 +12,16 @@
 # Tests focusing on the fts5 tokenizers
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5unicode
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 proc tokenize_test {tn tokenizer input output} {
   uplevel [list do_test $tn [subst -nocommands {
     set ret {}
     foreach {z s e} [sqlite3_fts5_tokenize db {$tokenizer} {$input}] {

Index: ext/fts5/test/fts5unicode2.test
==================================================================
--- ext/fts5/test/fts5unicode2.test
+++ ext/fts5/test/fts5unicode2.test
@@ -14,10 +14,16 @@
 # This is a modified copy of FTS4 test file "fts4_unicode.test".
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5unicode2
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 proc do_unicode_token_test {tn input res} {
   uplevel [list do_test $tn [list \
     sqlite3_fts5_tokenize -subst db "unicode61 remove_diacritics 0" $input
   ] [list {*}$res]]

Index: ext/fts5/test/fts5unicode3.test
==================================================================
--- ext/fts5/test/fts5unicode3.test
+++ ext/fts5/test/fts5unicode3.test
@@ -9,16 +9,23 @@
 #
 #***********************************************************************
 #
 # Tests focusing on the fts5 tokenizers
 #
+
+source [file join [file dirname [info script]] fts5_common.tcl]
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 proc fts3_unicode_path {file} {
   file join [file dirname [info script]] .. .. fts3 unicode $file
 }
 
-source [file join [file dirname [info script]] fts5_common.tcl]
 source [fts3_unicode_path parseunicode.tcl]
 set testprefix fts5unicode3
 
 set CF [fts3_unicode_path CaseFolding.txt]
 set UD [fts3_unicode_path UnicodeData.txt]

Index: ext/fts5/test/fts5unindexed.test
==================================================================
--- ext/fts5/test/fts5unindexed.test
+++ ext/fts5/test/fts5unindexed.test
@@ -12,10 +12,16 @@
 # The tests in this file focus on "unindexed" columns.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5unindexed
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 
 do_execsql_test 1.1 {
   CREATE VIRTUAL TABLE t1 USING fts5(a, b UNINDEXED);
   INSERT INTO t1 VALUES('a b c', 'd e f');

Index: ext/fts5/test/fts5version.test
==================================================================
--- ext/fts5/test/fts5version.test
+++ ext/fts5/test/fts5version.test
@@ -13,10 +13,16 @@
 # versions are detected and reported.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5version
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 
 do_execsql_test 1.1 {
   CREATE VIRTUAL TABLE t1 USING fts5(one);
   INSERT INTO t1 VALUES('a b c d');

Index: ext/fts5/test/fts5vocab.test
==================================================================
--- ext/fts5/test/fts5vocab.test
+++ ext/fts5/test/fts5vocab.test
@@ -12,10 +12,16 @@
 # The tests in this file focus on testing the fts5vocab module.
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5vocab
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 
 do_execsql_test 1.1.1 {
   CREATE VIRTUAL TABLE t1 USING fts5(one, prefix=1);
   CREATE VIRTUAL TABLE v1 USING fts5vocab(t1, 'row');