diff options
| author | James Le Cuirot <chewi@gentoo.org> | 2020-05-11 20:50:02 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-05-12 08:53:12 +0200 |
| commit | 98e5904165859679cd78825bcccb52306ee3bb66 (patch) | |
| tree | 29882f61577e640f4c304d30cf0ef40c8901949c /curl-config.in | |
| parent | ad6416986755e417c66e2c646d532561b445a5b5 (diff) | |
| download | curl-98e5904165859679cd78825bcccb52306ee3bb66.tar.gz | |
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
Diffstat (limited to 'curl-config.in')
| -rw-r--r-- | curl-config.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 |