From: Martin Jansa <martin.jansa@gmail.com>
Date: Mon, 6 Aug 2012 11:57:04 +0000 (+0200)
Subject: curl: disable ldap/ldaps explicitly
X-Git-Tag: 2015-4~9640
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=666b67179d4492e4d950b94457ebf8cac6454f7d;p=openembedded-core.git

curl: disable ldap/ldaps explicitly

* openldap from meta-oe is autodetected and then libldap-2.4-2 runtime dependency added to curl and almost all meta-efl recipes

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index f04b4008d6..418e29ca8f 100644
--- a/meta/recipes-support/curl/curl_7.26.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
 DEPENDS = "zlib gnutls"
 DEPENDS_virtclass-native = "zlib-native openssl-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://pkgconfig_fix.patch"
@@ -20,11 +20,13 @@ inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --without-libssh2 \
-		--with-random=/dev/urandom \
-		--without-libidn \
-		--enable-crypto-auth \
+                --with-random=/dev/urandom \
+                --without-libidn \
+                --enable-crypto-auth \
+                --disable-ldap \
+                --disable-ldaps \
                 ${CURLGNUTLS} \
-		"
+                "
 
 CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
 CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl"