Allow sqlite3_rsync to work on non-WAL-mode databases, as long as the

--wal-only flag is not used. FossilOrigin-Name: 9f88f73ce39e761810110dc158ec0e5a84401a80b247a5395a906a6a538d5fec
Version 3.49.1
2025-05-01 16:02:02 +00:00 · 2025-02-18 13:38:58 +00:00 · 2025-02-17 16:15:54 +00:00 · 2025-02-17 16:07:39 +00:00 · 2025-02-17 14:27:33 +00:00 · 2025-02-16 18:16:42 +00:00
20 changed files with 736 additions and 501 deletions
@@ -118,9 +118,14 @@ LDFLAGS.dlopen = @LDFLAGS_DLOPEN@
 LDFLAGS.readline = @LDFLAGS_READLINE@
 CFLAGS.readline = @CFLAGS_READLINE@
 LDFLAGS.icu = @LDFLAGS_ICU@
+LDFLAGS.rt = @LDFLAGS_RT@
 CFLAGS.icu = @CFLAGS_ICU@
 LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@
 # soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded
+LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@
+# os-specific: see
+# - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7
+# - https://sqlite.org/forum/forumpost/0c7fc097b2
 ENABLE_SHARED = @ENABLE_SHARED@
 ENABLE_STATIC = @ENABLE_STATIC@
 HAVE_WASI_SDK = @HAVE_WASI_SDK@
@@ -142,7 +147,7 @@ T.cc.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
 # shell command.
 #
 CFLAGS.jimsh = @CFLAGS_JIMSH@
-JIMSH = ./jimsh$(TEXE)
+JIMSH = ./jimsh$(T.exe)

 #
 # $(B.tclsh) is documented in main.mk.
@@ -1 +1 @@
-3.49.0
+3.49.1
@@ -1,4 +1,4 @@
-#/do/not/tclsh
+#!/do/not/tclsh
 # ^^^ help out editors which guess this file's content type.
 #
 # This is the main autosetup-compatible configure script for the
@@ -12,214 +12,9 @@
 #
 # JimTCL: https://jim.tcl.tk
 #
+
 use sqlite-config
-
-if {[string first " " $autosetup(srcdir)] != -1} {
-  user-error "The pathname of the source tree\
-              may not contain space characters"
-}
-if {[string first " " $autosetup(builddir)] != -1} {
-  user-error "The pathname of the build directory\
-              may not contain space characters"
-}
-
-
-########################################################################
-# Regarding flag compatibility with the historical autotool configure
-# script:
-#
-# A very long story made short, autosetup's --flag handling has
-# some behaviors which make it impossible to implement 100% identical
-# flags compared to the historical autotools build. The differences
-# are documented here:
-#
-# 1) --debug is used by autosetup itself, but we patch it because
-# decades of muscle memory expect --debug to apply to this code,
-# not the configure script (details are in autosetup/README.md).
-#
-# 2) In autosetup, all flags starting with (--enable, --disable) are
-# forced to be booleans and receive special handling in how they're
-# resolved. Because of that we have to rename:
-#
-#   2.1) --enable-tempstore[=no] to --with-tempstore[=no], noting that
-#        it has four legal values, not two.
-#
-########################################################################
-# A gentle introduction to flags handling in autosetup
-#
-# Reference: https://msteveb.github.io/autosetup/developer/
-#
-# All configure flags must be described in an 'options' call, which
-# must appear very early on in this script. The general syntax is:
-#
-#  FLAG => {Help text}
-#
-# Where FLAG can have any of the following formats:
-#
-#   boolopt            => "a boolean option which defaults to disabled"
-#   boolopt2=1         => "a boolean option which defaults to enabled"
-#   stringopt:         => "an option which takes an argument, e.g. --stringopt=value"
-#   stringopt2:=value  => "an option where the argument is optional and defaults to 'value'"
-#   optalias booltopt3 => "a boolean with a hidden alias. --optalias is not shown in --help"
-#
-# Autosetup does no small amount of specialized handling for flags,
-# especially booleans. Each bool-type --FLAG implicitly gets
-# --enable-FLAG and --disable-FLAG forms. e.g. we define a flag
-# "readline", which will be interpreted in one of two ways, depending
-# on how it's invoked and how its default is defined:
-#
-#   --enable-readline ==> boolean true
-#   --disable-readline ==> boolean false
-#
-# Passing --readline or --readline=1 is equivalent to passing
-# --enable-readline, and --readline=0 is equivalent to
-# --disable-readline.
-#
-# The behavior described above can lead lead to some confusion when
-# writing help text. For example:
-#
-#   options { json=1 {Disable JSON functions} }
-#
-# The reason the help text says "disable" is because a boolean option
-# which defaults to true is, in the --help text, rendered as:
-#
-#   --disable-json          Disable JSON functions
-#
-# Whereas a bool flag which defaults to false will instead render as:
-#
-#   --enable-FLAG
-#
-# Non-boolean flags, in contrast, use the names specifically given to
-# them in the [options] invocation. e.g. "with-tcl" is the --with-tcl
-# flag.
-#
-# Fetching values for flags:
-#
-#   booleans: use one of:
-#     - [opt-bool FLAG] is autosetup's built-in command for this, but we
-#       have some convenience variants:
-#     - [proj-opt-truthy FLAG]
-#     - [proj-opt-if-truthy FLAG {THEN} {ELSE}]
-#
-#   Non-boolean (i.e. string) flags:
-#     - [opt-val FLAG ?default?]
-#     - [opt-str ...] - see the docs in ./autosetup/autosetup
-#
-########################################################################
-set flags {
-  # When writing {help text blocks}, be aware that autosetup formats
-  # them differently (left-aligned, directly under the --flag) if the
-  # block starts with a newline. It does NOT expand vars and commands,
-  # but we use a [subst] call below which will replace (only) var
-  # refs.
-
-  # <build-modes>
-  shared=1             => {Disable build of shared libary}
-  static=1             => {Disable build of static library (mostly)}
-  amalgamation=1       => {Disable the amalgamation and instead build all files separately.}
-  # </build-modes>
-  # <lib-feature>
-  threadsafe=1         => {Disable mutexing}
-  with-tempstore:=no   => {Use an in-RAM database for temporary tables: never,no,yes,always}
-  largefile=1          => {Disable large file support}
-  load-extension=1     => {Disable loading of external extensions}
-  math=1               => {Disable math functions}
-  json=1               => {Disable JSON functions}
-  memsys5              => {Enable MEMSYS5}
-  memsys3              => {Enable MEMSYS3}
-  fts3                 => {Enable the FTS3 extension}
-  fts4                 => {Enable the FTS4 extension}
-  fts5                 => {Enable the FTS5 extension}
-  update-limit         => {Enable the UPDATE/DELETE LIMIT clause}
-  geopoly              => {Enable the GEOPOLY extension}
-  rtree                => {Enable the RTREE extension}
-  session              => {Enable the SESSION extension}
-  all                  => {Enable FTS4, FTS5, Geopoly, RTree, Sessions}
-  # </lib-feature>
-  # <tcl>
-  with-tcl:DIR         =>
-    {Directory containing tclConfig.sh or a directory one level up from
-     that, from which we can derive a directory containing tclConfig.sh.
-     A dir name of "prefix" is equivalent to the directory specified by
-     the --prefix flag.}
-  with-tclsh:PATH      =>
-    {Full pathname of tclsh to use.  It is used for (A) trying to find
-     tclConfig.sh and (B) all TCL-based code generation.  Warning: if
-     its containing dir has multiple tclsh versions, it may select the
-     wrong tclConfig.sh!}
-  tcl=1                =>
-    {Disable components which require TCL, including all tests.
-     This tree requires TCL for code generation but can use the in-tree
-     copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the
-     test code require a canonical tclsh.}
-  # <tcl>
-  # <line-editing>
-  readline=1           => {Disable readline support}
-  # --with-readline-lib is a backwards-compatible alias for
-  # --with-readline-ldflags
-  with-readline-lib:
-  with-readline-ldflags:=auto
-                       => {Readline LDFLAGS, e.g. -lreadline -lncurses}
-  # --with-readline-inc is a backwards-compatible alias for
-  # --with-readline-cflags.
-  with-readline-inc:
-  with-readline-cflags:=auto
-                       => {Readline CFLAGS, e.g. -I/path/to/includes}
-  with-readline-header:PATH
-                       => {Full path to readline.h, from which --with-readline-cflags will be derived}
-  with-linenoise:DIR   => {Source directory for linenoise.c and linenoise.h}
-  editline=0           => {Enable BSD editline support}
-  # </line-editing>
-  # <icu>
-  with-icu-ldflags:LDFLAGS
-                        => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the ICU libraries}
-  with-icu-cflags:CFLAGS
-                        => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include}
-  with-icu-config:=auto => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, /path/to/icu-config}
-  icu-collations=0      => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... or --with-icu-config}
-  # </icu>
-  # <alternative-builds>
-  with-wasi-sdk:=/opt/wasi-sdk
-                       => {Top-most dir of the wasi-sdk for a WASI build}
-  with-emsdk:=auto     => {Top-most dir of the Emscripten SDK installation. Default = EMSDK env var.}
-  # </alternative-builds>
-  # <developer>
-  # Note that using the --debug/--enable-debug flag here requires patching
-  # autosetup/autosetup to rename the --debug to --autosetup-debug.
-  with-debug=0
-  debug=0              =>
-    {Enable debug build flags. This option will impact performance by
-     as much as 4x, as it includes large numbers of assert()s in
-     performance-critical loops.  Never use --debug for production
-     builds.}
-  scanstatus           => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag}
-  dev                  => {Enable dev-mode build: automatically enables certain other flags}
-  test-status          => {Enable status of tests}
-  gcov=0               => {Enable coverage testing using gcov}
-  linemacros           => {Enable #line macros in the amalgamation}
-  dynlink-tools        => {Dynamically link libsqlite3 to certain tools which normally statically embed it.}
-  soname:=legacy       =>
-    # --soname has a long story behind it: https://sqlite.org/src/forumpost/5a3b44f510df8ded
-    {SONAME for libsqlite3.so. "none", or not using this flag, sets no
-     soname. "legacy" sets it to its historical value of
-     libsqlite3.so.0.  A value matching the glob "libsqlite3.*" sets
-     it to that literal value. Any other value is assumed to be a
-     suffix which gets applied to "libsqlite3.so.",
-     e.g. --soname=9.10 equates to "libsqlite3.so.9.10".
-    }
-  dump-defines=0       => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)}
-  # </developer>
-}
-if {"" ne $::sqliteConfig(dump-defines-json)} {
-  lappend flags \
-    defines-json-include-lowercase=0 \
-    => {Include lower-case defines (primarily system paths) in $::sqliteConfig(dump-defines-json)}
-}
-
-options [subst -nobackslashes -nocommands $flags]
-unset flags
-sqlite-post-options-init
-
+sqlite-config-bootstrap canonical
 sqlite-setup-default-cflags
 proj-if-opt-truthy dev {
  # --enable-dev needs to come early so that the downstream tests
@@ -230,7 +25,7 @@ proj-if-opt-truthy dev {
  define CFLAGS [get-env CFLAGS {-O0 -g}]
  # -------------^^^^^^^ intentionally using [get-env] instead of
  # [proj-get-env] here because [sqlite-setup-default-cflags] uses
-  # [proj-get-env].
+  # [proj-get-env] and we want this to supercede that.
 }

 sqlite-check-common-bins ;# must come before [sqlite-handle-wasi-sdk]
@@ -275,6 +70,4 @@ sqlite-handle-load-extension
 sqlite-handle-math
 sqlite-handle-icu
 sqlite-handle-emsdk
-sqlite-process-dot-in-files
-sqlite-post-config-validation
-sqlite-dump-defines
+sqlite-config-finalize
@@ -1,8 +1,17 @@
 ########################################################################
 # This is a main makefile for the "autoconf" bundle of SQLite. This is
 # a trimmed-down version of the canonical makefile, devoid of most
-# documentation. For the full docs, see 'main.mk' in the canonical
+# documentation. For the full docs, see /main.mk in the canonical
 # source tree.
+#
+# Maintenance reminders:
+#
+# - To keep this working with an out-of-tree build, be sure to prefix
+#   input file names with $(TOP)/ where appropriate (which is most
+#   places).
+#
+# - The original/canonical recipes can be found in /main.mk in the
+#   canonical source tree.
 all:

 TOP = @abs_top_srcdir@
@@ -58,9 +67,9 @@ LDFLAGS.pthread = @LDFLAGS_PTHREAD@
 LDFLAGS.dlopen = @LDFLAGS_DLOPEN@
 LDFLAGS.readline = @LDFLAGS_READLINE@
 CFLAGS.readline = @CFLAGS_READLINE@
+LDFLAGS.rt = @LDFLAGS_RT@
 LDFLAGS.icu = @LDFLAGS_ICU@
 CFLAGS.icu = @CFLAGS_ICU@
-LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@

 # When cross-compiling, we need to avoid the -s flag because it only
 # works on the build host's platform.
@@ -78,7 +87,8 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \
  $(install-dir.lib) $(install-dir.man1) \
  $(install-dir.pkgconfig)
 $(install-dir.all):
-	$(INSTALL) -d "$@"
+	@if [ ! -d "$@" ]; then set -x; $(INSTALL) -d "$@"; fi
+# ^^^^ on some platforms, install -d fails if the target already exists.


 #
@@ -115,23 +125,30 @@ SHELL_OPT ?= @OPT_SHELL@
 #
 OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@

+LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@
+# soname: see https://sqlite.org/src/forumpost/5a3b44f510df8ded
+LDFLAGS.libsqlite3.os-specific = @LDFLAGS_MAC_CVERSION@ @LDFLAGS_OUT_IMPLIB@
+# os-specific: see
+# - https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7
+# - https://sqlite.org/forum/forumpost/0c7fc097b2
+
 LDFLAGS.libsqlite3 = \
  $(LDFLAGS.rpath) $(LDFLAGS.pthread) \
  $(LDFLAGS.math) $(LDFLAGS.dlopen) \
  $(LDFLAGS.zlib) $(LDFLAGS.icu) \
-  $(LDFLAGS.configure)
-LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@
+  $(LDFLAGS.rt) $(LDFLAGS.configure)
 CFLAGS.libsqlite3 = -I. $(CFLAGS.core) $(CFLAGS.icu) $(OPT_FEATURE_FLAGS)

-sqlite3.o:	sqlite3.h sqlite3.c
-	$(CC) -c sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3)
+sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c
+	$(CC) -c $(TOP)/sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3)

 libsqlite3.LIB = libsqlite3$(T.lib)
 libsqlite3.SO = libsqlite3$(T.dll)

 $(libsqlite3.SO): sqlite3.o
 	$(CC) -o $@  sqlite3.o $(LDFLAGS.shlib) \
-		$(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.libsqlite3.soname)
+		$(LDFLAGS) $(LDFLAGS.libsqlite3) \
+		$(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname)
 all: $(libsqlite3.SO)

 $(libsqlite3.LIB): sqlite3.o
@@ -140,13 +157,27 @@ all: $(libsqlite3.LIB)

 install-so-1: $(install-dir.lib) $(libsqlite3.SO)
 	$(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)"
-	@echo "Setting up $(libsqlite3.SO) symlinks..."; \
+	@if [ -f $(libsqlite3.SO).a ]; then \
+		$(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \
+	fi
+	@echo "Setting up $(libsqlite3.SO) version symlinks..."; \
+	if [ x.dll = x$(T.dll) ]; then \
+		echo "No library symlinks needed on this platform"; \
+	elif [ x.dylib = x$(T.dll) ]; then \
+		cd "$(install-dir.lib)" || exit $$?; \
+		rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \
+		dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \
+		mv $(libsqlite3.SO) $$dllname || exit $$?; \
+		ln -s $$dllname $(libsqlite3.SO) || exit $$?; \
+		ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \
+		ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \
+	else \
 		cd "$(install-dir.lib)" || exit $$?; \
 		rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \
 		mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \
 		ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \
 		ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \
-		ls -la $(libsqlite3.SO) $(libsqlite3.SO).[03]*; \
+		ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \
 		if [ -e $(libsqlite3.SO).0.8.6 ]; then \
 			echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \
 			rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \
@@ -157,7 +188,9 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO)
 			rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \
 			ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \
 			ls -la $(libsqlite3.SO).0.8.6; \
-		fi
+		fi; \
+	fi
+
 install-so-0 install-so-:
 install-so: install-so-$(ENABLE_LIB_SHARED)
 install: install-so
@@ -169,36 +202,45 @@ install-lib: install-lib-$(ENABLE_LIB_STATIC)
 install: install-lib


-sqlite3$(T.exe):	shell.c sqlite3.c
+# Flags to link the shell app either directly against sqlite3.c
+# (ENABLE_STATIC_SHELL==1) or libsqlite3.so (ENABLE_STATIC_SHELL==0).
+#
+ENABLE_STATIC_SHELL = @ENABLE_STATIC_SHELL@
+sqlite3-shell-link-flags.1 = $(TOP)/sqlite3.c $(LDFLAGS.libsqlite3)
+sqlite3-shell-link-flags.0 = -L. -lsqlite3 $(LDFLAGS.zlib)
+sqlite3-shell-deps.1 = $(TOP)/sqlite3.c
+sqlite3-shell-deps.0 = $(libsqlite3.SO)
+sqlite3$(T.exe): $(TOP)/shell.c $(sqlite3-shell-deps.$(ENABLE_STATIC_SHELL))
 	$(CC) -o $@ \
-		shell.c sqlite3.c \
+		$(TOP)/shell.c $(sqlite3-shell-link-flags.$(ENABLE_STATIC_SHELL)) \
 		-I. $(OPT_FEATURE_FLAGS) $(SHELL_OPT) \
 		$(CFLAGS) $(CFLAGS.readline) $(CFLAGS.icu) \
-		$(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
+		$(LDFLAGS) $(LDFLAGS.readline)
+
 all: sqlite3$(T.exe)

 install-shell: sqlite3$(T.exe) $(install-dir.bin)
 	$(INSTALL.strip) sqlite3$(T.exe) "$(install-dir.bin)"
 install: install-shell

-install-headers: sqlite3.h $(install-dir.include)
-	$(INSTALL.noexec) sqlite3.h sqlite3ext.h "$(install-dir.include)"
+install-headers: $(TOP)/sqlite3.h $(install-dir.include)
+	$(INSTALL.noexec) $(TOP)/sqlite3.h $(TOP)/sqlite3ext.h "$(install-dir.include)"
 install: install-headers

 install-pc: sqlite3.pc $(install-dir.pkgconfig)
 	$(INSTALL.noexec) sqlite3.pc "$(install-dir.pkgconfig)"
 install: install-pc

-install-man1: sqlite3.1 $(install-dir.man1)
-	$(INSTALL.noexec) sqlite3.1 "$(install-dir.man1)"
+install-man1: $(TOP)/sqlite3.1 $(install-dir.man1)
+	$(INSTALL.noexec) $(TOP)/sqlite3.1 "$(install-dir.man1)"
 install: install-man1

 clean:
 	rm -f *.o sqlite3$(T.exe)
-	rm -f $(libsqlite3.LIB) $(libsqlite3.SO)
+	rm -f $(libsqlite3.LIB) $(libsqlite3.SO) $(libsqlite3.SO).a

 distclean: clean
-	rm -f jimsh0$(T.exe) config.* sqlite3.pc
+	rm -f jimsh0$(T.exe) config.* sqlite3.pc sqlite_cfg.h Makefile

 DIST_FILES := \
  README.txt VERSION \
@@ -216,6 +258,7 @@ dist:
 	rm -fr $(dist_name)
 	mkdir -p $(dist_name)
 	cp -rp $(DIST_FILES) $(dist_name)/.
+	rm -f $(dist_name)/tea/configure.ac.in
 	tar czf $(dist_tarball) $(dist_name)
 	rm -fr $(dist_name)
 	ls -l $(dist_tarball)
@@ -1,4 +1,4 @@
-#/do/not/tclsh
+#!/do/not/tclsh
 # ^^^ help out editors which guess this file's content type.
 #
 # This is the main autosetup-compatible configure script for the
@@ -8,76 +8,7 @@
 # included in this source tree as ./autosetup/jimsh0.c.
 #
 use sqlite-config
-
-options {
-  # <build-modes>
-  static=1             => {Disable build of static library}
-  shared=1             => {Disable build of shared library}
-  # </build-modes>
-  # <lib-feature>
-  threadsafe=1         => {Disable mutexing}
-  with-tempstore:=no   => {Use an in-RAM database for temporary tables: never,no,yes,always}
-  load-extension=1     => {Disable loading of external extensions}
-  math=1               => {Disable math functions}
-  json=1               => {Disable JSON functions}
-  memsys5              => {Enable MEMSYS5}
-  memsys3              => {Enable MEMSYS3}
-  fts3                 => {Enable the FTS3 extension}
-  fts4                 => {Enable the FTS4 extension}
-  fts5                 => {Enable the FTS5 extension}
-  update-limit         => {Enable the UPDATE/DELETE LIMIT clause}
-  geopoly              => {Enable the GEOPOLY extension}
-  rtree                => {Enable the RTREE extension}
-  session              => {Enable the SESSION extension}
-  all                  => {Enable FTS4, FTS5, Geopoly, RTree, Sessions}
-  # </lib-feature>
-  # <line-editing>
-  readline=1           => {Disable readline support}
-  # --with-readline-lib is a backwards-compatible alias for
-  # --with-readline-ldflags
-  with-readline-lib:
-  with-readline-ldflags:=auto
-                       => {Readline LDFLAGS, e.g. -lreadline -lncurses}
-  # --with-readline-inc is a backwards-compatible alias for
-  # --with-readline-cflags.
-  with-readline-inc:
-  with-readline-cflags:=auto
-                       => {Readline CFLAGS, e.g. -I/path/to/includes}
-  with-readline-header:PATH
-                       => {Full path to readline.h, from which --with-readline-cflags will be derived}
-  with-linenoise:DIR   => {Source directory for linenoise.c and linenoise.h}
-  editline=0           => {Enable BSD editline support}
-  # </line-editing>
-  # <icu>
-  with-icu-ldflags:LDFLAGS
-                        => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the ICU libraries}
-  with-icu-cflags:CFLAGS
-                        => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU. e.g. -I/usr/local/include}
-  with-icu-config:=auto => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config, /path/to/icu-config}
-  icu-collations=0      => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=... or --with-icu-config}
-  # </icu>
-  # <developer>
-  # Note that using the --debug/--enable-debug flag here requires patching
-  # autosetup/autosetup to rename the --debug to --autosetup-debug.
-  with-debug=0
-  debug=0              =>
-    {Enable debug build flags. This option will impact performance by
-     as much as 4x, as it includes large numbers of assert()s in
-     performance-critical loops.  Never use --debug for production
-     builds.}
-  # </developer>
-  soname:=legacy       =>
-    # --soname has a long story behind it: https://sqlite.org/src/forumpost/5a3b44f510df8ded
-    {SONAME for libsqlite3.so. "none", or not using this flag, sets no
-     soname. "legacy" sets it to its historical value of
-     libsqlite3.so.0.  A value matching the glob "libsqlite3.*" sets
-     it to that literal value. Any other value is assumed to be a
-     suffix which gets applied to "libsqlite3.so.",
-     e.g. --soname=9.10 equates to "libsqlite3.so.9.10".
-    }
-}
-
-sqlite-post-options-init
+sqlite-config-bootstrap autoconf
 sqlite-check-common-bins
 sqlite-check-common-system-deps
 proj-check-rpath
@@ -91,8 +22,8 @@ sqlite-handle-load-extension
 sqlite-handle-math
 sqlite-handle-icu

+define ENABLE_STATIC_SHELL [opt-bool static-shell]
 define ENABLE_LIB_SHARED [opt-bool shared]
 define ENABLE_LIB_STATIC [opt-bool static]

-sqlite-process-dot-in-files
-sqlite-post-config-validation
+sqlite-config-finalize
@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------

-AC_INIT([sqlite],[3.49.0])
+AC_INIT([sqlite],[@VERSION@])

 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
@@ -75,9 +75,6 @@ extern "C" {

 #if defined(_WIN32) || defined(WIN32)

-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
 #define HAVE_DLOPEN
 void *dlopen(const char *path, int mode);
 int dlclose(void *handle);
@@ -1201,6 +1198,11 @@ int Jim_OpenForRead(const char *filename);
    #define Jim_FileStat _fstat64
    #define Jim_Lseek _lseeki64
    #define O_TEXT _O_TEXT
+    #define O_BINARY _O_BINARY
+    #define Jim_SetMode _setmode
+    #ifndef STDIN_FILENO
+    #define STDIN_FILENO 0
+    #endif

 #else
    #if defined(HAVE_STAT64)
@@ -2941,22 +2943,22 @@ static int aio_cmd_buffering(Jim_Interp *interp, int argc, Jim_Obj *const *argv)

 static int aio_cmd_translation(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	enum {OPT_BINARY, OPT_TEXT};
+    enum {OPT_BINARY, OPT_TEXT};
    static const char * const options[] = {
        "binary",
        "text",
        NULL
    };
-	int opt;
+    int opt;

-	if (Jim_GetEnum(interp, argv[0], options, &opt, NULL, JIM_ERRMSG) != JIM_OK) {
-		return JIM_ERR;
-	}
-#if defined(_setmode) && defined(O_BINARY)
-	else {
-		AioFile *af = Jim_CmdPrivData(interp);
-		_setmode(af->fh, opt == OPT_BINARY ? O_BINARY : O_TEXT);
-	}
+    if (Jim_GetEnum(interp, argv[0], options, &opt, NULL, JIM_ERRMSG) != JIM_OK) {
+            return JIM_ERR;
+    }
+#if defined(Jim_SetMode)
+    else {
+        AioFile *af = Jim_CmdPrivData(interp);
+        Jim_SetMode(af->fd, opt == OPT_BINARY ? O_BINARY : O_TEXT);
+    }
 #endif
    return JIM_OK;
 }
@@ -24374,10 +24376,6 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
 #include <string.h>


-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-

 extern int Jim_initjimshInit(Jim_Interp *interp);

@@ -114,11 +114,13 @@ proc proj-bold {str} {
 #
 # If the -notice flag it used then it emits using [user-notice], which
 # means its rendering will (A) go to stderr and (B) be delayed until
-# the next time autosetup goes to output a message. If -notice
-# is not used, it will send the message to stdout without delay.
+# the next time autosetup goes to output a message.
 #
 # If the -error flag is provided then it renders the message
 # immediately to stderr and then exits.
+#
+# If neither -notice nor -error are used, the message will be sent to
+# stdout without delay.
 proc proj-indented-notice {args} {
  set fErr ""
  set outFunc "puts"
@@ -126,6 +128,7 @@ proc proj-indented-notice {args} {
    switch -exact -- [lindex $args 0] {
      -error  {
        set args [lassign $args fErr]
+        set outFunc "user-notice"
      }
      -notice {
        set args [lassign $args -]
@@ -760,7 +763,7 @@ proc proj-exe-extension {} {
 # Trivia: for .dylib files, the linker needs the -dynamiclib flag
 # instead of -shared.
 proc proj-dll-extension {} {
-  proc inner {key} {
+  set inner {{key} {
    switch -glob -- [get-define $key] {
      *apple* {
        return ".dylib"
@@ -772,9 +775,9 @@ proc proj-dll-extension {} {
        return ".so"
      }
    }
-  }
-  define BUILD_DLLEXT [inner build]
-  define TARGET_DLLEXT [inner host]
+  }}
+  define BUILD_DLLEXT [apply $inner build]
+  define TARGET_DLLEXT [apply $inner host]
 }

 ########################################################################
@@ -784,18 +787,20 @@ proc proj-dll-extension {} {
 # BUILD_LIBEXT and TARGET_LIBEXT to the conventional static library
 # extension for the being-built-on resp. the target platform.
 proc proj-lib-extension {} {
-  proc inner {key} {
+  set inner {{key} {
    switch -glob -- [get-define $key] {
      *-*-ming* - *-*-cygwin - *-*-msys {
-        return ".lib"
+        return ".a"
+        # ^^^ this was ".lib" until 2025-02-07. See
+        # https://sqlite.org/forum/forumpost/02db2d4240
      }
      default {
        return ".a"
      }
    }
-  }
-  define BUILD_LIBEXT [inner build]
-  define TARGET_LIBEXT [inner host]
+  }}
+  define BUILD_LIBEXT [apply $inner build]
+  define TARGET_LIBEXT [apply $inner host]
 }

 ########################################################################
@@ -3,6 +3,15 @@
 # that they can be reused in the TEA sub-tree. This file requires
 # functions from proj.tcl.

+if {[string first " " $autosetup(srcdir)] != -1} {
+  user-error "The pathname of the source tree\
+              may not contain space characters"
+}
+if {[string first " " $autosetup(builddir)] != -1} {
+  user-error "The pathname of the build directory\
+              may not contain space characters"
+}
+
 use cc cc-db cc-shared cc-lib pkg-config proj

 #
@@ -23,13 +32,9 @@ array set sqliteConfig [proj-strip-hash-comments {
  # and not part of the public build interface.
  dump-defines-txt   ./config.defines.txt
  #
-  # Output file for --dump-defines-json. This is the autosetup
-  # counterpart of the historical "DEFS" var which was generated by
-  # the autotools in the pre-processed autotools builds (but not in
-  # the canonical tree). Generation of this file is disabled (via an
-  # empty file name) until/unless someone voices a specific interest
-  # in it. The original motivating use case is handled fine by
-  # sqlite_cfg.h.
+  # If not empty then --dump-defines will dump not only
+  # (dump-defines-txt) but also a JSON file named after this option's
+  # value.
  dump-defines-json  ""
 }]

@@ -41,9 +46,275 @@ array set sqliteConfig [proj-strip-hash-comments {
 #
 set sqliteConfig(is-cross-compiling) [proj-is-cross-compiling]

+########################################################################
+# Processes all configure --flags for this build $buildMode must be
+# either "canonical" or "autoconf", and others may be added in the
+# future.
+proc sqlite-config-bootstrap {buildMode} {
+  if {$buildMode ni {canonical autoconf}} {
+    user-error "Invalid build mode: $buildMode. Expecting one of: canonical, autoconf"
+  }
+  ########################################################################
+  # A gentle introduction to flags handling in autosetup
+  #
+  # Reference: https://msteveb.github.io/autosetup/developer/
+  #
+  # All configure flags must be described in an 'options' call. The
+  # general syntax is:
+  #
+  #  FLAG => {Help text}
+  #
+  # Where FLAG can have any of the following formats:
+  #
+  #   boolopt            => "a boolean option which defaults to disabled"
+  #   boolopt2=1         => "a boolean option which defaults to enabled"
+  #   stringopt:         => "an option which takes an argument, e.g. --stringopt=value"
+  #   stringopt2:=value  => "an option where the argument is optional and defaults to 'value'"
+  #   optalias booltopt3 => "a boolean with a hidden alias. --optalias is not shown in --help"
+  #
+  # Autosetup does no small amount of specialized handling for flags,
+  # especially booleans. Each bool-type --FLAG implicitly gets
+  # --enable-FLAG and --disable-FLAG forms. That can lead lead to some
+  # confusion when writing help text. For example:
+  #
+  #   options { json=1 {Disable JSON functions} }
+  #
+  # The reason the help text says "disable" is because a boolean option
+  # which defaults to true is, in the --help text, rendered as:
+  #
+  #   --disable-json          Disable JSON functions
+  #
+  # Whereas a bool flag which defaults to false will instead render as:
+  #
+  #   --enable-FLAG
+  #
+  # Non-boolean flags, in contrast, use the names specifically given to
+  # them in the [options] invocation. e.g. "with-tcl" is the --with-tcl
+  # flag.
+  #
+  # Fetching values for flags:
+  #
+  #   booleans: use one of:
+  #     - [opt-bool FLAG] is autosetup's built-in command for this, but we
+  #       have some convenience variants:
+  #     - [proj-opt-truthy FLAG]
+  #     - [proj-opt-if-truthy FLAG {THEN} {ELSE}]
+  #
+  #   Non-boolean (i.e. string) flags:
+  #     - [opt-val FLAG ?default?]
+  #     - [opt-str ...] - see the docs in ./autosetup/autosetup
+  #
+  # [proj-opt-was-provided] can be used to determine whether a flag was
+  # explicitly provided, which is often useful for distinguishing from
+  # the case of a default value.
+  ########################################################################
+  set allFlags {
+    # Structure: a list of M {Z} pairs, where M is a descriptive
+    # option group name and Z is a list of X Y pairs. X is a list of
+    # $buildMode name(s) to which the Y flags apply, or {*} to apply
+    # to all builds. Y is a {block} in the form expected by
+    # autosetup's [options] command.  Each block which is applicable
+    # to $buildMode is appended to a new list before that list is
+    # passed on to [options]. The order of each Y and sub-Y is
+    # retained, which is significant for rendering of --help.
+
+    # When writing {help text blocks}, be aware that:
+    #
+    # A) autosetup formats them differently if the {block} starts with
+    # a newline: it starts left-aligned, directly under the --flag, and
+    # the rest of the block is pasted verbatim rather than
+    # pretty-printed.
+    #
+    # B) Vars and commands are NOT expanded, but we use a [subst] call
+    # below which will replace (only) var refs.
+
+    # Options for how to build the library
+    build-modes {
+      {*} {
+        shared=1             => {Disable build of shared libary}
+        static=1             => {Disable build of static library (mostly)}
+      }
+      {canonical} {
+        amalgamation=1       => {Disable the amalgamation and instead build all files separately}
+      }
+    }
+
+    # Library-level features and defaults
+    lib-features {
+      {*} {
+        threadsafe=1         => {Disable mutexing}
+        with-tempstore:=no   => {Use an in-RAM database for temporary tables: never,no,yes,always}
+        largefile=1          => {Disable large file support}
+        # ^^^ It's not clear that this actually does anything, as
+        # HAVE_LFS is not checked anywhere in the .c/.h/.in files.
+        load-extension=1     => {Disable loading of external extensions}
+        math=1               => {Disable math functions}
+        json=1               => {Disable JSON functions}
+        memsys5              => {Enable MEMSYS5}
+        memsys3              => {Enable MEMSYS3}
+        fts3                 => {Enable the FTS3 extension}
+        fts4                 => {Enable the FTS4 extension}
+        fts5                 => {Enable the FTS5 extension}
+        update-limit         => {Enable the UPDATE/DELETE LIMIT clause}
+        geopoly              => {Enable the GEOPOLY extension}
+        rtree                => {Enable the RTREE extension}
+        session              => {Enable the SESSION extension}
+        all                  => {Enable FTS4, FTS5, Geopoly, RTree, Sessions}
+      }
+    }
+
+    # Options for TCL support
+    tcl {
+      {canonical} {
+        with-tcl:DIR
+          => {Directory containing tclConfig.sh or a directory one level up from
+              that, from which we can derive a directory containing tclConfig.sh.
+              A dir name of "prefix" is equivalent to the directory specified by
+              the --prefix flag.}
+        with-tclsh:PATH
+          => {Full pathname of tclsh to use.  It is used for (A) trying to find
+              tclConfig.sh and (B) all TCL-based code generation.  Warning: if
+              its containing dir has multiple tclsh versions, it may select the
+              wrong tclConfig.sh!}
+        tcl=1
+          => {Disable components which require TCL, including all tests.
+              This tree requires TCL for code generation but can use the in-tree
+              copy of autosetup/jimsh0.c for that. The SQLite TCL extension and the
+              test code require a canonical tclsh.}
+      }
+    }
+
+    # Options for line-editing modes for the CLI shell
+    line-editing {
+      {*} {
+        readline=1
+          => {Disable readline support}
+        # --with-readline-lib is a backwards-compatible alias for
+        # --with-readline-ldflags
+        with-readline-lib:
+        with-readline-ldflags:=auto
+          => {Readline LDFLAGS, e.g. -lreadline -lncurses}
+        # --with-readline-inc is a backwards-compatible alias for
+        # --with-readline-cflags.
+        with-readline-inc:
+        with-readline-cflags:=auto
+          => {Readline CFLAGS, e.g. -I/path/to/includes}
+        with-readline-header:PATH
+          => {Full path to readline.h, from which --with-readline-cflags will be derived}
+        with-linenoise:DIR
+          => {Source directory for linenoise.c and linenoise.h}
+        editline=0
+          => {Enable BSD editline support}
+      }
+    }
+
+    # Options for ICU: International Components for Unicode
+    icu {
+      {*} {
+        with-icu-ldflags:LDFLAGS
+          => {Enable SQLITE_ENABLE_ICU and add the given linker flags for the
+              ICU libraries. e.g. on Ubuntu systems, try '-licui18n -licuuc -licudata'.}
+        with-icu-cflags:CFLAGS
+          => {Apply extra CFLAGS/CPPFLAGS necessary for building with ICU.
+              e.g. -I/usr/local/include}
+        with-icu-config:=auto
+          => {Enable SQLITE_ENABLE_ICU. Value must be one of: auto, pkg-config,
+              /path/to/icu-config}
+        icu-collations=0
+          => {Enable SQLITE_ENABLE_ICU_COLLATIONS. Requires --with-icu-ldflags=...
+              or --with-icu-config}
+      }
+    }
+
+    # Options for exotic/alternative build modes
+    alternative-builds {
+      {canonical} {
+        with-wasi-sdk:=/opt/wasi-sdk
+          => {Top-most dir of the wasi-sdk for a WASI build}
+        with-emsdk:=auto
+          => {Top-most dir of the Emscripten SDK installation.
+              Default = EMSDK env var.}
+      }
+    }
+
+    # Options primarily for downstream packagers/package maintainers
+    packaging {
+      {autoconf} {
+        # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704
+        static-shell=1       => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
+      }
+      {*} {
+        # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
+        soname:=legacy
+          => {SONAME for libsqlite3.so. "none", or not using this flag, sets no
+              soname. "legacy" sets it to its historical value of
+              libsqlite3.so.0.  A value matching the glob "libsqlite3.*" sets
+              it to that literal value. Any other value is assumed to be a
+              suffix which gets applied to "libsqlite3.so.",
+              e.g. --soname=9.10 equates to "libsqlite3.so.9.10".}
+        # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2
+        out-implib=0
+          => {Enable use of --out-implib linker flag to generate an
+              "import library" for the DLL}
+      }
+    }
+
+    # Options mostly for sqlite's own development
+    developer {
+      {*} {
+        # Note that using the --debug/--enable-debug flag here
+        # requires patching autosetup/autosetup to rename the --debug
+        # to --autosetup-debug.
+        with-debug=0
+        debug=0
+          => {Enable debug build flags. This option will impact performance by
+              as much as 4x, as it includes large numbers of assert()s in
+              performance-critical loops.  Never use --debug for production
+              builds.}
+        scanstatus
+          => {Enable the SQLITE_ENABLE_STMT_SCANSTATUS feature flag}
+      }
+      {canonical} {
+        dev                  => {Enable dev-mode build: automatically enables certain other flags}
+        test-status          => {Enable status of tests}
+        gcov=0               => {Enable coverage testing using gcov}
+        linemacros           => {Enable #line macros in the amalgamation}
+        dynlink-tools        => {Dynamically link libsqlite3 to certain tools which normally statically embed it}
+      }
+      {*} {
+        dump-defines=0       => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)}
+      }
+    }
+  }; # $allOpts
+
+  # Filter allOpts to create the set of [options] legal for this build
+  set opts {}
+  foreach {group XY} [subst -nobackslashes -nocommands \
+                        [proj-strip-hash-comments $allFlags]] {
+    foreach {X Y} $XY {
+      if { $buildMode in $X || "*" in $X } {
+        foreach y $Y {
+          lappend opts $y
+        }
+      }
+    }
+  }
+  #lappend opts "soname:=duplicateEntry => {x}"; #just testing
+  if {[catch {options $opts}]} {
+    # Workaround for <https://github.com/msteveb/autosetup/issues/73>
+    # where [options] behaves oddly on _some_ TCL builds when it's
+    # called from deeper than the global scope.
+    return -code break
+  }
+  sqlite-post-options-init
+}; # sqlite-config-bootstrap
+
 ########################################################################
 # Runs some common initialization which must happen immediately after
-# autosetup's [options] function is called.
+# autosetup's [options] function is called. This is also a convenient
+# place to put some generic pieces common to both the canonical
+# top-level build and the "autoconf" build, but it's not intended to
+# be a catch-all dumping ground for such.
 proc sqlite-post-options-init {} {
  #
  # Carry values from hidden --flag aliases over to their canonical
@@ -101,19 +372,19 @@ proc sqlite-autoreconfig {} {
  # configure script with the same arguments it was initially invoked
  # with. This can be used to automatically reconfigure
  #
-  proc squote {arg} {
+  set squote {{arg} {
    # Wrap $arg in single-quotes if it looks like it might need that
    # to avoid mis-handling as a shell argument. We assume that $arg
    # will never contain any single-quote characters.
    if {[string match {*[ &;$*"]*} $arg]} { return '$arg' }
    return $arg
-  }
-  define-append SQLITE_AUTORECONFIG cd [squote $::autosetup(builddir)] && [squote $::autosetup(srcdir)/configure]
+  }}
+  define-append SQLITE_AUTORECONFIG cd [apply $squote $::autosetup(builddir)] \
+    && [apply $squote $::autosetup(srcdir)/configure]
  #{*}$::autosetup(argv) breaks with --flag='val with spaces', so...
  foreach arg $::autosetup(argv) {
-    define-append SQLITE_AUTORECONFIG [squote $arg]
+    define-append SQLITE_AUTORECONFIG [apply $squote $arg]
  }
-  rename squote ""
 }

 define OPT_FEATURE_FLAGS {} ; # -DSQLITE_OMIT/ENABLE flags.
@@ -184,9 +455,15 @@ proc sqlite-check-common-system-deps {} {
  cc-check-functions gmtime_r isnan localtime_r localtime_s \
    malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64

-  proj-check-function-in-lib fdatasync rt
-  define LDFLAGS_FDATASYNC [get-define lib_fdatasync]
-  undefine lib_fdatasync
+  set ldrt ""
+  # Collapse funcs from librt into LDFLAGS_RT.
+  # Some systems (ex: SunOS) require -lrt in order to use nanosleep
+  foreach func {fdatasync nanosleep} {
+    if {[proj-check-function-in-lib $func rt]} {
+      lappend ldrt [get-define lib_${func}]
+    }
+  }
+  define LDFLAGS_RT [join [lsort -unique $ldrt] ""]

  #
  # Check for needed/wanted headers
@@ -227,23 +504,47 @@ proc sqlite-setup-default-cflags {} {
  # BUILD_CFLAGS is the CFLAGS for CC_FOR_BUILD.
  define BUILD_CFLAGS [proj-get-env BUILD_CFLAGS {-g}]

-  # Copy all CFLAGS entries matching -DSQLITE_OMIT* and
+  # Copy all CFLAGS and CPPFLAGS entries matching -DSQLITE_OMIT* and
  # -DSQLITE_ENABLE* to OPT_FEATURE_FLAGS. This behavior is derived
  # from the legacy build and was missing the 3.48.0 release (the
  # initial Autosetup port).
  # https://sqlite.org/forum/forumpost/9801e54665afd728
  #
+  # Handling of CPPFLAGS, as well as removing ENABLE/OMIT from
+  # CFLAGS/CPPFLAGS, was missing in the 3.49.0 release as well.
+  #
  # If any configure flags for features are in conflict with
-  # CFLAGS-specified feature flags, all bets are off.  There are no
-  # guarantees about which one will take precedence.
-  foreach cf [get-define CFLAGS ""] {
+  # CFLAGS/CPPFLAGS-specified feature flags, all bets are off.  There
+  # are no guarantees about which one will take precedence.
+  foreach flagDef {CFLAGS CPPFLAGS} {
+    set tmp ""
+    foreach cf [get-define $flagDef ""] {
+      switch -glob -- $cf {
+        -DSQLITE_OMIT* -
+        -DSQLITE_ENABLE* {
+          sqlite-add-feature-flag $cf
+        }
+        default {
+          lappend tmp $cf
+        }
+      }
+    }
+    define $flagDef $tmp
+  }
+
+  # Strip all SQLITE_ENABLE/OMIT flags from BUILD_CFLAGS,
+  # for compatibility with the legacy build.
+  set tmp ""
+  foreach cf [get-define BUILD_CFLAGS ""] {
    switch -glob -- $cf {
      -DSQLITE_OMIT* -
-      -DSQLITE_ENABLE* {
-        sqlite-add-feature-flag $cf
+      -DSQLITE_ENABLE* {}
+      default {
+        lappend tmp $cf
      }
    }
  }
+  define BUILD_CFLAGS $tmp
 }

 ########################################################################
@@ -383,29 +684,35 @@ proc sqlite-handle-soname {} {
 }

 ########################################################################
-# If --enable-thresafe is set, this adds -DSQLITE_THREADSAFE=1 to
+# If --enable-threadsafe is set, this adds -DSQLITE_THREADSAFE=1 to
 # OPT_FEATURE_FLAGS and sets LDFLAGS_PTHREAD to the linker flags
-# needed for linking pthread. If --enable-threadsafe is not set, adds
-# -DSQLITE_THREADSAFE=0 to OPT_FEATURE_FLAGS and sets LDFLAGS_PTHREAD
-# to an empty string.
+# needed for linking pthread (possibly an empty string). If
+# --enable-threadsafe is not set, adds -DSQLITE_THREADSAFE=0 to
+# OPT_FEATURE_FLAGS and sets LDFLAGS_PTHREAD to an empty string.
 proc sqlite-handle-threadsafe {} {
  msg-checking "Support threadsafe operation? "
+  define LDFLAGS_PTHREAD ""
+  set enable 0
  proj-if-opt-truthy threadsafe {
-    msg-result yes
-    sqlite-add-feature-flag -DSQLITE_THREADSAFE=1
-    if {![proj-check-function-in-lib pthread_create pthread]
-        || ![proj-check-function-in-lib pthread_mutexattr_init pthread]} {
-      user-error "Missing required pthread bits"
+    msg-result "Checking for libs..."
+    if {[proj-check-function-in-lib pthread_create pthread]
+        && [proj-check-function-in-lib pthread_mutexattr_init pthread]} {
+      set enable 1
+      define LDFLAGS_PTHREAD [get-define lib_pthread_create]
+      undefine lib_pthread_create
+      undefine lib_pthread_mutexattr_init
+    } elseif {[proj-opt-was-provided threadsafe]} {
+      user-error "Missing required pthread libraries. Use --disable-threadsafe to disable this check."
+    } else {
+      msg-result "pthread support not detected"
    }
-    define LDFLAGS_PTHREAD [get-define lib_pthread_create]
-    undefine lib_pthread_create
    # Recall that LDFLAGS_PTHREAD might be empty even if pthreads if
    # found because it's in -lc on some platforms.
  } {
-    msg-result no
-    sqlite-add-feature-flag -DSQLITE_THREADSAFE=0
-    define LDFLAGS_PTHREAD ""
+    msg-result "Disabled using --disable-threadsafe"
  }
+  sqlite-add-feature-flag -DSQLITE_THREADSAFE=${enable}
+  return $enable
 }

 ########################################################################
@@ -770,6 +1077,7 @@ proc sqlite-handle-icu {} {
  define LDFLAGS_ICU [join [opt-val with-icu-ldflags ""]]
  define CFLAGS_ICU [join [opt-val with-icu-cflags ""]]
  if {[proj-opt-was-provided with-icu-config]} {
+    msg-result "Checking for ICU support..."
    set icuConfigBin [opt-val with-icu-config]
    set tryIcuConfigBin 1; # set to 0 if we end up using pkg-config
    if {"auto" eq $icuConfigBin || "pkg-config" eq $icuConfigBin} {
@@ -793,19 +1101,28 @@ proc sqlite-handle-icu {} {
                            /usr/local/bin/icu-config \
                            /usr/bin/icu-config]
        if {"" eq $icuConfigBin} {
-          proj-fatal "--with-icu-config=auto cannot find (pkg-config icu-io) or icu-config binary"
+          proj-indented-notice -error {
+            --with-icu-config=auto cannot find (pkg-config icu-io) or icu-config binary.
+            On Ubuntu-like systems try:
+            --with-icu-ldflags='-licui18n -licuuc -licudata'
+          }
        }
      }
      if {[file-isexec $icuConfigBin]} {
        set x [exec $icuConfigBin --ldflags]
        if {"" eq $x} {
-          proj-fatal "$icuConfigBin --ldflags returned no data"
+          proj-indented-notice -error \
+            [subst {
+              $icuConfigBin --ldflags returned no data.
+              On Ubuntu-like systems try:
+              --with-icu-ldflags='-licui18n -licuuc -licudata'
+            }]
        }
        define-append LDFLAGS_ICU $x
        set x [exec $icuConfigBin --cppflags]
        define-append CFLAGS_ICU $x
      } else {
-        proj-fatal "--with-icu-config=$bin does not refer to an executable"
+        proj-fatal "--with-icu-config=$icuConfigBin does not refer to an executable"
      }
    }
  }
@@ -828,20 +1145,53 @@ proc sqlite-handle-icu {} {


 ########################################################################
-# Handles the --enable-load-extension flag.
+# Handles the --enable-load-extension flag. Returns 1 if the support
+# is enabled, else 0. If support for that feature is not found, a
+# fatal error is triggered if --enable-load-extension is explicitly
+# provided, else a loud warning is instead emited. If
+# --disable-load-extension is used, no check is performed.
+#
+# Makes the following environment changes:
+#
+# - defines LDFLAGS_DLOPEN to any linker flags needed for this
+#   feature.  It may legally be empty on some systems where dlopen()
+#   is in libc.
+#
+# - If the feature is not available, adds
+#   -DSQLITE_OMIT_LOAD_EXTENSION=1 to the feature flags list.
 proc sqlite-handle-load-extension {} {
+  define LDFLAGS_DLOPEN ""
+  set found 0
  proj-if-opt-truthy load-extension {
-    if {[proj-check-function-in-lib dlopen dl]} {
+    set found [proj-check-function-in-lib dlopen dl]
+    if {$found} {
      define LDFLAGS_DLOPEN [get-define lib_dlopen]
      undefine lib_dlopen
    } else {
-      user-error "dlopen() not found. Use --disable-load-extension to bypass this check."
+      if {[proj-opt-was-provided load-extension]} {
+        # Explicit --enable-load-extension: fail if not found
+        proj-indented-notice -error {
+          --enable-load-extension was provided but dlopen()
+          not found. Use --disable-load-extension to bypass this
+          check.
+        }
+      } else {
+        # It was implicitly enabled: warn if not found
+        proj-indented-notice {
+          WARNING: dlopen() not found, so loadable module support will
+          be disabled. Use --disable-load-extension to bypass this
+          check.
+        }
+      }
    }
-  } {
-    define LDFLAGS_DLOPEN ""
-    sqlite-add-feature-flag {-DSQLITE_OMIT_LOAD_EXTENSION=1}
-    msg-result "Disabling loadable extensions."
  }
+  if {$found} {
+    msg-result "Loadable extension support enabled."
+  } else {
+    msg-result "Disabling loadable extension support. Use --enable-load-extensions to enable them."
+    sqlite-add-feature-flag {-DSQLITE_OMIT_LOAD_EXTENSION=1}
+  }
+  return $found
 }

 ########################################################################
@@ -861,6 +1211,77 @@ proc sqlite-handle-math {} {
  }
 }

+########################################################################
+# If this OS looks like a Mac, checks for the Mac-specific
+# -current_version and -compatibility_version linker flags. Defines
+# LDFLAGS_MAC_CVERSION to an empty string and returns 0 if they're not
+# supported, else defines that to the linker flags and returns 1.
+#
+# We don't check this on non-Macs because this whole thing is a
+# libtool compatibility kludge to account for a version stamp which
+# libtool applied only on Mac platforms.
+#
+# Based on https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7.
+proc sqlite-check-mac-cversion {} {
+  define LDFLAGS_MAC_CVERSION ""
+  set rc 0
+  if {[proj-looks-like-mac]} {
+    cc-with {} {
+      # These version numbers are historical libtool-defined values, not
+      # library-defined ones
+      if {[cc-check-flags "-Wl,-current_version,9.6.0"]
+          && [cc-check-flags "-Wl,-compatibility_version,9.0.0"]} {
+        define LDFLAGS_MAC_CVERSION "-Wl,-compatibility_version,9.0.0 -Wl,-current_version,9.6.0"
+        set rc 1
+      } elseif {[cc-check-flags "-compatibility_version 9.0.0"]
+                && [cc-check-flags "-current_version 9.6.0"]} {
+        define LDFLAGS_MAC_CVERSION "-compatibility_version 9.0.0 -current_version 9.6.0"
+        set rc 1
+      }
+    }
+  }
+  return $rc
+}
+
+########################################################################
+# Define LDFLAGS_OUT_IMPLIB to either an empty string or to a
+# -Wl,... flag for the platform-specific --out-implib flag, which is
+# used for building an "import library .dll.a" file on some platforms
+# (e.g. mingw). Returns 1 if supported, else 0.
+#
+# If the configure flag --out-implib is not used then this is a no-op.
+# The feature is specifically opt-in because on some platforms the
+# feature test will pass but using that flag will fail at link-time
+# (e.g. OpenBSD).
+#
+# Added in response to: https://sqlite.org/forum/forumpost/0c7fc097b2
+proc sqlite-check-out-implib {} {
+  define LDFLAGS_OUT_IMPLIB ""
+  set rc 0
+  if {[proj-opt-was-provided out-implib]} {
+    cc-with {} {
+      set dll "libsqlite3[get-define TARGET_DLLEXT]"
+      set flags "-Wl,--out-implib,${dll}.a"
+      if {[cc-check-flags $flags]} {
+        define LDFLAGS_OUT_IMPLIB $flags
+        set rc 1
+      }
+    }
+  }
+  return $rc
+}
+
+########################################################################
+# Performs late-stage config steps common to both the canonical and
+# autoconf bundle builds.
+proc sqlite-config-finalize {} {
+  sqlite-check-mac-cversion
+  sqlite-check-out-implib
+  sqlite-process-dot-in-files
+  sqlite-post-config-validation
+  sqlite-dump-defines
+}
+
 ########################################################################
 # Perform some late-stage work and generate the configure-process
 # output file(s).
@@ -1336,10 +1757,10 @@ proc sqlite-dump-defines {} {
        -array {*.list}
        -auto {OPT_* PACKAGE_* HAVE_*}
      }
-      if {[opt-bool defines-json-include-lowercase]} {
-        lappend dumpDefsOpt -none {lib_*} ; # remnants from proj-check-function-in-lib and friends
-        lappend dumpDefsOpt -auto {[a-z]*}
-      }
+#      if {$::sqliteConfig(dump-defines-json-include-lowercase)} {
+#        lappend dumpDefsOpt -none {lib_*} ; # remnants from proj-check-function-in-lib and friends
+#        lappend dumpDefsOpt -auto {[a-z]*}
+#      }
      lappend dumpDefsOpt -none *
      proj-dump-defs-json $::sqliteConfig(dump-defines-json) {*}$dumpDefsOpt
      undefine OPT_FEATURE_FLAGS.list
@@ -165,7 +165,7 @@ dir.wasmfs := $(dir.dout)

 MKDIR.bld := $(dir.tmp)
 $(MKDIR.bld):
-	-mkdir -p $@ $(dir.dout)
+	@mkdir -p $@ $(dir.dout)

 CLEAN_FILES += *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~ $(dir.fiddle)/*~ \
  $(dir.fiddle-debug)/* $(dir.dout)/* $(dir.tmp)/*
@@ -424,7 +424,8 @@ define SQLITE.CALL.C-PP.FILTER
 # $1 = Input file: c-pp -f $(1).js
 # $2 = Output file: c-pp -o $(2).js
 # $3 = optional c-pp -D... flags
-$(2): $(1) $$(MAKEFILE) $$(bin.c-pp)
+$(2): $(1) $$(MAKEFILE_LIST) $$(bin.c-pp)
+	@mkdir -p $$(dir $$@)
 	$$(bin.c-pp) -f $(1) -o $$@ $(3) $(SQLITE.CALL.C-PP.FILTER.global)
 #CLEAN_FILES += $(2)
 endef
@@ -909,6 +910,31 @@ sqlite3-worker1-promiser.js := $(dir.dout)/sqlite3-worker1-promiser.js
 sqlite3-worker1-promiser.mjs := $(dir.dout)/sqlite3-worker1-promiser.mjs
 sqlite3-worker1-bundler-friendly.mjs := $(dir.dout)/sqlite3-worker1-bundler-friendly.mjs
 sqlite3-worker1-promiser-bundler-friendly.js := $(dir.dout)/sqlite3-worker1-promiser-bundler-friendly.js
+
+ifneq (1,$(MAKING_CLEAN))
+# This block MUST come between the above definitions of
+# sqlite3-...js/mjs and the $(eval) calls below this block which use
+# SQLITE.CALL.C-PP.FILTER.
+########################################################################
+# bin.mkwb is used for generating some of the makefile code for the
+# various wasm builds. It used to be generated in this makefile via a
+# difficult-to-read/maintain block of $(eval)'d code. Attempts were
+# made to generate it from tcl and bash (shell) but having to escape
+# the $ references in those languages made it just as illegible as the
+# native makefile code. Somewhat surprisingly, moving that code generation
+# to C makes it slightly less illegible than the previous 3 options.
+bin.mkwb := ./mkwasmbuilds
+$(bin.mkwb): $(bin.mkwb).c $(MAKEFILE)
+	$(CC) -o $@ $<
+DISTCLEAN_FILES += $(bin.mkwb)
+.wasmbuilds.make: $(bin.mkwb)
+	@rm -f $@
+	$(bin.mkwb) > $@
+	@chmod -w $@
+-include .wasmbuilds.make
+endif
+DISTCLEAN_FILES += .wasmbuilds.make
+
 $(eval $(call SQLITE.CALL.C-PP.FILTER,$(sqlite3-worker1.js.in),$(sqlite3-worker1.js)))
 $(eval $(call SQLITE.CALL.C-PP.FILTER,$(sqlite3-worker1.js.in),$(sqlite3-worker1-bundler-friendly.mjs),\
    $(c-pp.D.sqlite3-bundler-friendly)))
@@ -940,27 +966,6 @@ sqlite3-api.ext.jses += \
 all quick: $(sqlite3-api.ext.jses)
 q: quick

-ifneq (1,$(MAKING_CLEAN))
-########################################################################
-# bin.mkwb is used for generating some of the makefile code for the
-# various wasm builds. It used to be generated in this makefile via a
-# difficult-to-read/maintain block of $(eval)'d code. Attempts were
-# made to generate it from tcl and bash (shell) but having to escape
-# the $ references in those languages made it just as illegible as the
-# native makefile code. Somewhat surprisingly, moving that code generation
-# to C makes it slightly less illegible than the previous 3 options.
-bin.mkwb := ./mkwasmbuilds
-$(bin.mkwb): $(bin.mkwb).c $(MAKEFILE)
-	$(CC) -o $@ $<
-DISTCLEAN_FILES += $(bin.mkwb)
-.wasmbuilds.make: $(bin.mkwb)
-	@rm -f $@
-	$(bin.mkwb) > $@
-	@chmod -w $@
-include .wasmbuilds.make
-endif
-DISTCLEAN_FILES += .wasmbuilds.make
-
 ########################################################################
 # batch-runner.js is part of one of the test apps which reads in SQL
 # dumps generated by $(speedtest1) and executes them.
@@ -84,8 +84,8 @@
              wrapper is significantly easier to use, however.</li>
            <li><a href='demo-worker1-promiser.html'>demo-worker1-promiser</a>:
              a demo of the Promise-based wrapper of the Worker1 API.</li>
-            <!--li><a href='demo-worker1-promiser-esm.html'>demo-worker1-promiser-esm</a>:
-              same as the previous demo except loads the promiser from an ESM module.</li-->
+            <li><a href='demo-worker1-promiser-esm.html'>demo-worker1-promiser-esm</a>:
+              same as the previous demo except loads the promiser from an ESM module.</li>
          </ul>
        </li>
        <li>speedtest1 ports (sqlite3's primary benchmarking tool)...
@@ -151,7 +151,7 @@ static void mk_pre_post(const char *zName  /* build name */,
  /* --pre-js=... */
  pf("pre-js.js.%s-%s := $(dir.tmp)/pre-js.%s-%s.js\n",
     zNM, zNM);
-  pf("$(pre-js.js.%s-%s): $(MAKEFILE)\n", zNM);
+  pf("$(pre-js.js.%s-%s): $(MAKEFILE_LIST)\n", zNM);
 #if 1
  pf("$(eval $(call SQLITE.CALL.C-PP.FILTER,$(pre-js.js.in),$(pre-js.js.%s-%s),"
     "$(c-pp.D.%s-%s)))\n", zNM, zNM);
@@ -218,7 +218,7 @@ static void mk_fiddle(){
    pf("fiddle-module.js%s := %s/fiddle-module.js\n", zTail, zDir);
    pf("fiddle-module.wasm%s := "
       "$(subst .js,.wasm,$(fiddle-module.js%s))\n", zTail, zTail);
-    pf("$(fiddle-module.js%s):%s $(MAKEFILE) $(MAKEFILE.fiddle) "
+    pf("$(fiddle-module.js%s):%s $(MAKEFILE_LIST) $(MAKEFILE.fiddle) "
       "$(EXPORTED_FUNCTIONS.fiddle) "
       "$(fiddle.cses) $(pre-post-fiddle-module-vanilla.deps) "
       "$(SOAP.js)\n",
@@ -274,6 +274,7 @@ static void mk_lib_mode(const char *zName     /* build name */,
  if( !zEmcc ) zEmcc = "";

  pf("%s# Begin build [%s-%s]\n", zBanner, zNM);
+  pf("# zApiJsOut=%s\n# zJsOut=%s\n# zCmppD=%s\n", zApiJsOut, zJsOut, zCmppD);
  pf("$(info Setting up build [%s-%s]: %s)\n", zNM, zJsOut);
  mk_pre_post(zNM, zCmppD);
  pf("\nemcc.flags.%s.%s ?=\n", zNM);
@@ -284,7 +285,7 @@ static void mk_lib_mode(const char *zName     /* build name */,
     zApiJsOut, zCmppD);

  /* target zJsOut */
-  pf("%s: %s $(MAKEFILE) $(sqlite3-wasm.cfiles) $(EXPORTED_FUNCTIONS.api) "
+  pf("%s: %s $(MAKEFILE_LIST) $(sqlite3-wasm.cfiles) $(EXPORTED_FUNCTIONS.api) "
     "$(pre-post-%s-%s.deps) "
     "$(sqlite3-api.ext.jses)"
     /* ^^^ maintenance reminder: we set these as deps so that they
@@ -303,9 +304,10 @@ static void mk_lib_mode(const char *zName     /* build name */,
     "\t\t$(cflags.%s) $(cflags.%s.%s) \\\n"
     "\t\t$(cflags.wasm_extra_init) $(sqlite3-wasm.cfiles)\n", zName, zNM);
  if( bIsEsm ){
-    /* TODO? Replace this CALL with the corresponding makefile code.
-    ** OTOH, we also use this $(call) in the speedtest1-wasmfs build,
-    ** which is not part of the rules emitted by this program. */
+    /* TODO? Replace this $(call) with the corresponding makefile
+    ** code.  OTOH, we also use this $(call) in the speedtest1-wasmfs
+    ** build, which is not part of the rules emitted by this
+    ** program. */
    pf("\t@$(call SQLITE.CALL.xJS.ESM-EXPORT-DEFAULT,1,%d)\n",
       0==strcmp("sqlite3-wasmfs", zName) ? 1 : 0);
  }
@@ -337,6 +339,16 @@ static void mk_lib_mode(const char *zName     /* build name */,
       /* ^^^^^^ reminder: Mac/BSD sed has no -i flag */
       zNM, zName);
    pf("\t@ls -la $@\n");
+    if( 0==strcmp("bundler-friendly", zMode) ){
+      /* Avoid a 3rd occurance of the bug fixed by 65798c09a00662a3,
+      ** which was (in two cases) caused by makefile refactoring and
+      ** not recognized until after a release was made with the broken
+      ** sqlite3-bundler-friendly.mjs: */
+      pf("\t@if grep -e '^ *importScripts(' $@; "
+         "then echo 'ERROR: bug fixed in 65798c09a00662a3 has re-appeared'; "
+         "exit 1; fi;\n");
+    }
+
  }else{
    pf("\t@ls -la %s $@\n", zWasmOut);
  }
@@ -163,9 +163,11 @@ LDFLAGS.rpath ?= -Wl,-rpath -Wl,$(prefix)/lib
 LDFLAGS.pthread ?= -lpthread
 LDFLAGS.dlopen ?= -ldl
 LDFLAGS.shlib ?= -shared
+LDFLAGS.rt ?= # nanosleep on some platforms
 LDFLAGS.icu ?= # -licui18n -licuuc -licudata
 CFLAGS.icu ?=
 LDFLAGS.libsqlite3.soname ?= # see https://sqlite.org/src/forumpost/5a3b44f510df8ded
+LDFLAGS.libsqlite3.os-specific ?= # see https://sqlite.org/forum/forumpost/9dfd5b8fd525a5d7
 # libreadline (or a workalike):
 # To activate readline in the shell: SHELL_OPT = -DHAVE_READLINE=1
 LDFLAGS.readline ?= -lreadline # these vary across platforms
@@ -412,7 +414,7 @@ LDFLAGS.libsqlite3 = \
  $(LDFLAGS.rpath) $(LDFLAGS.pthread) \
  $(LDFLAGS.math) $(LDFLAGS.dlopen) \
  $(LDFLAGS.zlib) $(LDFLAGS.icu) \
-  $(LDFLAGS.configure)
+  $(LDFLAGS.rt) $(LDFLAGS.configure)

 #
 # $(install-dir.XYZ) = dirs for installation.
@@ -434,7 +436,8 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \
  $(install-dir.lib) $(install-dir.man1) \
  $(install-dir.pkgconfig)
 $(install-dir.all):
-	$(INSTALL) -d "$@"
+	@if [ ! -d "$@" ]; then set -x; $(INSTALL) -d "$@"; fi
+# ^^^^ on some platforms, install -d fails if the target already exists.

 #
 # After jimsh is compiled, we run some sanity checks to ensure that
@@ -1411,23 +1414,24 @@ all: lib
 #
 $(libsqlite3.SO):	$(LIBOBJ)
 	$(T.link.shared) -o $@ $(LIBOBJ) $(LDFLAGS.libsqlite3) \
-		$(LDFLAGS.libsqlite3.soname)
+		$(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname)
 $(libsqlite3.SO)-1: $(libsqlite3.SO)
 $(libsqlite3.SO)-0 $(libsqlite3.SO)-:
 so: $(libsqlite3.SO)-$(ENABLE_SHARED)
 all: so

 #
-# Install the $(libsqlite3.SO) as $(libsqlite3.SO).$(PACKAGE_VERSION)
-# and create symlinks which point to it:
+# On most Unix-like platforms, install the $(libsqlite3.SO) as
+# $(libsqlite3.SO).$(PACKAGE_VERSION) and create symlinks which point
+# to it:
 #
 # - libsqlite3.so.$(PACKAGE_VERSION)
 # - libsqlite3.so.0      =symlink-> libsqlite3.so.$(PACKAGE_VERSION) (see below)
 # - libsqlite3.so        =symlink-> libsqlite3.so.3
 #
-# N.B. we initially had a link named libsqlite3.so.3 but it's
-# unnecessary unless we want to set SONAME to libsqlite3.so.3, which
-# is also unnecessary.
+# The symlinks are not added on platforms where $(T.dll) is ".dll",
+# and different transformations take place on platforms where $(T.dll)
+# is ".dylib".
 #
 # The link named libsqlite3.so.0 is provided in an attempt to reduce
 # downstream disruption when performing upgrades from pre-3.48 to a
@@ -1465,13 +1469,27 @@ all: so
 #
 install-so-1: $(install-dir.lib) $(libsqlite3.SO)
 	$(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)"
-	@echo "Setting up $(libsqlite3.SO) symlinks..."; \
+	@if [ -f $(libsqlite3.SO).a ]; then \
+		$(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \
+	fi
+	@echo "Setting up $(libsqlite3.SO) version symlinks..."; \
+	if [ x.dll = x$(T.dll) ]; then \
+		echo "No library symlinks needed on this platform"; \
+	elif [ x.dylib = x$(T.dll) ]; then \
+		cd "$(install-dir.lib)" || exit $$?; \
+		rm -f libsqlite3.0$(T.dll) libsqlite3.$(PACKAGE_VERSION)$(T.dll) || exit $$?; \
+		dllname=libsqlite3.$(PACKAGE_VERSION)$(T.dll); \
+		mv $(libsqlite3.SO) $$dllname || exit $$?; \
+		ln -s $$dllname $(libsqlite3.SO) || exit $$?; \
+		ln -s $$dllname libsqlite3.0$(T.dll) || exit $$?; \
+		ls -la $$dllname $(libsqlite3.SO) libsqlite3.0$(T.dll); \
+	else \
 		cd "$(install-dir.lib)" || exit $$?; \
 		rm -f $(libsqlite3.SO).0 $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \
 		mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \
 		ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \
 		ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \
-		ls -la $(libsqlite3.SO) $(libsqlite3.SO).[03]*; \
+		ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \
 		if [ -e $(libsqlite3.SO).0.8.6 ]; then \
 			echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \
 			rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \
@@ -1482,7 +1500,9 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO)
 			rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \
 			ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0.8.6 || exit $$?; \
 			ls -la $(libsqlite3.SO).0.8.6; \
-		fi
+		fi; \
+	fi
+
 install-so-0 install-so-:
 install-so: install-so-$(ENABLE_SHARED)
 install: install-so
@@ -1682,7 +1702,7 @@ fuzztest:	fuzzcheck$(T.exe) $(FUZZDATA) sessionfuzz$(T.exe)
 	./fuzzcheck$(T.exe) $(FUZZDATA)
 	./sessionfuzz$(T.exe) run $(TOP)/test/sessionfuzz-data1.db

-valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(T.exe)
+valgrindfuzz:	fuzzcheck$(T.exe) $(FUZZDATA) sessionfuzz$(T.exe)
 	valgrind ./fuzzcheck$(T.exe) --cell-size-check --limit-mem 10M $(FUZZDATA)
 	valgrind ./sessionfuzz$(T.exe) run $(TOP)/test/sessionfuzz-data1.db

@@ -2318,7 +2338,7 @@ tidy: tidy-.
 	rm -f lemon$(B.exe) sqlite*.tar.gz
 	rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe)
 	rm -f parse.* fts5parse.*
-	rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO)
+	rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.SO).a
 	rm -f tclsqlite3$(T.exe) $(TESTPROGS)
 	rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe)
 	rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe)
@@ -2352,7 +2372,7 @@ distclean:	distclean-. clean


 # Show important variable settings.
-show-variables:	
+show-variables:
 	@echo "CC          = $(CC)"
 	@echo "B.cc        = $(B.cc)"
 	@echo "T.cc        = $(T.cc)"
@@ -1,30 +1,30 @@
-C Version\s3.49.0
-D 2025-02-06T11:55:18.769
+C Allow\ssqlite3_rsync\sto\swork\son\snon-WAL-mode\sdatabases,\sas\slong\sas\sthe\n--wal-only\sflag\sis\snot\sused.
+D 2025-05-01T16:02:02.037
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
-F Makefile.in 38485d15d9190cdad0d7bee25af7b442028865964025dcc61f40fd8d6e369cfc
+F Makefile.in 80be2e281d4647ac15a5bac15d5d20fc76d1cfb3f3f6dc01d1a26e3346a5042a
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 F Makefile.msc a9b95ae9807e17f9b0734ebe97d68032141c3f95286bb64593cb73b206f043cf
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
-F VERSION 01f7606130e48fd58a74d1e45e565f2674819d6eadbc219d328d94bb3362b818
+F VERSION 652f6a5ba4cffa08baba6313486466378ac404381a2a173fa138879ced5619bc
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
 F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d87031
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def e7e92090c98aeb0174d29988c259834eb1b71ae1ea927015c3ef300f6f9b68ae
+F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.in 56697ad25ecf23afa317148b06bdc14f85960b42e5ec434ac1ba87f63a3cb789
+F autoconf/Makefile.in 844bc155e1c02075821530b2b4d996ab3d162e647352bb6e2895f3d0e64ad988
 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
-F autoconf/auto.def 23bc095a3890c0ca334abf7ef67d1c8af4c22c12832bcc738015e868d54fe9d7
+F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
-F autoconf/tea/configure.ac d22326594f005a493a7857cb4ad2496b91480101be731d7f0541bb8d7eba22a2
+F autoconf/tea/configure.ac.in da18360dfdeac7414fa8deb549f3d65aeca0ae1150ff1a8b902019b39ce019a4
 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in 55aec3c6d7e9a1de9b8d2fdc9c27fd055da3ac3a51b572195e2ae7300bcfd3a2
@@ -47,10 +47,10 @@ F autosetup/cc-db.tcl 6e0ed90146197a5a05b245e649975c07c548e30926b218ca3e1d4dc034
 F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795facf7360
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
-F autosetup/jimsh0.c 5a74bdbf43c52289e3f482f3b9578db4bd657e88e8fe04b16c564d9fb710540a
+F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 9adf1539673cef15bff862d9360b479e6920cc2c0d85de707b0ba31c04ce4531
-F autosetup/sqlite-config.tcl 00af5b9d94d580367bf01984b86397e8d35b74090427def9591a54ded0e1a287
+F autosetup/proj.tcl 42119a2e899e319b92f3159952b7ef7219c82cb45eeb636aaf8d909def8150f8
+F autosetup/sqlite-config.tcl e1d65cc632e1de94ff39618ac82b649f2062f674ca36dae78ab3573cab096761
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -619,7 +619,7 @@ F ext/session/sqlite3session.c 52a680dbb03c4734748b215d95987fb4d95ab23baaf053a01
 F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b
 F ext/session/test_session.c 12e0a2c15fd60f92da4bb29c697c9177ff0c0dbcdc5129a54c47e999f147937a
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 47f121d057c08ba49443c06c1c51ba2572e3d5d28a06c968cf0b2ccd5878c3d3
+F ext/wasm/GNUmakefile 2b19c10968295f50ebd1c97c33bfb9038bda8e42fe3be9fb0eed8ae634d45742
 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
 F ext/wasm/README.md b89605f65661cf35bf034ff6d43e448cc169b8017fc105d498e33b81218b482c
 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@ -677,10 +677,10 @@ F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea
 F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1
 F ext/wasm/fiddle/index.html c79b1741cbeba78f88af0a84cf5ec7de87a909a6a8d10a369b1f4824c66c2088
 F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf188f024b3730
-F ext/wasm/index.html 10ff3ad190aadccb713109fa55a38e5c1f3c2a8cf05cd31783745bab3f184079
+F ext/wasm/index.html e4bbffdb3d40eff12b3f9c7abedef91787e2935620b7f8d40f2c774b80ad8fa9
 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
 F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8
-F ext/wasm/mkwasmbuilds.c d5885bacf2253bed913cdc7eb16b44f9c9e782133e10600652d1a78841c337af
+F ext/wasm/mkwasmbuilds.c baf6636e139e2c1e3b56e8dc26073ec80f6d14ae1876b023985315f43ccf312b
 F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337
 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
@@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 8cfe182232ac7bbc87530792db6f31c09f2a2f35e9887d0412978746efe42ea9
+F main.mk 44392e87994fd3595f64c8973784112b5ae570d9474deaab166218c600953f09
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -733,7 +733,7 @@ F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
 F src/expr.c 8705be31ee713aaa43c97d91399db09f16ee41b88250406eb99de6b47f550a98
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
-F src/func.c 0712a5b03fdfc8af0cda6d076bfe231b66388d3d5a28b46dc1a94b90d41cac6a
+F src/func.c 1ab83fd94f97af9797bdf1027169e3e19482fce06b090c3acceb4bf92ae452cd
 F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -743,7 +743,7 @@ F src/insert.c db8bfff30fd7f71812651df3ddf5d1624b9e19104b31e349cd9055bbc9d622c4
 F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
-F src/main.c 59bdd8d9bbdb3a746eaef14d611ddd5638aa18acef7c5e3271e815dbd215a1af
+F src/main.c 54e7f07a41e3424f5c2f39db9e96d5c33bbc1555362478d90700a39b694994e6
 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -2144,7 +2144,7 @@ F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a
-F tool/mkautoconfamal.sh 14d2144043c6455958012f92324f4ce7c90a261b5daa2f2c7509498468475f8d
+F tool/mkautoconfamal.sh c5e65fa1c922f2e3b3e4f6cd0331ec7d84bdef085f32cb1c46673cdf95ec8090
 F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x
 F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x
 F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
@@ -2190,12 +2190,12 @@ F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d
 F tool/split-sqlite3c.tcl 07e18a1d8cc3f6b3a4a1f3528e63c9b29a5c8a7bca0b8d394b231da464ce1247
 F tool/sqldiff.c 2a0987d183027c795ced13d6749061c1d2f38e24eddb428f56fa64c3a8f51e4b
 F tool/sqlite3_analyzer.c.in fc7735c499d226a49d843d8209b2543e4e5229eeb71a674c331323a2217b65b4
-F tool/sqlite3_rsync.c 9a1cca2ab1271c59b37a6493c15dc1bcd0ab9149197a9125926bc08dd26b83fb
+F tool/sqlite3_rsync.c f5e0b13cb159638a8556614dc13c9c3d457df69a7c426b9977fc3fb79130ce2d
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
 F tool/src-verify.c d00f93263aa2fa6ba0cba0106d95458e6effb94fdb5fc634f56834f90c05bbb4
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
-F tool/srctree-check.tcl 1f1f505835a4beca64c1751a7ebec5c41a1ddf22b1e80481345b95059eef6583
+F tool/srctree-check.tcl 9dfdaf37653df0b58a309c405cc115026468eee4c1ffad5f2af7428c531e554d
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/stripccomments.c dfe9cc03cf87728ac9836be30763f8aa52b82caca0780b3d3f3572e4643b01d3
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
@@ -2209,11 +2209,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9f28f6694f97d5ee0345b45f9bf81e3fdce0990ce32fb9bdbbaac079126a67c9
-R 84a73aa92675a2727074c491235ee053
-T +sym-major-release *
-T +sym-release *
-T +sym-version-3.49.0 *
+P 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70
+R 92095fa11b8ae347e8faff30eac0dc4a
+T *branch * rsync-delete-mode
+T *sym-rsync-delete-mode *
+T -sym-branch-3.49 *
 U drh
-Z 345e0ae7aa6443f7f8d274ba6f526736
+Z ea6b3d3575592e4e0539f9a05fdc7c9c
 # Remove this line to create a well-formed Fossil manifest.
@@ -1 +1 @@
-4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde
+9f88f73ce39e761810110dc158ec0e5a84401a80b247a5395a906a6a538d5fec
@@ -1571,7 +1571,7 @@ static void concatFuncCore(
  for(i=0; i<argc; i++){
    n += sqlite3_value_bytes(argv[i]);
  }
-  n += (argc-1)*nSep;
+  n += (argc-1)*(i64)nSep;
  z = sqlite3_malloc64(n+1);
  if( z==0 ){
    sqlite3_result_error_nomem(context);
@@ -767,7 +767,7 @@ int sqlite3_config(int op, ...){
 static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
 #ifndef SQLITE_OMIT_LOOKASIDE
  void *pStart;
-  sqlite3_int64 szAlloc = sz*(sqlite3_int64)cnt;
+  sqlite3_int64 szAlloc;
  int nBig;   /* Number of full-size slots */
  int nSm;    /* Number smaller LOOKASIDE_SMALL-byte slots */
 
@@ -786,7 +786,9 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
  */
  sz = ROUNDDOWN8(sz);  /* IMP: R-33038-09382 */
  if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0;
+  if( sz>65528 ) sz = 65528;
  if( cnt<0 ) cnt = 0;
+  szAlloc = (i64)sz*(i64)cnt;
  if( sz==0 || cnt==0 ){
    sz = 0;
    pStart = 0;
@@ -801,10 +803,10 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
 #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
  if( sz>=LOOKASIDE_SMALL*3 ){
    nBig = szAlloc/(3*LOOKASIDE_SMALL+sz);
-    nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
+    nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
  }else if( sz>=LOOKASIDE_SMALL*2 ){
    nBig = szAlloc/(LOOKASIDE_SMALL+sz);
-    nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
+    nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
  }else
 #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
  if( sz>0 ){
@@ -25,10 +25,14 @@ VERSION=`cat $TOP/VERSION`
 HASH=`cut -c1-10 $TOP/manifest.uuid`
 DATETIME=`grep '^D' $TOP/manifest | tr -c -d '[0-9]' | cut -c1-12`

-# Verify that the version number in the TEA autoconf file is correct.
-# Fail with an error if not.
+# Inject the current version into the TEA autoconf file.
 #
-if grep $VERSION $TOP/autoconf/tea/configure.ac
+sed -e "s/@VERSION@/$VERSION/" \
+    < $TOP/autoconf/tea/configure.ac.in \
+    > $TOP/autoconf/tea/configure.ac
+# And then verify that that worked...
+#
+if grep $VERSION $TOP/autoconf/tea/configure.ac > /dev/null
 then echo "TEA version number ok"
 else echo "TEA version number mismatch.  Should be $VERSION"; exit 1
 fi
@@ -91,10 +95,8 @@ cat <<EOF > tea/generic/tclsqlite3.c
 EOF
 cat  $TOP/src/tclsqlite.c           >> tea/generic/tclsqlite3.c

-sed "s/AC_INIT(\[sqlite\], .*)/AC_INIT([sqlite], [$VERSION])/" tea/configure.ac > tmp
-mv tmp tea/configure.ac
-
 cd tea
+rm -f configure.ac.in
 autoconf
 rm -rf autom4te.cache

@@ -35,6 +35,7 @@ static const char zUsage[] =
  "   --ssh PATH    Name of the SSH program used to reach the remote side\n"
  "   -v            Verbose.  Multiple v's for increasing output\n"
  "   --version     Show detailed version information\n"
+  "   --wal-only    Do not sync unless both databases are in WAL mode\n"
 ;

 typedef unsigned char u8;
@@ -57,6 +58,7 @@ struct SQLiteRsync {
  u8 isReplica;            /* True if running on the replica side */
  u8 iProtocol;            /* Protocol version number */
  u8 wrongEncoding;        /* ATTACH failed due to wrong encoding */
+  u8 bWalOnly;             /* Require WAL mode */
  sqlite3_uint64 nOut;     /* Bytes transmitted */
  sqlite3_uint64 nIn;      /* Bytes received */
  unsigned int nPage;      /* Total number of pages in the database */
@@ -1237,9 +1239,11 @@ static void originSide(SQLiteRsync *p){
    }
    hashRegister(p->db);
    runSql(p, "BEGIN");
-    runSqlReturnText(p, buf, "PRAGMA journal_mode");
-    if( sqlite3_stricmp(buf,"wal")!=0 ){
-      reportError(p, "Origin database is not in WAL mode");
+    if( p->bWalOnly ){
+      runSqlReturnText(p, buf, "PRAGMA journal_mode");
+      if( sqlite3_stricmp(buf,"wal")!=0 ){
+        reportError(p, "Origin database is not in WAL mode");
+      }
    }
    runSqlReturnUInt(p, &nPage, "PRAGMA page_count");
    runSqlReturnUInt(p, &szPg, "PRAGMA page_size");
@@ -1463,10 +1467,12 @@ static void replicaSide(SQLiteRsync *p){
          runSql(p, "SELECT * FROM replica.sqlite_schema");
        }
        runSql(p, "BEGIN IMMEDIATE");
-        runSqlReturnText(p, buf, "PRAGMA replica.journal_mode");
-        if( strcmp(buf, "wal")!=0 ){
-          reportError(p, "replica is not in WAL mode");
-          break;
+        if( p->bWalOnly ){
+          runSqlReturnText(p, buf, "PRAGMA replica.journal_mode");
+          if( strcmp(buf, "wal")!=0 ){
+            reportError(p, "replica is not in WAL mode");
+            break;
+          }
        }
        runSqlReturnUInt(p, &nRPage, "PRAGMA replica.page_count");
        runSqlReturnUInt(p, &szRPage, "PRAGMA replica.page_size");
@@ -1669,11 +1675,12 @@ int main(int argc, char const * const *argv){
  memset(&ctx, 0, sizeof(ctx));
  for(i=1; i<argc; i++){
    const char *z = argv[i];
-    if( strcmp(z,"--origin")==0 ){
+    if( z[0]=='-' && z[1]=='-' && z[2]!=0 ) z++;
+    if( strcmp(z,"-origin")==0 ){
      isOrigin = 1;
      continue;
    }
-    if( strcmp(z,"--replica")==0 ){
+    if( strcmp(z,"-replica")==0 ){
      isReplica = 1;
      continue;
    }
@@ -1681,15 +1688,15 @@ int main(int argc, char const * const *argv){
      ctx.eVerbose += numVs(z);
      continue;
    }
-    if( strcmp(z, "--ssh")==0 ){
+    if( strcmp(z, "-ssh")==0 ){
      zSsh = cli_opt_val;
      continue;
    }
-    if( strcmp(z, "--exe")==0 ){
+    if( strcmp(z, "-exe")==0 ){
      zExe = cli_opt_val;
      continue;
    }
-    if( strcmp(z, "--logfile")==0 ){
+    if( strcmp(z, "-logfile")==0 ){
      /* DEBUG OPTION:  --logfile FILENAME
      ** Cause all local output traffic to be duplicated in FILENAME */
      const char *zLog = cli_opt_val;
@@ -1701,37 +1708,41 @@ int main(int argc, char const * const *argv){
      }
      continue;
    }
-    if( strcmp(z, "--errorfile")==0 ){
+    if( strcmp(z, "-errorfile")==0 ){
      /* DEBUG OPTION:  --errorfile FILENAME
      ** Error messages on the local side are written into FILENAME */
      ctx.zErrFile = cli_opt_val;
      continue;
    }
-    if( strcmp(z, "--remote-errorfile")==0 ){
+    if( strcmp(z, "-remote-errorfile")==0 ){
      /* DEBUG OPTION:  --remote-errorfile FILENAME
      ** Error messages on the remote side are written into FILENAME on
      ** the remote side. */
      zRemoteErrFile = cli_opt_val;
      continue;
    }
+    if( strcmp(z, "-wal-only")==0 ){
+      ctx.bWalOnly = 1;
+      continue;
+    }
    if( strcmp(z, "-help")==0 || strcmp(z, "--help")==0
     || strcmp(z, "-?")==0
    ){
      printf("%s", zUsage);
      return 0;
    }
-    if( strcmp(z, "--version")==0 ){
+    if( strcmp(z, "-version")==0 ){
      printf("%s\n", sqlite3_sourceid());
      return 0;
    }
    if( z[0]=='-' ){
-      if( strcmp(z,"--commcheck")==0 ){  /* DEBUG ONLY */
+      if( strcmp(z,"-commcheck")==0 ){  /* DEBUG ONLY */
        /* Run a communication check with the remote side.  Do not attempt
        ** to exchange any database connection */
        ctx.bCommCheck = 1;
        continue;
      }
-      if( strcmp(z,"--arg-escape-check")==0 ){  /* DEBUG ONLY */
+      if( strcmp(z,"-arg-escape-check")==0 ){  /* DEBUG ONLY */
        /* Test the append_escaped_arg() routine by using it to render a
        ** copy of the input command-line, assuming all arguments except
        ** this one are filenames. */
@@ -1819,6 +1830,9 @@ int main(int argc, char const * const *argv){
      append_escaped_arg(pStr, "--errorfile", 0);
      append_escaped_arg(pStr, zRemoteErrFile, 1);
    }
+    if( ctx.bWalOnly ){
+      append_escaped_arg(pStr, "--wal-only", 0);
+    }
    append_escaped_arg(pStr, zDiv, 1);
    append_escaped_arg(pStr, file_tail(ctx.zReplica), 1);
    zCmd = sqlite3_str_finish(pStr);
@@ -5,7 +5,6 @@
 #
 #     *    Makefile.msc and autoconf/Makefile.msc agree
 #     *    src/ctime.tcl is consistent with tool/mkctimec.tcl
-#     *    VERSION agrees with autoconf/tea/configure.ac
 #     *    src/pragma.h agrees with tool/mkpragmatab.tcl
 #
 # Other tests might be added later.  
@@ -36,21 +35,6 @@ set TCLSH [info nameofexe]
 #
 set NERR 0

-######################### autoconf/tea/configure.ac ###########################
-
-set confac [readfile $ROOT/autoconf/tea/configure.ac]
-set vers [readfile $ROOT/VERSION]
-set pattern {AC_INIT([sqlite],[}
-append pattern [string trim $vers]
-append pattern {])}
-if {[string first $pattern $confac]<=0} {
-  puts "ERROR: ./autoconf/tea/configure.ac does not agree with ./VERSION"
-  puts "...... Fix: manually edit ./autoconf/tea/configure.ac and put the"
-  puts "......      correct version number in AC_INIT()"
-  incr NERR
-}
-unset confac
-
 ######################### autoconf/Makefile.msc ###############################

 set f1 [readfile $ROOT/autoconf/Makefile.msc]
Author	SHA1	Message	Date
drh	c493177e10	Allow sqlite3_rsync to work on non-WAL-mode databases, as long as the --wal-only flag is not used. FossilOrigin-Name: 9f88f73ce39e761810110dc158ec0e5a84401a80b247a5395a906a6a538d5fec	2025-05-01 16:02:02 +00:00
drh	3cd92ce875	Version 3.49.1 FossilOrigin-Name: 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70	2025-02-18 13:38:58 +00:00
stephan	963aa5bdbf	Add two generated files to the distclean rules of the autoconf bundle. FossilOrigin-Name: 57eceb361f0290b1326acf791565eb33267a10a5201aee34bdd2d1c93d647ff8	2025-02-17 16:15:54 +00:00
stephan	d3e44d4fa0	Pull build fix [edb8a78c023] and cleanup [0c085a5ab5] into branch-3.49. FossilOrigin-Name: f10e7ac65baec64a64b340f6e799d876ca5dac05d6615c900784a45fa8f71019	2025-02-17 16:07:39 +00:00
drh	03e2f9da23	Harden the SQLITE_DBCONFIG_LOOKASIDE interface against misuse. This is a simplification of [1ec4c308c76c69fb] appropriate for use in a patch release. FossilOrigin-Name: 78c4994c1c1ee1fdbee39ad611eba251a7bdb02d146331d43f178094c0d282e3	2025-02-17 14:27:33 +00:00
stephan	4dd457c3ce	Re-add the --disable-static-shell configure feature to the autoconf bundle. It got lost in the autoconf-to-autosetup port, as reported in [forum:cc219ee7044\|forum post cc219ee7044]. FossilOrigin-Name: e9035c6c89e719626a55c9fa889aacc87b0b256c09817294617b515e035c4a80	2025-02-16 18:16:42 +00:00
drh	63725a467f	Add a typecast to avoid 32-bit integer overflow in the concat_ws() function with an enormous separator values and many arguments. FossilOrigin-Name: cf6b162de534d4f5a5a02064f0618a84b70d0aa87a541cf149dacff34be2d3ab	2025-02-16 11:23:00 +00:00
drh	30c605e8ae	Remove the autoconf/tea/configure.ac check from tool/srctree-check.tcl since that file no longer exists. FossilOrigin-Name: ff879e8e7d0c153ddc241bd8425703b019cdc143b401b915a84ea8c78759b09b	2025-02-16 11:20:00 +00:00
stephan	ba96468b9b	Automate update of the library version number in autoconf/tea/configure.ac as part of the tool/mkautoconfamal.sh process. FossilOrigin-Name: d5c0be36fca18e15938ce9dc9c13bf79497d013623de85e23bb18e0940b56eba	2025-02-15 16:29:34 +00:00
stephan	8a61fe879d	DLL installation rules no longer create versioned symlinks on platforms where the DLL extension is '.dll' (cygwin, msys2, etc.), as suggested in [forum:28bb79638844c328\|forum post 28bb79638844c328]. FossilOrigin-Name: d94ad545776ad5cdbd637c1532e0be5f0364eee31484ede97ec4173b2b76f781	2025-02-15 16:24:52 +00:00
stephan	360abdca9c	A cleaner workaround for [6a21d6a2]. FossilOrigin-Name: 467804412230450c63ec47e8f903e58dce971a4752c242c3fa6b1249e535d2ac	2025-02-15 14:13:35 +00:00
stephan	f15a16e00a	More informative output for the pthread feature test. FossilOrigin-Name: adf042fba614e1fbe694cf111b7c8f5408eb64031b799870495748c51c7d458c	2025-02-14 18:18:27 +00:00
stephan	5e3ef1e524	Make failure to find pthreads support non-fatal unless --enable-threadsafe is specifically passed in. Build regression reported in [8e0fdb8c0d]. FossilOrigin-Name: f8843b82921621f24c81092debd3c9a5225b498efd47e494c70378342f06b060	2025-02-14 18:07:04 +00:00
stephan	b36434d0d6	Simplify the --help workaround introduced in [6a21d6a2ed]. FossilOrigin-Name: 03d0c19289b06a05a08091d23a253fa660c6d94a0c8d18742e68da5c37a00dcc	2025-02-14 17:53:52 +00:00
stephan	e4f445e587	Work around autosetup --help quirk described in [6a21d6a2ed62]. FossilOrigin-Name: 61726358c57348a9537c6a83abfabbdc25fc2f94a9a7ea31c8e97066bf822571	2025-02-14 17:25:50 +00:00
stephan	40c674e54a	ICU config support: add more details to error messages and correct a typo which would cause a configure crash if --with-icu-config=X refered to a non-executable X. FossilOrigin-Name: 80311f0925962f952c0112a8241774cb151fca5263824f25b0c30d17c3a805bc	2025-02-14 16:43:41 +00:00
stephan	46701fcccf	When using the --out-implib build option, install the generated .dll.a file to PREFIX/lib. FossilOrigin-Name: 8e8037bafccdbde0aefba29a13fe6026488b0f17cfc1b4c1700d2aa3c974ecc4	2025-02-13 16:31:22 +00:00
stephan	613929c59f	Bring the 3.49 branch's configure-related files up to par with the current trunk. FossilOrigin-Name: 1cc8d16b636de128ca5e9c6cf7630fb323e2969aaac984ebee928b0fe690b84b	2025-02-13 14:45:47 +00:00
stephan	967a5e8b75	Rename a configure-internal function and fix handling of --dump-defines for the autoconf bundle. FossilOrigin-Name: 3f539d81576068f37fbd548cca384bc1ac3dfd9049354d128aea8050c694b2f7	2025-02-11 17:22:07 +00:00
stephan	26787f3538	Move the configure flags definition and handling into autosetup/sqlite-config.tcl to avoid duplication between auto.def and autoconf/auto.def while still giving us a way to filter the canonical-tree-only flags out of the autoconf build. FossilOrigin-Name: 5a964bf3d8311f79d812a93e76a00f8a2a62e73b737b27a1552f7169c93fc1e5	2025-02-11 17:13:24 +00:00
stephan	15e556f552	Adapt [https://fossil-scm.org/home/info/3bff7b92d6d \|Fossil SCM patch 3bff7b92d6d], applying -lrt for platforms which need it for one of {fdatasync, nanosleep}. FossilOrigin-Name: 77621fd141e7a673f4d3d109ecd21bd6710eaa6f59d9e6335a6c0d971bb8b0f4	2025-02-11 13:18:01 +00:00
stephan	75b9706776	Make the --out-implib support ([6092b0b86bf93a3d]) specifically opt-in because the feature check for it passes on some platforms where it is not recognized at link-time. FossilOrigin-Name: 8212f8ee45efa290e70a397a486e02f19d8efbb0e9e374eb908aafea1e30a37c	2025-02-11 13:15:28 +00:00
stephan	2c9a970eb8	configure: when dlopen() is not found, only fail fatally if --enable-loadable-module is explicitly provided, else warn instead. Based on discussion around [forum:2efe9c33bd9021ca\|forum post 2efe9c33bd9021ca]. Update proj-indented-notice to behave like its docs say it should when the -error flag is used. FossilOrigin-Name: 7db7eb223e0fe39a3ba00359eb3a4645db013511c823db24823b6bd904481aa1	2025-02-10 15:02:35 +00:00
stephan	ecf0462e8f	Update the 'clean' rules for autoconf/Makefile.in to account for [6092b0b8]. FossilOrigin-Name: 23d25ae267a5e265fa3dd36b0c4d1f0f89a87068df98799ea48faa2f2817048d	2025-02-09 05:37:46 +00:00
stephan	f10e7bcd1e	Apply [6092b0b8] to autoconf/Makefile.in. FossilOrigin-Name: 6c17e4b80cd5f7e37c02989878b19d3f85c897368c0bd67521dce7cee2b24f17	2025-02-09 05:32:53 +00:00
stephan	9f10d81707	configure: if the linker supports --out-implib, generate libsqlite3.X.a, where X is the platform's DLL file extension. Discussion in/around [forum:0c7fc097b2\|forum post 0c7fc097b2]. FossilOrigin-Name: 705a6d3e0e8e2044a541d89be79b1bad9a5a71b11f2f878e6d385ae735cc27ee	2025-02-09 04:40:54 +00:00
stephan	82afe06bb4	wasm: add some build-time validation to ensure that the problem fixed in [65798c09a00662a3] does not recur. Ensure that files generated via mkwasmbuilds.c have the generated makefile as a dependency. FossilOrigin-Name: 012b308b04e6a9e3acbb842317b01b4b91ac165b925918cf20c1f52d045a6ec0	2025-02-09 01:50:41 +00:00
stephan	3022685857	configure: when transfering ENABLE/OMIT flags from CFLAGS to OPT_FEATURE_FLAGS, also do the same for CPPFLAGS and remove those ENABLE/OMIT flags from CFLAGS/CPPFLAGS to mimic legacy build behavior. Strip ENABLE/OMIT flags from BUILD_CFLAGS but do not transfer those to OPT_FEATURE_FLAGS, also to mimic legacy behavior. This is the second part of a fix discussed at [forum:9801e54665afd728\|forum post 9801e54665afd728]. FossilOrigin-Name: dcb44da41f922b9d22731ef7ba7b084444396b206757825e6fcbc165bc73368b	2025-02-09 01:30:47 +00:00
stephan	6d3751ebd4	build: work around a report of (install -d DIR) failing in one environment if DIR already exists. FossilOrigin-Name: 4bc6fe30c967e4f15e2c154a1af5434bfecd89cab0e4d040a5bf68c8ce47a546	2025-02-07 19:15:37 +00:00
stephan	db109887e8	Mac-specific build fixes discussed in [forum:9dfd5b8fd525a5d7\|forum thread 9dfd5b8fd525a5d7]: rename dylib links and add legacy-compatibility versioning stamps to libsqlite3.dylib. FossilOrigin-Name: 4b073687ee98163faeac6c8626a3bca96331a354a249c6c0990649a459974b3f	2025-02-07 14:47:12 +00:00
stephan	97056a2a21	configure: change extension of static libraries from .lib to .a on msys/cygwin, as per discussion in [forum:02db2d4240\|forum post 02db2d4240]. Replace unidiomatic JS-style use of inner procs in autosetup/proj.tcl with TCL lambdas. FossilOrigin-Name: b7c84c04a4eb0575a44edc0abd5ea2bbe4dd07ab6241533fababeca6326f8159	2025-02-07 12:59:03 +00:00
stephan	53d352b5c2	Reorder a piece of ext/wasm/GNUmakefile to correct the timing of various var accesses. Fixes a problem [https://github.com/sqlite/sqlite-wasm/pull/99 \|reported in the downstream npm subproject] and explains the confusion in [4aa025a943a4024094b9] (which has been reverted). FossilOrigin-Name: de3d2e4caa8a645847a4ceb2c82f2f6ad485e16d8970316335fec041601b588b	2025-02-07 12:36:25 +00:00
stephan	aebe9962ab	Fix out-of-tree builds of the autoconf bundle, as reported in [forum:a0cd0beb1baa6bef\|forum post a0cd0beb1baa6bef]. Bumd version number to 3.49.1. FossilOrigin-Name: 37dbacde3e18bb1984e301302118a6879006356fafc95882373feacbd5768cb9	2025-02-07 11:18:43 +00:00
stephan	23b10e9ff3	Fix a dependencies/order-of-operations bug in ext/wasm/GNUmakefile which causes creation of files filtered via c-pp to fail if the ext/wasm/jswasm dir did not exist beforehand. FossilOrigin-Name: 44d7ad8ff8751c8efde3a9733e18a5f3244a38dca610adb652355e8c44457ac8	2025-02-06 13:35:35 +00:00
@@ -1 +1 @@
 .49.0
 .49.1