10 files changed, 41 insertions, 7 deletions
diff --git a/ext/fts5/fts5.c b/ext/fts5/fts5.c
index d748a8b40..f8450aab1 100644
--- a/ext/fts5/fts5.c
+++ b/ext/fts5/fts5.c
@@ -13,6 +13,7 @@
 ** This is an SQLite module implementing full-text search.
 */
 
+#if defined(SQLITE_ENABLE_FTS5)
 
 #include "fts5Int.h"
 
@@ -1962,5 +1963,6 @@ int sqlite3Fts5Init(sqlite3 *db){
   }
   return rc;
 }
+#endif /* defined(SQLITE_ENABLE_FTS5) */
 
 
diff --git a/ext/fts5/fts5_aux.c b/ext/fts5/fts5_aux.c
index 22bdbb234..fbd786640 100644
--- a/ext/fts5/fts5_aux.c
+++ b/ext/fts5/fts5_aux.c
@@ -11,6 +11,8 @@
 ******************************************************************************
 */
 
+#ifdef SQLITE_ENABLE_FTS5
+
 #include "fts5Int.h"
 #include <math.h>
 
@@ -549,5 +551,6 @@ int sqlite3Fts5AuxInit(fts5_api *pApi){
 
   return rc;
 }
+#endif /* SQLITE_ENABLE_FTS5 */
 
 
diff --git a/ext/fts5/fts5_buffer.c b/ext/fts5/fts5_buffer.c
index 53cb02f52..73a5157ef 100644
--- a/ext/fts5/fts5_buffer.c
+++ b/ext/fts5/fts5_buffer.c
@@ -12,6 +12,7 @@
 */
 
 
+#ifdef SQLITE_ENABLE_FTS5
 
 #include "fts5Int.h"
 
@@ -294,6 +295,5 @@ void *sqlite3Fts5MallocZero(int *pRc, int nByte){
   }
   return pRet;
 }
-
-
+#endif /* SQLITE_ENABLE_FTS5 */
 
diff --git a/ext/fts5/fts5_config.c b/ext/fts5/fts5_config.c
index 438cdf370..0450db691 100644
--- a/ext/fts5/fts5_config.c
+++ b/ext/fts5/fts5_config.c
@@ -13,6 +13,9 @@
 ** This is an SQLite module implementing full-text search.
 */
 
+#ifdef SQLITE_ENABLE_FTS5
+
+
 #include "fts5Int.h"
 
 #define FTS5_DEFAULT_PAGE_SIZE   1000
@@ -789,3 +792,4 @@ int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
   return rc;
 }
 
+#endif /* SQLITE_ENABLE_FTS5 */
diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 6966fc197..878b54f53 100644
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -12,6 +12,9 @@
 **
 */
 
+#ifdef SQLITE_ENABLE_FTS5
+
+
 #include "fts5Int.h"
 #include "fts5parse.h"
 
@@ -1695,3 +1698,4 @@ int sqlite3Fts5ExprPoslist(Fts5Expr *pExpr, int iPhrase, const u8 **pa){
   return 0;
 }
 
+#endif /* SQLITE_ENABLE_FTS5 */
diff --git a/ext/fts5/fts5_hash.c b/ext/fts5/fts5_hash.c
index 7c63fad19..bd17205f1 100644
--- a/ext/fts5/fts5_hash.c
+++ b/ext/fts5/fts5_hash.c
@@ -12,6 +12,9 @@
 **
 */
 
+#ifdef SQLITE_ENABLE_FTS5
+
+
 #include "fts5Int.h"
 
 typedef struct Fts5HashEntry Fts5HashEntry;
@@ -457,3 +460,4 @@ void sqlite3Fts5HashScanEntry(
   }
 }
 
+#endif /* SQLITE_ENABLE_FTS5 */
diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 3fe408a86..5eb5cbfbf 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -16,6 +16,8 @@
 ** the interface defined in fts5Int.h.
 */
 
+#ifdef SQLITE_ENABLE_FTS5
+
 #include "fts5Int.h"
 
 /*
@@ -448,8 +450,8 @@ struct Fts5MultiSegIter {
 **
 **   FTS5_SEGITER_REVERSE:
 **     This flag is only ever set if FTS5_SEGITER_ONETERM is also set. If
-**     it is set, iterate through docids in ascending order instead of the
-**     default descending order.
+**     it is set, iterate through docids in descending order instead of the
+**     default ascending order.
 **
 ** iRowidOffset/nRowidOffset/aRowidOffset:
 **     These are used if the FTS5_SEGITER_REVERSE flag is set.
@@ -5060,3 +5062,4 @@ int sqlite3Fts5IndexInit(sqlite3 *db){
   return rc;
 }
 
+#endif /* SQLITE_ENABLE_FTS5 */
diff --git a/ext/fts5/fts5_storage.c b/ext/fts5/fts5_storage.c
index 4bbbed138..075b2eb66 100644
--- a/ext/fts5/fts5_storage.c
+++ b/ext/fts5/fts5_storage.c
@@ -12,6 +12,9 @@
 **
 */
 
+#ifdef SQLITE_ENABLE_FTS5
+
+
 #include "fts5Int.h"
 
 struct Fts5Storage {
@@ -986,3 +989,4 @@ int sqlite3Fts5StorageConfigValue(
 }
 
 
+#endif /* SQLITE_ENABLE_FTS5 */
diff --git a/ext/fts5/fts5_tcl.c b/ext/fts5/fts5_tcl.c
index f56059072..f1c228427 100644
--- a/ext/fts5/fts5_tcl.c
+++ b/ext/fts5/fts5_tcl.c
@@ -12,10 +12,13 @@
 **
 */
 
+
 #ifdef SQLITE_TEST
+#include <tcl.h>
+
+#ifdef SQLITE_ENABLE_FTS5
 
 #include "fts5.h"
-#include <tcl.h>
 #include <string.h>
 #include <assert.h>
 
@@ -856,5 +859,9 @@ int Fts5tcl_Init(Tcl_Interp *interp){
 
   return TCL_OK;
 }
-
-#endif
+#else  /* SQLITE_ENABLE_FTS5 */
+int Fts5tcl_Init(Tcl_Interp *interp){
+  return TCL_OK;
+}
+#endif /* SQLITE_ENABLE_FTS5 */
+#endif /* SQLITE_TEST */
diff --git a/ext/fts5/fts5_tokenize.c b/ext/fts5/fts5_tokenize.c
index 12bf24205..67ee44641 100644
--- a/ext/fts5/fts5_tokenize.c
+++ b/ext/fts5/fts5_tokenize.c
@@ -11,6 +11,8 @@
 ******************************************************************************
 */
 
+#if defined(SQLITE_ENABLE_FTS5)
+
 #include "fts5.h"
 #include <string.h>
 #include <assert.h>
@@ -1221,5 +1223,6 @@ int sqlite3Fts5TokenizerInit(fts5_api *pApi){
 
   return SQLITE_OK;
 }
+#endif /* defined(SQLITE_ENABLE_FTS5) */