diff options
| author | Michael Smith <msmith@cbnco.com> | 2009-10-23 11:14:34 -0400 |
|---|---|---|
| committer | Michael Smith <msmith@cbnco.com> | 2009-10-25 16:28:15 -0400 |
| commit | 3b408bf7c83901c6fec4a1c6be0205cb22f251c1 (patch) | |
| tree | 3ef16a6771a121f42f658699fb0b60cdf1a22aac /recipes/curl/curl-common.inc | |
| parent | 388a34e02861a252887d4dd2756c3b1cc89db4cf (diff) | |
curl: support openssl in CURL_FEATURES.
Default is still gnutls.
Also switch to INC_PR.
Signed-off-by: Michael Smith <msmith@cbnco.com>
Diffstat (limited to 'recipes/curl/curl-common.inc')
| -rw-r--r-- | recipes/curl/curl-common.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc index ce4f5f2a8e..29af47ee8d 100644 --- a/recipes/curl/curl-common.inc +++ b/recipes/curl/curl-common.inc @@ -6,8 +6,10 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch;patch=1" S = "${WORKDIR}/curl-${PV}" +INC_PR = "r2" + CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" -# other allowed features: ipv6, ares +# other allowed features: ipv6, ares, openssl inherit autotools pkgconfig binconfig @@ -15,7 +17,6 @@ EXTRA_OECONF = " \ --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \ - --without-ssl \ " python __anonymous() { @@ -37,6 +38,11 @@ python __anonymous() { deps.append("gnutls") else: oeconf += " --without-gnutls" + if 'openssl' in f: + oeconf += " --with-ssl=${STAGING_LIBDIR}/../" + deps.append("openssl") + else: + oeconf += " --without-ssl" if 'ares' in f: oeconf += " --enable-ares" deps.append("c-ares") |