From 98e5904165859679cd78825bcccb52306ee3bb66 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 11 May 2020 20:50:02 +0100 Subject: libcurl.pc: Merge Libs.private into Libs for static-only builds A project being built entirely statically will call pkg-config with --static, which utilises the Libs.private field. Conversely it will not use --static when not being built entirely statically, even if there is only a static build of libcurl available. This will most likely cause the build to fail due to underlinking unless we merge the Libs fields. Consider that this is what the Meson build system does when it generates pkg-config files. I have also reflected this in the --libs argument of curl-config even though REQUIRE_LIB_DEPS always seems to be "yes" anyway. Closes #5373 --- curl-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'curl-config.in') diff --git a/curl-config.in b/curl-config.in index 0a7e0353f..86cf8b21c 100644 --- a/curl-config.in +++ b/curl-config.in @@ -160,7 +160,7 @@ while test $# -gt 0; do else CURLLIBDIR="" fi - if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then + if test "X@ENABLE_SHARED@" = "Xno" -o "X@REQUIRE_LIB_DEPS@" = "Xyes"; then echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ else echo ${CURLLIBDIR}-lcurl -- cgit v1.2.1