Modify the non-configure build system to make it easier to build the library with the fts2 or icu extensions linked in. (CVS 4121)

FossilOrigin-Name: 02b23c4394da7efb82e9318146f10818b0f68b1f

ext/fts2/fts2_hash.c

@@ -13,9 +13,6 @@
 ** We've modified it slightly to serve as a standalone hash table
 ** implementation for the full-text indexing module.
 */
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 /*
 ** The code in this file is only compiled if:
@@ -28,6 +25,9 @@
 */
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
 
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "fts2_hash.h"
 

ext/fts2/fts2_tokenizer.c

@@ -340,12 +340,12 @@ int sqlite3Fts2InitHashTable(
 ){
   int rc;
   void *p = (void *)pHash;
-  void *pdb = (void *)db;
   const int any = SQLITE_ANY;
   char *zTest = 0;
   char *zTest2 = 0;
 
 #ifdef SQLITE_TEST
+  void *pdb = (void *)db;
   zTest = sqlite3_mprintf("%s_test", zName);
   zTest2 = sqlite3_mprintf("%s_internal_test", zName);
   if( !zTest || !zTest2 ){