[oe] [PATCH 2/2] curl: support openssl in CURL_FEATURES.

[Michael Smith]

Default is still gnutls.

Bump PR for curl-7.19.6.

Signed-off-by: Michael Smith <msmith at cbnco.com>
---
 recipes/curl/curl-common.inc |    8 ++++++--
 recipes/curl/curl_7.19.6.bb  |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
index ce4f5f2..06d539f 100644
--- a/recipes/curl/curl-common.inc
+++ b/recipes/curl/curl-common.inc
@@ -7,7 +7,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 S = "${WORKDIR}/curl-${PV}"
 
 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 +15,6 @@ EXTRA_OECONF = " \
                 --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
-                --without-ssl \
 		"
 
 python __anonymous() {
@@ -37,6 +36,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")
diff --git a/recipes/curl/curl_7.19.6.bb b/recipes/curl/curl_7.19.6.bb
index d5ca1bb..f67dcdb 100644
--- a/recipes/curl/curl_7.19.6.bb
+++ b/recipes/curl/curl_7.19.6.bb
@@ -2,3 +2,4 @@ require curl-common.inc
 require curl-target.inc
 
 SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
+PR = "r1"
-- 
1.6.3