You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
72 lines
2.0 KiB
72 lines
2.0 KiB
curl-config.in | 16 +++------------- |
|
docs/curl-config.1 | 4 +++- |
|
libcurl.pc.in | 1 + |
|
3 files changed, 7 insertions(+), 14 deletions(-) |
|
|
|
diff --git a/curl-config.in b/curl-config.in |
|
index 150004d..95d0759 100644 |
|
--- a/curl-config.in |
|
+++ b/curl-config.in |
|
@@ -75,7 +75,7 @@ while test $# -gt 0; do |
|
;; |
|
|
|
--cc) |
|
- echo "@CC@" |
|
+ echo "gcc" |
|
;; |
|
|
|
--prefix) |
|
@@ -142,24 +142,14 @@ 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@REQUIRE_LIB_DEPS@" = "Xyes"; then |
|
- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ |
|
- else |
|
- echo ${CURLLIBDIR}-lcurl |
|
- fi |
|
+ pkg-config libcurl --libs |
|
;; |
|
|
|
--static-libs) |
|
- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ |
|
;; |
|
|
|
--configure) |
|
- echo @CONFIGURE_OPTIONS@ |
|
+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' |
|
;; |
|
|
|
*) |
|
diff --git a/docs/curl-config.1 b/docs/curl-config.1 |
|
index c4f4e2b..3e0ea60 100644 |
|
--- a/docs/curl-config.1 |
|
+++ b/docs/curl-config.1 |
|
@@ -65,7 +65,9 @@ be listed using uppercase and are separa |
|
one, or several protocols in the list. (Added in 7.13.0) |
|
.IP "--static-libs" |
|
Shows the complete set of libs and other linker options you will need in order |
|
-to link your application with libcurl statically. (Added in 7.17.1) |
|
+to 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) |
|
.IP "--version" |
|
Outputs version information about the installed libcurl. |
|
.IP "--vernum" |
|
diff --git a/libcurl.pc.in b/libcurl.pc.in |
|
index 2ba9c39..f8f8b00 100644 |
|
--- a/libcurl.pc.in |
|
+++ b/libcurl.pc.in |
|
@@ -29,6 +29,7 @@ libdir=@libdir@ |
|
includedir=@includedir@ |
|
supported_protocols="@SUPPORT_PROTOCOLS@" |
|
supported_features="@SUPPORT_FEATURES@" |
|
+configure_options=@CONFIGURE_OPTIONS@ |
|
|
|
Name: libcurl |
|
URL: http://curl.haxx.se/
|
|
|