Correct unresolved @LIBS@ placeholder in sqlite3.pc.in.

FossilOrigin-Name: 63218898ed0a6d466a282f10819d51a7f480d8f12316b74ee8a3f402fcc4e927

diff --git a/main.mk b/main.mk
index b5866aa1b24ac42c4f8d6dd05aa9d16ebe097579..f60abb18ce78dad58daa2b033ee93567c64bafdc 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -329,8 +329,8 @@ T.link.shared = $(T.link) $(LDFLAGS.shobj)
 #
 LDFLAGS.libsqlite3 = \
   $(LDFLAGS.rpath) $(LDFLAGS.pthread) \
-  $(LDFLAGS.math) $(LDFLAGS.zlib) \
-  $(LDFLAGS.dlopen)
+  $(LDFLAGS.math)$(LDFLAGS.dlopen)
+# $(LDFLAGS.zlib)
 
 #
 # $(install-dir.XYZ) = dirs for installation.
@@ -1753,7 +1753,7 @@ sqlite3$(T.exe):  shell.c sqlite3.c
        $(T.link) -o $@ \
                shell.c sqlite3.c \
                $(CFLAGS.readline) $(SHELL_OPT) \
-               $(LDFLAGS.libsqlite3) $(LDFLAGS.readline) $(LDFLAGS.icu)
+               $(LDFLAGS.libsqlite3) $(LDFLAGS.zlib) $(LDFLAGS.readline) $(LDFLAGS.icu)
 
 #
 # Build sqlite3$(T.exe) by default except in wasi-sdk builds.  Yes, the

diff --git a/manifest b/manifest
index a76a4a24fc200c5e3340b915f09d274998e8f444..dc1fe7a4d3f0ea87145929ef7cb2499440d08c81 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\s(cc-with\s{-includes\sstdint.h})\swhen\schecking\sfor\sthe\svarious\sint\stypes\sbecause,\sdespite\sit\sbeing\sC99,\sit\sturns\sout\sthat\swe\sdo\sindeed\suse\sit\sif\sit's\savailable.
-D 2024-10-25T23:25:49.980
+C Correct\sunresolved\s@LIBS@\splaceholder\sin\ssqlite3.pc.in.
+D 2024-10-25T23:45:05.569
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -707,7 +707,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk af346a94426e107f4140f841a2875af97c025ae54fd00cd67a67f8672e90306c
+F main.mk ad39030eeac4f0b775ed458c484211c7519ddbe29375a88eea88c0c719af3bf5
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -717,7 +717,7 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc
-F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
+F sqlite3.pc.in b8b551878b9bdca1ff148f6e943d0e06206864c757eb07eef030343c27bb10bd
 F sqlite_cfg.h.in be1d075cf77134d53fdf5cc2c0919842e7e02a648c66a56e735af25ccdcaff91
 F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532
 F src/analyze.c 9a8b67239d899ac12289db5db3f5bfe7f7a0ad1277f80f87ead1d048085876eb
@@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 12498e55c0c689f43c78002fb850a58dda337feae51194b9cade7f5dff15e833
-R f62edb16995e026ea7ba97df69933436
+P 51a9278134b5b9093c92c7036cc91b823f30dd36f677f2335927854744225024
+R a314c5e68fb037432cac9fe3ae63e4a5
 U stephan
-Z 76068fe3afa72145f92179b17b78663b
+Z 16d047a5bb3a50c8e6fef3840bc7d061
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 07b0c351f9fd053bbb70be11f1ff9dcc1fdfb1d0..69b335266771044cabfd2896f04faccd8664c648 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51a9278134b5b9093c92c7036cc91b823f30dd36f677f2335927854744225024
+63218898ed0a6d466a282f10819d51a7f480d8f12316b74ee8a3f402fcc4e927

diff --git a/sqlite3.pc.in b/sqlite3.pc.in
index 3799671e613b34a4551d1010c13e334b89123ea1..52cda3065d44faa511609a34258dbf8ab7599fd7 100644 (file)
--- a/sqlite3.pc.in
+++ b/sqlite3.pc.in
@@ -9,5 +9,5 @@ Name: SQLite
 Description: SQL database engine
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lsqlite3
-Libs.private: @LIBS@
+Libs.private: @LDFLAGS_ZLIB@ @LDFLAGS_READLINE@
 Cflags: -I${includedir}