In order to (partially) multi-arch-ify curl-config, remove all

Origin: vendor
Bug-Debian: https://bugs.debian.org/731998
Bug-Debian: https://bugs.debian.org/1075802
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2024-09-11

mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
header and library directories are architecture-dependent, but will always be
in the C compiler's default search path, so -I and -L options are not
necessary (and may be harmful in multi-arch environments.)

Gbp-Pq: Name 11_omit-directories-from-config.patch

diff --git a/curl-config.in b/curl-config.in
index 294e083ec7cbe0ff0c15c2792c0bc0b24e241f3c..4e37a0a078be531a9c2c5fc3a22fd81d3d86a9b9 100644 (file)
--- a/curl-config.in
+++ b/curl-config.in
@@ -26,11 +26,8 @@
 # shellcheck disable=SC2006
 
 prefix="@prefix@"
-# Used in @libdir@
 # shellcheck disable=SC2034
 exec_prefix=@exec_prefix@
-# shellcheck disable=SC2034
-includedir=@includedir@
 cppflag_curl_staticlib=@LIBCURL_PC_CFLAGS@
 
 usage()
@@ -147,19 +144,11 @@ while test "$#" -gt 0; do
     else
       CPPFLAG_CURL_STATICLIB=""
     fi
-    if test "X@includedir@" = "X/usr/include"; then
-      echo "${CPPFLAG_CURL_STATICLIB}"
-    else
-      echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-    fi
+    echo "${CPPFLAG_CURL_STATICLIB}"
     ;;
 
   --libs)
-    if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-      CURLLIBDIR="-L@libdir@ "
-    else
-      CURLLIBDIR=""
-    fi
+    CURLLIBDIR=""
     if test "X@ENABLE_SHARED@" = "Xno"; then
       echo "${CURLLIBDIR}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
     else
@@ -173,7 +162,7 @@ while test "$#" -gt 0; do
 
   --static-libs)
     if test "X@ENABLE_STATIC@" != "Xno" ; then
-      echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@
+      echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@
     else
       echo 'curl was built with static libraries disabled' >&2
       exit 1