Fix autoconf bundle to honor the --disable-static and --disable-shared flags, as...

FossilOrigin-Name: 56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103

diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index d494e9d1e05d47d94dc271125c14e0b37e98fbb8..8a9c2c7b3f17d882629caeb39f2b141212b98d49 100644 (file)
--- 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 dac984b02eb8f99dd0fb85ead5130ada73934c71..b3754afc40598f5d030b912091157d1a665c9c6b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sdo\snot\sbuild\sthe\s(untested/unsupported)\snode-for-node\sbuild\sby\sdefault,\sto\scut\sbuild\stime\sby\sabout\s15%.\sAdjacent\scleanups\sin\smkwasmbuilds.c.
-D 2025-02-20T05:39:18.599
+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:45:45.335
 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 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
@@ -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 e1f184889fef4603d61d306c8c0dc86df616290ccf73dbd871fa27bd99e5e5c9
-R 84806d4092a27a5838a354dffcfb957d
+P e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863
+R 34877b8b42b297ff0e60f31b146ccdd9
 U stephan
-Z 323bb73cbee281d90dd439bde340e242
+Z 1623c39947cf064dc746ab5f77cf216c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 891b7eaeca9b31daac39c197dffb717524f9317e..d46913efa2700918d00c1c0368ddd75d3703feb4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4539ebebd89840b76f5a0626393299100685a38f45546a0bf7a62e4df56f863
+56027220cc15b69cb98ba5360ffd3718c997e10d51e30eebeff14f0dc358d103