romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:51:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: tidy up internal macro names for libcurl.pc

Browse source 
Rename internal macros to match their `libcurl.pc` metadata counterpart.
Also apply these to the `curl-config.in` template.

- `CPPFLAG_CURL_STATICLIB` -> `LIBCURL_PC_CFLAGS`
- `LIBCURL_LIBS`           -> `LIBCURL_PC_LIBS_PRIVATE`
- `LIBCURL_NO_SHARED`      -> `LIBCURL_PC_LIBS`

Closes #14476
This commit is contained in:
Viktor Szakats 2024-08-09 17:45:46 +02:00
parent f3b14e1b0c
commit d222dbe788
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
11 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
curl-config.in
View file

@ -31,7 +31,7 @@ prefix="@prefix@"
exec_prefix=@exec_prefix@
# shellcheck disable=SC2034
includedir=@includedir@
cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@
cppflag_curl_staticlib=@LIBCURL_PC_CFLAGS@
usage()
{
@ -161,7 +161,7 @@ while test "$#" -gt 0; do
CURLLIBDIR=""
fi
if test "X@ENABLE_SHARED@" = "Xno"; then
echo "${CURLLIBDIR}-lcurl @LIBCURL_LIBS@"
echo "${CURLLIBDIR}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
else
echo "${CURLLIBDIR}-lcurl"
fi
@ -173,7 +173,7 @@ while test "$#" -gt 0; do
--static-libs)
if test "X@ENABLE_STATIC@" != "Xno" ; then
echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_LIBS@
echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@
else
echo 'curl was built with static libraries disabled' >&2
exit 1