mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-11 16:30:23 +00:00
Code Issues Projects Releases Wiki Activity

curl: merged 7.16.4 from OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4069 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-03-19 16:36:15 +00:00
parent df498e4081
commit dc9026df7f
4 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/curl/files/pkgconfig_fix.patch
+35
View File
@@ -0,0 +1,35 @@
Index: curl-7.16.4/libcurl.pc.in
===================================================================
--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000
+++ curl-7.16.4/libcurl.pc.in 2008-03-18 11:42:43.000000000 +0000
@@ -33,6 +33,7 @@
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
Version: @VERSION@
-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
-Libs.private: @LIBCURL_LIBS@ @LIBS@
+Requires.private: @GNUTLS_REQUIRED@
+Libs: -L${libdir} -lcurl
+Libs.private: -ldl -lz
Cflags: -I${includedir}
Index: curl-7.16.4/configure.ac
===================================================================
--- curl-7.16.4.orig/configure.ac 2008-03-18 11:40:30.000000000 +0000
+++ curl-7.16.4/configure.ac 2008-03-18 11:42:06.000000000 +0000
@@ -1361,6 +1361,7 @@
AC_SUBST(USE_GNUTLS, [1])
GNUTLS_ENABLED=1
USE_GNUTLS="yes"
+ GNUTLS_REQUIRED="gnutls"
curl_ssl_msg="enabled (GnuTLS)"
],
[
@@ -1387,6 +1388,8 @@
fi dnl OPENSSL != 1
+AC_SUBST(GNUTLS_REQUIRED)
+
dnl ----------------------------------------------------
dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
dnl ----------------------------------------------------