From c96b08867e8593b32cec0f3971f10adfcaf2276e Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 5 Feb 2025 09:31:04 +0100
Subject: [PATCH 1/2] prevent multilib conflicts on the curl-config script

---
 curl-config.in      | 23 +++++------------------
 docs/curl-config.md |  4 +++-
 libcurl.pc.in       |  1 +
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/curl-config.in b/curl-config.in
index 55184167b..324e0b740 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -74,7 +74,7 @@ while test "$#" -gt 0; do
     ;;
 
   --cc)
-    echo '@CC@'
+    echo 'gcc'
     ;;
 
   --prefix)
@@ -149,16 +149,7 @@ while test "$#" -gt 0; do
     ;;
 
   --libs)
-    if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
-      curllibdir="-L@libdir@ "
-    else
-      curllibdir=''
-    fi
-    if test 'X@ENABLE_SHARED@' = 'Xno'; then
-      echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
-    else
-      echo "${curllibdir}-lcurl"
-    fi
+    echo '-lcurl'
     ;;
 
   --ssl-backends)
@@ -166,16 +157,12 @@ while test "$#" -gt 0; do
     ;;
 
   --static-libs)
-    if test 'X@ENABLE_STATIC@' != 'Xno'; then
-      echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
-    else
-      echo 'curl was built with static libraries disabled' >&2
-      exit 1
-    fi
+    echo 'curl was built with static libraries disabled' >&2
+    exit 1
     ;;
 
   --configure)
-    echo @CONFIGURE_OPTIONS@
+    pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
     ;;
 
   *)
diff --git a/docs/curl-config.md b/docs/curl-config.md
index b1fcf33dc..b15feec8e 100644
--- a/docs/curl-config.md
+++ b/docs/curl-config.md
@@ -87,7 +87,9 @@ no, one or several names. If more than o
 ## `--static-libs`
 
 Shows the complete set of libs and other linker options you need in order to
-link your application with libcurl statically. (Added in 7.17.1)
+link your application with libcurl statically. Note that Fedora/RHEL libcurl
+packages do not provide any static libraries, thus cannot be linked statically.
+(Added in 7.17.1)
 
 ## `--version`
 
diff --git a/libcurl.pc.in b/libcurl.pc.in
index c0ba5244a..f3645e174 100644
--- a/libcurl.pc.in
+++ b/libcurl.pc.in
@@ -28,6 +28,7 @@ libdir=@libdir@
 includedir=@includedir@
 supported_protocols="@SUPPORT_PROTOCOLS@"
 supported_features="@SUPPORT_FEATURES@"
+configure_options=@CONFIGURE_OPTIONS@
 
 Name: libcurl
 URL: https://curl.se/
-- 
2.48.1