pkgs/curl/patches/0101-curl-7.21.1-multilib.patch

   1  curl-config.in |   22 ++++------------------
   2  libcurl.pc.in  |    1 +
   3  2 files changed, 5 insertions(+), 18 deletions(-)
   4
   5 diff --git a/curl-config.in b/curl-config.in
   6 index ebda129..b404827 100644
   7 --- a/curl-config.in
   8 +++ b/curl-config.in
   9 @@ -43,7 +43,6 @@ Available values for OPTION include:
  10    --libs      library linking information
  11    --prefix    curl install prefix
  12    --protocols newline separated list of enabled protocols
  13 -  --static-libs static libcurl library linking information
  14    --version   output version information
  15    --vernum    output the version information as a number (hexadecimal)
  16  EOF
  17 @@ -74,7 +73,7 @@ while test $# -gt 0; do
  18         ;;
  19
  20      --cc)
  21 -       echo "@CC@"
  22 +       echo "gcc"
  23         ;;
  24
  25      --prefix)
  26 @@ -136,25 +135,12 @@ while test $# -gt 0; do
  27                 ;;
  28
  29      --libs)
  30 -       if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
  31 -          CURLLIBDIR="-L@libdir@ "
  32 -       else
  33 -          CURLLIBDIR=""
  34 -       fi
  35 -       if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
  36 -         echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
  37 -       else
  38 -         echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
  39 -       fi
  40 -       ;;
  41 -
  42 -    --static-libs)
  43 -       echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
  44 +       pkg-config libcurl --libs
  45         ;;
  46
  47      --configure)
  48 -      echo @CONFIGURE_OPTIONS@
  49 -    ;;
  50 +       pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
  51 +       ;;
  52
  53      *)
  54          echo "unknown option: $1"
  55 --- a/libcurl.pc.in
  56 +++ b/libcurl.pc.in
  57 @@ -29,6 +29,7 @@ libdir=@libdir@
  58  includedir=@includedir@
  59  supported_protocols="@SUPPORT_PROTOCOLS@"
  60  supported_features="@SUPPORT_FEATURES@"
  61 +configure_options=@CONFIGURE_OPTIONS@
  62
  63  Name: libcurl
  64  URL: http://curl.haxx.se/