From: stephan <stephan@noemail.net>
Date: Sun, 16 Feb 2025 18:14:05 +0000 (+0000)
Subject: Re-add the --disable-static-shell configure feature to the autoconf bundle. It got... 
X-Git-Tag: major-release~274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2d56ea4ea131ee09d0dbd09e96ba5d511d96ee0;p=thirdparty%2Fsqlite.git

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: 47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24
---

diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index d7cc0e946f..b186f498b9 100644
--- a/autoconf/Makefile.in
+++ b/autoconf/Makefile.in
@@ -202,12 +202,21 @@ install-lib: install-lib-$(ENABLE_LIB_STATIC)
 install: install-lib
 
 
-sqlite3$(T.exe): $(TOP)/shell.c $(TOP)/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 $@ \
-		$(TOP)/shell.c $(TOP)/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)
diff --git a/autoconf/auto.def b/autoconf/auto.def
index bb8710378f..099b52aff7 100644
--- a/autoconf/auto.def
+++ b/autoconf/auto.def
@@ -22,6 +22,7 @@ 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]
 
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index ccb114868c..4416372951 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -259,6 +259,10 @@ proc sqlite-config-bootstrap {buildMode} {
         linemacros           => {Enable #line macros in the amalgamation}
         dynlink-tools        => {Dynamically link libsqlite3 to certain tools which normally statically embed it}
       }
+      {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}
+      }
       {*} {
         dump-defines=0       => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)}
       }
diff --git a/manifest b/manifest
index afcb520cfa..8d78e7da63 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sautoconf/Makefile.msc\sfrom\stool/mkmsvcmin.tcl.
-D 2025-02-16T13:49:18.989
+C Re-add\sthe\s--disable-static-shell\sconfigure\sfeature\sto\sthe\sautoconf\sbundle.\sIt\sgot\slost\sin\sthe\sautoconf-to-autosetup\sport,\sas\sreported\sin\s[forum:cc219ee7044|forum\spost\scc219ee7044].
+D 2025-02-16T18:14:05.950
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -16,11 +16,11 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.in 5e5ab43450b27e7247a0066f0606c5471e72f935c59ac3ba40038e23ebce92d5
+F autoconf/Makefile.in 491e16a002c19263af3aeba857ca4619d2e8ad8550f6c9cea89ba0385fdd4344
 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
-F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1ffdb
+F autoconf/auto.def 3a318c4898024b35ed61a4876a42e3dcc313f93bd8486874d1ad498b88643d1a
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f
-F autosetup/sqlite-config.tcl 17b5417841c402dcf8f656749be6fcff651f3360c48afcdc01aad375fe414fec
+F autosetup/sqlite-config.tcl 671b79027b162b9d945367d288cf82a9f6c7bd834c7b6812a24084f9ecf763ea
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0cfb9e234e116741d01b65d0abf18210e495276319fb08ec6e40d3f2e698956d
-R 9c4f553142a0ea668666d37befbf6bf0
+P 9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b
+R 98921f713d8fbfbddc4ac85a3af675c9
 U stephan
-Z 4091a24d92e7409613201f686c9db113
+Z e6ed162aea3b5e30451735f568dc1c13
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d99bcbb45f..dbd9d9bc69 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b
+47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24