merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'
[vuplus_openembedded] / packages / curl / files / pkgconfig_fix.patch
1 Index: curl-7.16.4/libcurl.pc.in
2 ===================================================================
3 --- curl-7.16.4.orig/libcurl.pc.in      2007-02-18 09:41:27.000000000 +0000
4 +++ curl-7.16.4/libcurl.pc.in   2008-03-18 11:42:43.000000000 +0000
5 @@ -33,6 +33,7 @@
6  URL: http://curl.haxx.se/
7  Description: Library to transfer files with ftp, http, etc.
8  Version: @VERSION@
9 -Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
10 -Libs.private: @LIBCURL_LIBS@ @LIBS@
11 +Requires.private: @GNUTLS_REQUIRED@
12 +Libs: -L${libdir} -lcurl
13 +Libs.private: -ldl -lz
14  Cflags: -I${includedir}
15 Index: curl-7.16.4/configure.ac
16 ===================================================================
17 --- curl-7.16.4.orig/configure.ac       2008-03-18 11:40:30.000000000 +0000
18 +++ curl-7.16.4/configure.ac    2008-03-18 11:42:06.000000000 +0000
19 @@ -1361,6 +1361,7 @@
20         AC_SUBST(USE_GNUTLS, [1])
21         GNUTLS_ENABLED=1
22         USE_GNUTLS="yes"
23 +       GNUTLS_REQUIRED="gnutls"
24         curl_ssl_msg="enabled (GnuTLS)"
25         ],
26         [
27 @@ -1387,6 +1388,8 @@
28  
29  fi dnl OPENSSL != 1
30  
31 +AC_SUBST(GNUTLS_REQUIRED)
32 +
33  dnl ----------------------------------------------------
34  dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
35  dnl ----------------------------------------------------