From: stephan <stephan@noemail.net>
Date: Thu, 20 Feb 2025 16:47:12 +0000 (+0000)
Subject: Fix autoconf bundle to honor the --disable-static and --disable-shared flags, as... 
X-Git-Tag: version-3.49.2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b484242dbaed8b690b8c738bb826565f3f5eaeda;p=thirdparty%2Fsqlite.git

Fix autoconf bundle to honor the --disable-static and --disable-shared flags, as reported in [forum:ae5bd8a84b|forum post ae5bd8a84b]. Problem introduced in 3.49.0.

FossilOrigin-Name: e5ea86dccf0f4dccfcccb2402f4177777d86af9ebb93794a909ccad369299b68
---

diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index d494e9d1e0..8a9c2c7b3f 100644
--- a/autoconf/Makefile.in
+++ b/autoconf/Makefile.in
@@ -149,11 +149,15 @@ $(libsqlite3.SO): sqlite3.o
 	$(CC) -o $@  sqlite3.o $(LDFLAGS.shlib) \
 		$(LDFLAGS) $(LDFLAGS.libsqlite3) \
 		$(LDFLAGS.libsqlite3.os-specific) $(LDFLAGS.libsqlite3.soname)
-all: $(libsqlite3.SO)
+$(libsqlite3.SO)-1: $(libsqlite3.SO)
+$(libsqlite3.SO)-0:
+all: $(libsqlite3.SO)-$(ENABLE_LIB_SHARED)
 
 $(libsqlite3.LIB): sqlite3.o
 	$(AR) $(AR.flags) $@ sqlite3.o
-all: $(libsqlite3.LIB)
+$(libsqlite3.LIB)-1: $(libsqlite3.LIB)
+$(libsqlite3.LIB)-0:
+all: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC)
 
 install-so-1: $(install-dir.lib) $(libsqlite3.SO)
 	$(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)"
diff --git a/manifest b/manifest
index b7b274ec83..676a06d6d7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.49.1
-D 2025-02-18T13:38:58.435
+C Fix\sautoconf\sbundle\sto\shonor\sthe\s--disable-static\sand\s--disable-shared\sflags,\sas\sreported\sin\s[forum:ae5bd8a84b|forum\spost\sae5bd8a84b].\sProblem\sintroduced\sin\s3.49.0.
+D 2025-02-20T16:47:12.245
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.in 844bc155e1c02075821530b2b4d996ab3d162e647352bb6e2895f3d0e64ad988
+F autoconf/Makefile.in ed042ba44540e67e17b1e7bd787e8118a9d14664ba8049966ec9bc54a10676ce
 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
@@ -2209,10 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 57eceb361f0290b1326acf791565eb33267a10a5201aee34bdd2d1c93d647ff8
-R 75ce877abe8a04df5ba4cb86e46a277d
-T +sym-release *
-T +sym-version-3.49.1 *
-U drh
-Z ca30243dceef882d9114cf681397efb8
+P 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70
+Q +56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103
+R d77d93c334f93baa3d3dfa693f292a65
+U stephan
+Z cdb00f4981f10ad2bdaf60690340cf17
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f6dad3ea69..039f7ae6fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70
+e5ea86dccf0f4dccfcccb2402f4177777d86af9ebb93794a909ccad369299b68