]>
Commit | Line | Data |
---|---|---|
6fa05abb MT |
1 | From 2a4754a3a7cf60ecc36d83cbe50b8c337cb87632 Mon Sep 17 00:00:00 2001 |
2 | From: Kamil Dudka <kdudka@redhat.com> | |
3 | Date: Fri, 12 Apr 2013 12:04:05 +0200 | |
4 | Subject: [PATCH] prevent multilib conflicts on the curl-config script | |
5 | ||
6 | --- | |
7 | curl-config.in | 21 +++------------------ | |
8 | docs/curl-config.1 | 4 +++- | |
9 | libcurl.pc.in | 1 + | |
10 | 3 files changed, 7 insertions(+), 19 deletions(-) | |
11 | ||
12 | diff --git a/curl-config.in b/curl-config.in | |
13 | index 150004d..95d0759 100644 | |
14 | --- a/curl-config.in | |
15 | +++ b/curl-config.in | |
16 | @@ -75,7 +75,7 @@ while test $# -gt 0; do | |
17 | ;; | |
18 | ||
19 | --cc) | |
20 | - echo "@CC@" | |
21 | + echo "gcc" | |
22 | ;; | |
23 | ||
24 | --prefix) | |
25 | @@ -142,29 +142,14 @@ while test $# -gt 0; do | |
26 | ;; | |
27 | ||
28 | --libs) | |
29 | - if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then | |
30 | - CURLLIBDIR="-L@libdir@ " | |
31 | - else | |
32 | - CURLLIBDIR="" | |
33 | - fi | |
34 | - if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then | |
35 | - echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ | |
36 | - else | |
37 | - echo ${CURLLIBDIR}-lcurl | |
38 | - fi | |
39 | + pkg-config libcurl --libs | |
40 | ;; | |
41 | ||
42 | --static-libs) | |
43 | - if test "X@ENABLE_STATIC@" != "Xno" ; then | |
44 | - echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ | |
45 | - else | |
46 | - echo "curl was built with static libraries disabled" >&2 | |
47 | - exit 1 | |
48 | - fi | |
49 | ;; | |
50 | ||
51 | --configure) | |
52 | - echo @CONFIGURE_OPTIONS@ | |
53 | + pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' | |
54 | ;; | |
55 | ||
56 | *) | |
57 | diff --git a/docs/curl-config.1 b/docs/curl-config.1 | |
58 | index 14a9d2b..ffcc004 100644 | |
59 | --- a/docs/curl-config.1 | |
60 | +++ b/docs/curl-config.1 | |
61 | @@ -65,7 +65,9 @@ be listed using uppercase and are separated by newlines. There may be none, | |
62 | one, or several protocols in the list. (Added in 7.13.0) | |
63 | .IP "--static-libs" | |
64 | Shows the complete set of libs and other linker options you will need in order | |
65 | -to link your application with libcurl statically. (Added in 7.17.1) | |
66 | +to link your application with libcurl statically. Note that Fedora/RHEL libcurl | |
67 | +packages do not provide any static libraries, thus cannot be linked statically. | |
68 | +(Added in 7.17.1) | |
69 | .IP "--version" | |
70 | Outputs version information about the installed libcurl. | |
71 | .IP "--vernum" | |
72 | diff --git a/libcurl.pc.in b/libcurl.pc.in | |
73 | index 2ba9c39..f8f8b00 100644 | |
74 | --- a/libcurl.pc.in | |
75 | +++ b/libcurl.pc.in | |
76 | @@ -29,6 +29,7 @@ libdir=@libdir@ | |
77 | includedir=@includedir@ | |
78 | supported_protocols="@SUPPORT_PROTOCOLS@" | |
79 | supported_features="@SUPPORT_FEATURES@" | |
80 | +configure_options=@CONFIGURE_OPTIONS@ | |
81 | ||
82 | Name: libcurl | |
83 | URL: http://curl.haxx.se/ |