Blame SOURCES/0101-curl-7.29.0-multilib.patch

239702
 curl-config.in     |   16 +++-------------
239702
 docs/curl-config.1 |    4 +++-
239702
 libcurl.pc.in      |    1 +
239702
 3 files changed, 7 insertions(+), 14 deletions(-)
239702
239702
diff --git a/curl-config.in b/curl-config.in
239702
index 150004d..95d0759 100644
239702
--- a/curl-config.in
239702
+++ b/curl-config.in
239702
@@ -75,7 +75,7 @@
239702
         ;;
239702
 
239702
     --cc)
239702
-        echo "@CC@"
239702
+        echo "gcc"
239702
         ;;
239702
 
239702
     --prefix)
239702
@@ -142,29 +142,14 @@
239702
         ;;
239702
 
239702
     --libs)
239702
-        if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
239702
-           CURLLIBDIR="-L@libdir@ "
239702
-        else
239702
-           CURLLIBDIR=""
239702
-        fi
239702
-        if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
239702
-          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
239702
-        else
239702
-          echo ${CURLLIBDIR}-lcurl
239702
-        fi
239702
+        echo -lcurl
239702
         ;;
239702
 
239702
     --static-libs)
239702
-        if test "X@ENABLE_STATIC@" != "Xno" ; then
239702
-          echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
239702
-        else
239702
-          echo "curl was built with static libraries disabled" >&2
239702
-          exit 1
239702
-        fi
239702
         ;;
239702
 
239702
     --configure)
239702
-        echo @CONFIGURE_OPTIONS@
239702
+        pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
239702
         ;;
239702
 
239702
     *)
239702
diff --git a/docs/curl-config.1 b/docs/curl-config.1
239702
index c4f4e2b..3e0ea60 100644
239702
--- a/docs/curl-config.1
239702
+++ b/docs/curl-config.1
239702
@@ -65,7 +65,9 @@ be listed using uppercase and are separa
239702
 one, or several protocols in the list. (Added in 7.13.0)
239702
 .IP "--static-libs"
239702
 Shows the complete set of libs and other linker options you will need in order
239702
-to link your application with libcurl statically. (Added in 7.17.1)
239702
+to link your application with libcurl statically. Note that Fedora/RHEL libcurl
239702
+packages do not provide any static libraries, thus cannot be linked statically.
239702
+(Added in 7.17.1)
239702
 .IP "--version"
239702
 Outputs version information about the installed libcurl.
239702
 .IP "--vernum"
239702
diff --git a/libcurl.pc.in b/libcurl.pc.in
239702
index 2ba9c39..f8f8b00 100644
239702
--- a/libcurl.pc.in
239702
+++ b/libcurl.pc.in
239702
@@ -29,6 +29,7 @@ libdir=@libdir@
239702
 includedir=@includedir@
239702
 supported_protocols="@SUPPORT_PROTOCOLS@"
239702
 supported_features="@SUPPORT_FEATURES@"
239702
+configure_options=@CONFIGURE_OPTIONS@
239702
 
239702
 Name: libcurl
239702
 URL: https://curl.haxx.se/
239702