From: stephan <stephan@noemail.net>
Date: Sat, 22 Feb 2025 17:30:08 +0000 (+0000)
Subject: Replace --dll-basename=none with --dll-basename=default.
X-Git-Tag: major-release~242^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbdbf534a3d9ae1d4da728b3c3f2d3d6fdb39c72;p=thirdparty%2Fsqlite.git

Replace --dll-basename=none with --dll-basename=default.

FossilOrigin-Name: 35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 2a8a964c23..0b77e0a9ef 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -262,7 +262,7 @@ proc sqlite-config-bootstrap {buildMode} {
           => {Specifies the base name of the resulting DLL file, defaulting to a
               platform-depending name (libsqlite3 on most Unix-style platforms).
               If not provided, libsqlite3 is usually assumed but on some platforms
-              a platform-dependent default is used. Use "none" to explicitly
+              a platform-dependent default is used. Use "default" to explicitly
               disable platform-dependent defaults on platforms where "auto" is
               implicitly used if this flag is not provided.}
         # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2
@@ -1274,7 +1274,7 @@ proc sqlite-handle-mac-cversion {} {
 proc sqlite-handle-dll-basename {} {
   if {[proj-opt-was-provided dll-basename]} {
     set dn [join [opt-val dll-basename] ""]
-    if {$dn eq "none"} { set dn libsqlite3 }
+    if {$dn in {none default}} { set dn libsqlite3 }
   } else {
     set dn libsqlite3
   }
diff --git a/manifest b/manifest
index 1b7f04d52c..d459f96d0d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C On\sunix-on-windows\splatforms,\sif\seither\sof\s--out-implib\sor\s--dll-basename\sare\snot\sprovided,\sauto-enable\sthem.\sAdd\sthe\s'none'\sspecial\svalue\sto\sthose\sflags\sto\sspecifically\sdisable\sthe\senvironment-specific\shandling\sof\sthose\sflags.
-D 2025-02-22T16:31:16.755
+C Replace\s--dll-basename=none\swith\s--dll-basename=default.
+D 2025-02-22T17:30:08.875
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20
-F autosetup/sqlite-config.tcl f5ced060a400ab0758c560347466083ea3ea822db260b40c3266d62a9812313a
+F autosetup/sqlite-config.tcl 92766017fe7fd47a0079b5b1714ff9efaeb1af6fe8703af42c74dd56543797c9
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2210,8 +2210,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 906d27f7a645833595f02ddf05892703783d89116b1009f04e0b71679ff34a8b
-R 38c1112c07cd683cb8ec01f377bddc57
+P 486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274
+R c02b6d4df01e25663d70fb8eca066eef
 U stephan
-Z 51cfa32526ca2c68d3558aae78fd6a9a
+Z bf9a58df58c6b3fa7bf4b00e65c449d1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 01c0d0c3fc..307098be3a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-486400801a4540392c04d805a47df5249c4010b1a5fbac91900db6149374c274
+35b1c32f80b9aed04776508683a1828fd5777ee8bb0e42e593557ae3cca558e4