build: tidy up internal macro names for libcurl.pc

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
2024-08-09 17:45:46 +02:00 · 2024-08-09 17:45:46 +02:00 · d222dbe788
commit d222dbe788
parent f3b14e1b0c
11 changed files with 40 additions and 40 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1866,7 +1866,7 @@ if(NOT CURL_DISABLE_INSTALL)
  set(exec_prefix             "\${prefix}")
  set(includedir              "\${prefix}/include")
  set(LDFLAGS                 "${CMAKE_SHARED_LINKER_FLAGS}")
-  set(LIBCURL_LIBS            "")
+  set(LIBCURL_PC_LIBS_PRIVATE "")
  set(libdir                  "${CMAKE_INSTALL_PREFIX}/lib")

  # For processing full path libraries into -L and -l ld options,
@ -1908,7 +1908,7 @@ if(NOT CURL_DISABLE_INSTALL)
      endif()
    endif()
    if(_lib MATCHES "^-")
-      set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}")
+      set(LIBCURL_PC_LIBS_PRIVATE "${LIBCURL_PC_LIBS_PRIVATE} ${_lib}")
    elseif(_lib MATCHES ".*/.*")
      # This gets a bit more complex, because we want to specify the
      # directory separately, and only once per directory
@ -1918,15 +1918,15 @@ if(NOT CURL_DISABLE_INSTALL)
        list(FIND _libcurl_libs_dirs "${_libdir}" _libdir_index)
        if(_libdir_index LESS 0)
          list(APPEND _libcurl_libs_dirs "${_libdir}")
-          set(LIBCURL_LIBS "${LIBCURL_LIBS} -L${_libdir}")
+          set(LIBCURL_PC_LIBS_PRIVATE "${LIBCURL_PC_LIBS_PRIVATE} -L${_libdir}")
        endif()
        string(REGEX REPLACE "^lib" "" _libname "${_libname}")
-        set(LIBCURL_LIBS "${LIBCURL_LIBS} -l${_libname}")
+        set(LIBCURL_PC_LIBS_PRIVATE "${LIBCURL_PC_LIBS_PRIVATE} -l${_libname}")
      else()
-        set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}")
+        set(LIBCURL_PC_LIBS_PRIVATE "${LIBCURL_PC_LIBS_PRIVATE} ${_lib}")
      endif()
    else()
-      set(LIBCURL_LIBS "${LIBCURL_LIBS} -l${_lib}")
+      set(LIBCURL_PC_LIBS_PRIVATE "${LIBCURL_PC_LIBS_PRIVATE} -l${_lib}")
    endif()
  endforeach()

@ -1940,13 +1940,13 @@ if(NOT CURL_DISABLE_INSTALL)
  if(BUILD_SHARED_LIBS)
    set(ENABLE_SHARED          "yes")
    set(LIBCURL_PC_REQUIRES    "")
-    set(LIBCURL_NO_SHARED      "")
-    set(CPPFLAG_CURL_STATICLIB "")
+    set(LIBCURL_PC_LIBS        "")
+    set(LIBCURL_PC_CFLAGS      "")
  else()
    set(ENABLE_SHARED          "no")
    set(LIBCURL_PC_REQUIRES    "${LIBCURL_PC_REQUIRES_PRIVATE}")
-    set(LIBCURL_NO_SHARED      "${LIBCURL_LIBS}")
-    set(CPPFLAG_CURL_STATICLIB "${LIBCURL_PC_CFLAGS_PRIVATE}")
+    set(LIBCURL_PC_LIBS        "${LIBCURL_PC_LIBS_PRIVATE}")
+    set(LIBCURL_PC_CFLAGS      "${LIBCURL_PC_CFLAGS_PRIVATE}")
  endif()
  if(BUILD_STATIC_LIBS)
    set(ENABLE_STATIC "yes")
@ -1964,7 +1964,6 @@ if(NOT CURL_DISABLE_INSTALL)
  # Consumed variables:
  #   CC
  #   CONFIGURE_OPTIONS
-  #   CPPFLAG_CURL_STATICLIB
  #   CURLVERSION
  #   CURL_CA_BUNDLE
  #   ENABLE_SHARED
@ -1972,7 +1971,8 @@ if(NOT CURL_DISABLE_INSTALL)
  #   exec_prefix
  #   includedir
  #   LDFLAGS
-  #   LIBCURL_LIBS
+  #   LIBCURL_PC_CFLAGS
+  #   LIBCURL_PC_LIBS_PRIVATE
  #   libdir
  #   libext
  #   prefix
@ -1991,13 +1991,13 @@ if(NOT CURL_DISABLE_INSTALL)

  # Finally generate a pkg-config file matching this config
  # Consumed variables:
-  #   CPPFLAG_CURL_STATICLIB
  #   CURLVERSION
  #   exec_prefix
  #   includedir
-  #   LIBCURL_LIBS
-  #   LIBCURL_NO_SHARED
+  #   LIBCURL_PC_CFLAGS
  #   LIBCURL_PC_CFLAGS_PRIVATE
+  #   LIBCURL_PC_LIBS
+  #   LIBCURL_PC_LIBS_PRIVATE
  #   LIBCURL_PC_REQUIRES
  #   LIBCURL_PC_REQUIRES_PRIVATE
  #   libdir
--- a/configure.ac
+++ b/configure.ac
@ -494,11 +494,11 @@ AM_CONDITIONAL([USE_CPPFLAG_CURL_STATICLIB],
 LIBCURL_PC_CFLAGS_PRIVATE='-DCURL_STATICLIB'
 AC_SUBST(LIBCURL_PC_CFLAGS_PRIVATE)

-CPPFLAG_CURL_STATICLIB=
+LIBCURL_PC_CFLAGS=
 if test "x$xc_lt_build_static_only" = 'xyes'; then
-  CPPFLAG_CURL_STATICLIB="${LIBCURL_PC_CFLAGS_PRIVATE}"
+  LIBCURL_PC_CFLAGS="${LIBCURL_PC_CFLAGS_PRIVATE}"
 fi
-AC_SUBST([CPPFLAG_CURL_STATICLIB])
+AC_SUBST([LIBCURL_PC_CFLAGS])


 # Determine whether all dependent libraries must be specified when linking
@ -4812,9 +4812,9 @@ CURL_CONFIGURE_SYMBOL_HIDING
 dnl
 dnl All the library dependencies put into $LIB apply to libcurl only.
 dnl
-LIBCURL_LIBS="$LIBS$PTHREAD"
+LIBCURL_PC_LIBS_PRIVATE="$LIBS$PTHREAD"

-AC_SUBST(LIBCURL_LIBS)
+AC_SUBST(LIBCURL_PC_LIBS_PRIVATE)
 AC_SUBST(CURL_NETWORK_LIBS)
 AC_SUBST(CURL_NETWORK_AND_TIME_LIBS)

@ -4843,13 +4843,13 @@ AC_SUBST(LIBCURL_PC_REQUIRES_PRIVATE)
 dnl Merge pkg-config private fields into public ones when static-only
 if test "x$enable_shared" = "xno"; then
  LIBCURL_PC_REQUIRES=$LIBCURL_PC_REQUIRES_PRIVATE
-  LIBCURL_NO_SHARED=$LIBCURL_LIBS
+  LIBCURL_PC_LIBS=$LIBCURL_PC_LIBS_PRIVATE
 else
  LIBCURL_PC_REQUIRES=
-  LIBCURL_NO_SHARED=
+  LIBCURL_PC_LIBS=
 fi
 AC_SUBST(LIBCURL_PC_REQUIRES)
-AC_SUBST(LIBCURL_NO_SHARED)
+AC_SUBST(LIBCURL_PC_LIBS)

 rm $compilersh

@ -5139,7 +5139,7 @@ squeeze DEFS
 squeeze LDFLAGS
 squeeze LIBS

-squeeze LIBCURL_LIBS
+squeeze LIBCURL_PC_LIBS_PRIVATE
 squeeze CURL_NETWORK_LIBS
 squeeze CURL_NETWORK_AND_TIME_LIBS

--- a/curl-config.in
+++ b/curl-config.in
@ -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
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@ -51,7 +51,7 @@ LIBS = $(BLANK_AT_MAKETIME)

 # Dependencies
 if USE_EXPLICIT_LIB_DEPS
-LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@
+LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 else
 LDADD = $(LIBDIR)/libcurl.la
 endif
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -109,11 +109,11 @@ libcurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
 endif

 libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA)
-libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(CURL_LDFLAGS_LIB) $(LIBCURL_LIBS)
+libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(CURL_LDFLAGS_LIB) $(LIBCURL_PC_LIBS_PRIVATE)
 libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA)

 libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
-libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
+libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_PC_LIBS_PRIVATE)
 libcurlu_la_CFLAGS = $(AM_CFLAGS)

 CHECKSRC = $(CS_$(V))
--- a/libcurl.pc.in
+++ b/libcurl.pc.in
@ -35,7 +35,7 @@ Description: Library to transfer files with ftp, http, etc.
 Version: @CURLVERSION@
 Requires: @LIBCURL_PC_REQUIRES@
 Requires.private: @LIBCURL_PC_REQUIRES_PRIVATE@
-Libs: -L${libdir} -lcurl @LIBCURL_NO_SHARED@
-Libs.private: @LIBCURL_LIBS@
-Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
+Libs: -L${libdir} -lcurl @LIBCURL_PC_LIBS@
+Libs.private: @LIBCURL_PC_LIBS_PRIVATE@
+Cflags: -I${includedir} @LIBCURL_PC_CFLAGS@
 Cflags.private: @LIBCURL_PC_CFLAGS_PRIVATE@
--- a/packages/vms/build_libcurl_pc.com
+++ b/packages/vms/build_libcurl_pc.com
@ -178,7 +178,7 @@ $ then
 $    write pco "Version: ''curl_version'"
 $    goto pc_file_loop
 $ endif
-$ if f$locate("@LIBCURL_LIBS@", line_in) .lt line_in_len
+$ if f$locate("@LIBCURL_PC_LIBS_PRIVATE@", line_in) .lt line_in_len
 $ then
 $    if arch_name .eqs. "VAX"
 $    then
@ -188,7 +188,7 @@ $        write pco "Libs.private: -lssl -lcrypto -lgssapi -lz"
 $    endif
 $    goto pc_file_loop
 $ endif
-$ if f$locate("@CPPFLAG_CURL_STATICLIB@", line_in) .lt line_in_len
+$ if f$locate("@LIBCURL_PC_CFLAGS@", line_in) .lt line_in_len
 $ then
 $    write pco "Cflags: -I${includedir} -DCURL_STATICLIB"
 $    goto pc_file_loop
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -73,7 +73,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 LIBS = $(BLANK_AT_MAKETIME)

 if USE_EXPLICIT_LIB_DEPS
-curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
+curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 else
 curl_LDADD = $(top_builddir)/lib/libcurl.la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
 endif
--- a/tests/http/clients/Makefile.am
+++ b/tests/http/clients/Makefile.am
@ -52,7 +52,7 @@ LIBS = $(BLANK_AT_MAKETIME)

 # Dependencies
 if USE_EXPLICIT_LIB_DEPS
-LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@
+LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 else
 LDADD = $(LIBDIR)/libcurl.la
 endif
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@ -49,8 +49,8 @@ CLEANFILES = lib1521.c
 LIBS = $(BLANK_AT_MAKETIME)

 if USE_EXPLICIT_LIB_DEPS
-SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
-TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
+SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
+TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 else
 SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@
 TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@ -47,7 +47,7 @@ LIBS = $(BLANK_AT_MAKETIME)

 LDADD = $(top_builddir)/src/libcurltool.la   \
        $(top_builddir)/lib/libcurlu.la      \
-        @LDFLAGS@ @LIBCURL_LIBS@
+        @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@

 AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS