DELETED Makefile.Cygwin.in
Index: Makefile.Cygwin.in
==================================================================
--- Makefile.Cygwin.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/make
-#
-# This is the top-level makefile for Fossil when the build is occurring
-# on the Cygwin platform.
-#
-#### The toplevel directory of the source tree.  Fossil can be built
-#    in a directory that is separate from the source tree.  Just change
-#    the following to point from the build directory to the src/ folder.
-#
-SRCDIR = @srcdir@/src
-
-#### The directory into which object code files should be written.
-#    Having a "./" prefix in the value of this variable breaks our use of the
-#    "makeheaders" tool when running make on the MinGW platform, apparently
-#    due to some command line argument manipulation performed automatically
-#    by the shell.
-#
-#
-OBJDIR = bld
-
-#### C Compiler and options for use in building executables that
-#    will run on the platform that is doing the build.  This is used
-#    to compile code-generator programs as part of the build process.
-#    See TCC below for the C compiler for building the finished binary.
-#
-BCC = @CC_FOR_BUILD@
-
-#### The suffix to add to final executable file.  When cross-compiling
-#    to windows, make this ".exe".  Otherwise leave it blank.
-#
-E = @EXEEXT@
-
-TCC = @CC@
-
-#### Tcl shell for use in running the fossil testsuite.  If you do not
-#    care about testing the end result, this can be blank.
-#
-TCLSH = tclsh
-
-LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
-TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
-INSTALLDIR =$(DESTDIR)@prefix@/bin
-USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
-FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
-FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
-FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
-SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096
-
-include $(SRCDIR)/main.mk
-
-distclean: clean
-	rm -f autoconfig.h config.log Makefile

Index: auto.def
==================================================================
--- auto.def
+++ auto.def
@@ -41,17 +41,17 @@
     # the code below will append -ldl to LIBS.
     #
     foreach extralibs {{} {-ldl}} {
 
       # Locate the system SQLite by searching for sqlite3_open(). Then check
-      # if sqlite3_wal_checkpoint() can be found as well. If we can find
-      # open() but not wal_checkpoint(), then the system SQLite is too old
-      # to link against fossil.
+      # if sqlite3_strglob() can be found as well. If we can find open() but
+      # not strglob(), then the system SQLite is too old to link against
+      # fossil.
       #
       if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
-        if {![cc-check-function-in-lib sqlite3_wal_checkpoint sqlite3 $extralibs]} {
-          user-error "system sqlite3 too old (require >= 3.7.0)"
+        if {![cc-check-function-in-lib sqlite3_strglob sqlite3 $extralibs]} {
+          user-error "system sqlite3 too old (require >= 3.7.17)"
         }
 
         # Success. Update symbols and return.
         #
         define USE_SYSTEM_SQLITE 1
@@ -257,7 +257,6 @@
     cc-check-function-in-lib getpass bsd
 }
 cc-check-function-in-lib dlopen dl
 
 make-template Makefile.in
-make-template Makefile.Cygwin.in
 make-config-header autoconfig.h -auto {USE_* FOSSIL_*}

Index: src/browse.c
==================================================================
--- src/browse.c
+++ src/browse.c
@@ -494,13 +494,11 @@
 
     db_multi_exec(
         "CREATE TEMP TABLE filelist("
         "   x TEXT PRIMARY KEY COLLATE nocase,"
         "   uuid TEXT"
-        ")%s;",
-        /* Can be removed as soon as SQLite 3.8.2 is sufficiently wide-spread */
-        sqlite3_libversion_number()>=3008002 ? " WITHOUT ROWID" : ""
+        ");"
     );
     db_prepare(&ins, "INSERT OR IGNORE INTO filelist VALUES(:f,:u)");
     manifest_file_rewind(pM);
     while( (pFile = manifest_file_next(pM,0))!=0 ){
       if( nD>0

Index: src/cgi.c
==================================================================
--- src/cgi.c
+++ src/cgi.c
@@ -277,12 +277,12 @@
 ** Return true if the response should be sent with Content-Encoding: gzip.
 */
 static int is_gzippable(void){
   if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
   return strncmp(zContentType, "text/", 5)==0
-    || strglob("application/*xml", zContentType)
-    || strglob("application/*javascript", zContentType);
+    || sqlite3_strglob("application/*xml", zContentType)==0
+    || sqlite3_strglob("application/*javascript", zContentType)==0;
 }
 
 /*
 ** Do a normal HTTP reply
 */

Index: src/db.c
==================================================================
--- src/db.c
+++ src/db.c
@@ -711,13 +711,10 @@
 */
 LOCAL sqlite3 *db_open(const char *zDbName){
   int rc;
   sqlite3 *db;
 
-#if defined(__CYGWIN__)
-  zDbName = fossil_utf8_to_filename(zDbName);
-#endif
   if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName);
   rc = sqlite3_open_v2(
        zDbName, &db,
        SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
        g.zVfsName
@@ -867,11 +864,11 @@
                    " WHERE name=='%s' /*scan*/",
                    db_name("localdb"), zTable);
   int rc = 0;
   if( zDef ){
     char *zPattern = mprintf("* %s *", zColumn);
-    rc = strglob(zPattern, zDef)==0;
+    rc = sqlite3_strglob(zPattern, zDef)!=0;
     fossil_free(zPattern);
     fossil_free(zDef);
   }
   return rc;
 }
@@ -894,19 +891,19 @@
 
   /* If the "isexe" column is missing from the vfile table, then
   ** add it now.   This code added on 2010-03-06.  After all users have
   ** upgraded, this code can be safely deleted.
   */
-  if( !strglob("* isexe *", zVFileDef) ){
+  if( sqlite3_strglob("* isexe *", zVFileDef)!=0 ){
     db_multi_exec("ALTER TABLE vfile ADD COLUMN isexe BOOLEAN DEFAULT 0");
   }
 
   /* If "islink"/"isLink" columns are missing from tables, then
   ** add them now.   This code added on 2011-01-17 and 2011-08-27.
   ** After all users have upgraded, this code can be safely deleted.
   */
-  if( !strglob("* islink *", zVFileDef) ){
+  if( sqlite3_strglob("* islink *", zVFileDef)!=0 ){
     db_multi_exec("ALTER TABLE vfile ADD COLUMN islink BOOLEAN DEFAULT 0");
     if( db_local_table_exists_but_lacks_column("stashfile", "isLink") ){
       db_multi_exec("ALTER TABLE stashfile ADD COLUMN isLink BOOL DEFAULT 0");
     }
     if( db_local_table_exists_but_lacks_column("undo", "isLink") ){
@@ -1021,15 +1018,11 @@
       g.json.resultCode = FSL_JSON_E_DB_NOT_VALID;
 #endif
       fossil_panic("not a valid repository: %s", zDbName);
     }
   }
-#if defined(__CYGWIN__)
-  g.zRepositoryName = fossil_utf8_to_filename(zDbName);
-#else
   g.zRepositoryName = mprintf("%s", zDbName);
-#endif
   db_open_or_attach(g.zRepositoryName, "repository", 0);
   g.repositoryOpen = 1;
   /* Cache "allow-symlinks" option, because we'll need it on every stat call */
   g.allowSymlinks = db_get_boolean("allow-symlinks", 0);
 }

Index: src/diffcmd.c
==================================================================
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -923,17 +923,17 @@
   blob_appendf(&script, "set fossilcmd {| \"%/\" %s --html -y -i -v",
                g.nameOfExe, zSubCmd);
   for(i=firstArg; i<g.argc; i++){
     const char *z = g.argv[i];
     if( z[0]=='-' ){
-      if( strglob("*-html",z) ) continue;
-      if( strglob("*-y",z) ) continue;
-      if( strglob("*-i",z) ) continue;
+      if( sqlite3_strglob("*-html",z)==0 ) continue;
+      if( sqlite3_strglob("*-y",z)==0 ) continue;
+      if( sqlite3_strglob("*-i",z)==0 ) continue;
       /* The undocumented --script FILENAME option causes the Tk script to
       ** be written into the FILENAME instead of being run.  This is used
       ** for testing and debugging. */
-      if( strglob("*-script",z) && i<g.argc-1 ){
+      if( sqlite3_strglob("*-script",z)==0 && i<g.argc-1 ){
         i++;
         zTempFile = g.argv[i];
         continue;
       }
     }

Index: src/glob.c
==================================================================
--- src/glob.c
+++ src/glob.c
@@ -138,89 +138,10 @@
     z += i+1;
   }
   return p;
 }
 
-/*
-** Return non-zero if string z matches glob pattern zGlob and zero if the
-** pattern does not match.
-**
-** Globbing rules:
-**
-**      '*'       Matches any sequence of zero or more characters.
-**
-**      '?'       Matches exactly one character.
-**
-**     [...]      Matches one character from the enclosed list of
-**                characters.
-**
-**     [^...]     Matches one character not in the enclosed list.
-*/
-int strglob(const char *zGlob, const char *z){
-  int c, c2;
-  int invert;
-  int seen;
-
-  while( (c = (*(zGlob++)))!=0 ){
-    if( c=='*' ){
-      while( (c=(*(zGlob++))) == '*' || c=='?' ){
-        if( c=='?' && (*(z++))==0 ) return 0;
-      }
-      if( c==0 ){
-        return 1;
-      }else if( c=='[' ){
-        while( *z && strglob(zGlob-1,z)==0 ){
-          z++;
-        }
-        return (*z)!=0;
-      }
-      while( (c2 = (*(z++)))!=0 ){
-        while( c2!=c ){
-          c2 = *(z++);
-          if( c2==0 ) return 0;
-        }
-        if( strglob(zGlob,z) ) return 1;
-      }
-      return 0;
-    }else if( c=='?' ){
-      if( (*(z++))==0 ) return 0;
-    }else if( c=='[' ){
-      int prior_c = 0;
-      seen = 0;
-      invert = 0;
-      c = *(z++);
-      if( c==0 ) return 0;
-      c2 = *(zGlob++);
-      if( c2=='^' ){
-        invert = 1;
-        c2 = *(zGlob++);
-      }
-      if( c2==']' ){
-        if( c==']' ) seen = 1;
-        c2 = *(zGlob++);
-      }
-      while( c2 && c2!=']' ){
-        if( c2=='-' && zGlob[0]!=']' && zGlob[0]!=0 && prior_c>0 ){
-          c2 = *(zGlob++);
-          if( c>=prior_c && c<=c2 ) seen = 1;
-          prior_c = 0;
-        }else{
-          if( c==c2 ){
-            seen = 1;
-          }
-          prior_c = c2;
-        }
-        c2 = *(zGlob++);
-      }
-      if( c2==0 || (seen ^ invert)==0 ) return 0;
-    }else{
-      if( c!=(*(z++)) ) return 0;
-    }
-  }
-  return *z==0;
-}
-
 /*
 ** Return true (non-zero) if zString matches any of the patterns in
 ** the Glob.  The value returned is actually a 1-based index of the pattern
 ** that matched.  Return 0 if none of the patterns match zString.
 **
@@ -228,11 +149,11 @@
 */
 int glob_match(Glob *pGlob, const char *zString){
   int i;
   if( pGlob==0 ) return 0;
   for(i=0; i<pGlob->nPattern; i++){
-    if( strglob(pGlob->azPattern[i], zString) ) return i+1;
+    if( sqlite3_strglob(pGlob->azPattern[i], zString)==0 ) return i+1;
   }
   return 0;
 }
 
 /*

Index: src/login.c
==================================================================
--- src/login.c
+++ src/login.c
@@ -395,15 +395,15 @@
     /* If a URI appears in the User-Agent, it is probably a bot */
     if( strncmp("http", zAgent+i,4)==0 ) return 0;
   }
   if( strncmp(zAgent, "Mozilla/", 8)==0 ){
     if( atoi(&zAgent[8])<4 ) return 0;  /* Many bots advertise as Mozilla/3 */
-    if( strglob("*Firefox/[1-9]*", zAgent) ) return 1;
-    if( strglob("*Chrome/[1-9]*", zAgent) ) return 1;
-    if( strglob("*(compatible;?MSIE?[1789]*", zAgent) ) return 1;
-    if( strglob("*Trident/[1-9]*;?rv:[1-9]*", zAgent) ) return 1; /* IE11+ */
-    if( strglob("*AppleWebKit/[1-9]*(KHTML*", zAgent) ) return 1;
+    if( sqlite3_strglob("*Firefox/[1-9]*", zAgent)==0 ) return 1;
+    if( sqlite3_strglob("*Chrome/[1-9]*", zAgent)==0 ) return 1;
+    if( sqlite3_strglob("*(compatible;?MSIE?[1789]*", zAgent)==0 ) return 1;
+    if( sqlite3_strglob("*Trident/[1-9]*;?rv:[1-9]*", zAgent)==0 ) return 1; /* IE11+ */
+    if( sqlite3_strglob("*AppleWebKit/[1-9]*(KHTML*", zAgent)==0 ) return 1;
     return 0;
   }
   if( strncmp(zAgent, "Opera/", 6)==0 ) return 1;
   if( strncmp(zAgent, "Safari/", 7)==0 ) return 1;
   if( strncmp(zAgent, "Lynx/", 5)==0 ) return 1;

Index: src/main.c
==================================================================
--- src/main.c
+++ src/main.c
@@ -596,11 +596,11 @@
   g.mainTimerId = fossil_timer_start();
   g.zVfsName = find_option("vfs",0,1);
   if( g.zVfsName==0 ){
     g.zVfsName = fossil_getenv("FOSSIL_VFS");
 #if defined(__CYGWIN__)
-    if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
+    if( g.zVfsName==0 ){
       g.zVfsName = "win32-longpath";
     }
 #endif
   }
   if( g.zVfsName ){
@@ -1318,11 +1318,11 @@
           continue;
         }
         if( pFileGlob!=0
          && file_isfile(zRepo)
          && glob_match(pFileGlob, zRepo)
-         && strglob("*.fossil*",zRepo)==0
+         && sqlite3_strglob("*.fossil*",zRepo)!=0
          && (zMimetype = mimetype_from_name(zRepo))!=0
          && strcmp(zMimetype, "application/x-fossil-artifact")!=0
         ){
           Blob content;
           blob_read_from_file(&content, zRepo);

Index: src/main.mk
==================================================================
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
                  -DSQLITE_OMIT_DEPRECATED \
                  -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
 # Setup the options used to compile the included SQLite shell.
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
-                -DSQLITE_OMIT_LOAD_EXTENSION=1 \
-                -Dsqlite3_strglob=strglob
+                -DSQLITE_OMIT_LOAD_EXTENSION=1
 
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
 # to 1. If it is set to 1, then there is no need to build or link
 # the sqlite3.o object. Instead, the system sqlite will be linked
 # using -lsqlite3.

Index: src/makemake.tcl
==================================================================
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
 # Options used to compile the included SQLite shell.
 #
 set SHELL_OPTIONS {
   -Dmain=sqlite3_shell
   -DSQLITE_OMIT_LOAD_EXTENSION=1
-  -Dsqlite3_strglob=strglob
 }
 
 # Options used to compile the included SQLite shell on Windows.
 #
 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS

Index: src/style.c
==================================================================
--- src/style.c
+++ src/style.c
@@ -175,11 +175,11 @@
   }
   for(i=0; i<nFormAction; i++){
     @ gebi("form%d(i+1)").action="%s(aFormAction[i])";
   }
   @ }
-  if( strglob("*Opera Mini/[1-9]*", P("HTTP_USER_AGENT")) ){
+  if( sqlite3_strglob("*Opera Mini/[1-9]*", P("HTTP_USER_AGENT"))==0 ){
     /* Special case for Opera Mini, which executes JS server-side */
     @ var isOperaMini = Object.prototype.toString.call(window.operamini)
     @                   === "[object OperaMini]";
     @ if( isOperaMini ){
     @   setTimeout("setAllHrefs();",%d(nDelay));

Index: src/vfile.c
==================================================================
--- src/vfile.c
+++ src/vfile.c
@@ -393,13 +393,13 @@
      "original",
      "output",
   };
   int i, j, n;
   
-  if( strglob("ci-comment-????????????.txt", zName) ) return 1;
+  if( sqlite3_strglob("ci-comment-????????????.txt", zName)==0 ) return 1;
   for(; zName[0]!=0; zName++){
-    if( zName[0]=='/' && strglob("/ci-comment-????????????.txt", zName) ){
+    if( zName[0]=='/' && sqlite3_strglob("/ci-comment-????????????.txt", zName)==0 ){
       return 1;
     }
     if( zName[0]!='-' ) continue;
     for(i=0; i<sizeof(azTemp)/sizeof(azTemp[0]); i++){
       n = (int)strlen(azTemp[i]);

Index: src/xfer.c
==================================================================
--- src/xfer.c
+++ src/xfer.c
@@ -1785,11 +1785,11 @@
       ** to the next cycle.
       */        
       if( blob_eq(&xfer.aToken[0],"message") && xfer.nToken==2 ){
         char *zMsg = blob_terminate(&xfer.aToken[1]);
         defossilize(zMsg);
-        if( (syncFlags & SYNC_PUSH) && zMsg && strglob("pull only *", zMsg) ){
+        if( (syncFlags & SYNC_PUSH) && zMsg && sqlite3_strglob("pull only *", zMsg)==0 ){
           syncFlags &= ~SYNC_PUSH;
           zMsg = 0;
         }
         if( zMsg && zMsg[0] ){
           fossil_force_newline();

Index: win/Makefile.PellesCGMake
==================================================================
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
 
 # define the sqlite shell files, which need special flags on compile
 SQLITESHELLSRC=shell.c
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
 
 # define the th scripting files, which need special flags on compile
 THSRC=th.c th_lang.c
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))

Index: win/Makefile.dmc
==================================================================
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
 TCC    = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
 LIBS   = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
 
 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
-SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
+SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
 
 SRC   = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c 
 
 OBJ   = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O 
 

Index: win/Makefile.mingw
==================================================================
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1710,11 +1710,10 @@
                  -DSQLITE_USE_MALLOC_H \
                  -DSQLITE_USE_MSIZE
 
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
                 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
-                -Dsqlite3_strglob=strglob \
                 -Dgetenv=fossil_getenv \
                 -Dfopen=fossil_fopen
 
 $(OBJDIR)/sqlite3.o:	$(SRCDIR)/sqlite3.c
 	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o

Index: win/Makefile.mingw.mistachkin
==================================================================
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1710,11 +1710,10 @@
                  -DSQLITE_USE_MALLOC_H \
                  -DSQLITE_USE_MSIZE
 
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
                 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
-                -Dsqlite3_strglob=strglob \
                 -Dgetenv=fossil_getenv \
                 -Dfopen=fossil_fopen
 
 $(OBJDIR)/sqlite3.o:	$(SRCDIR)/sqlite3.c
 	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o

Index: win/Makefile.msc
==================================================================
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -74,11 +74,10 @@
                  /DSQLITE_OMIT_DEPRECATED \
                  /DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
                 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
-                /Dsqlite3_strglob=strglob \
                 /Dgetenv=fossil_getenv \
                 /Dfopen=fossil_fopen
 
 SRC   = add_.c \
         allrepo_.c \