[oe-commits] Andre McCurdy : curl: let configure find gnutls via pkg-config

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 85b5ced3890973eee48955c4cd5336834dee3355
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=85b5ced3890973eee48955c4cd5336834dee3355

Author: Andre McCurdy <armccurdy at gmail.com>
Date:   Wed Aug 13 00:36:54 2014 -0700

curl: let configure find gnutls via pkg-config

Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-support/curl/curl_7.37.1.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.37.1.bb
index e51e06d..4b7f9ec 100644
--- a/meta/recipes-support/curl/curl_7.37.1.bb
+++ b/meta/recipes-support/curl/curl_7.37.1.bb
@@ -25,7 +25,7 @@ PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib"
 
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[ssl] = "--with-ssl,--without-ssl,openssl"
-PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../,--without-gnutls,gnutls"
+PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
 PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
 
 EXTRA_OECONF = "--without-libssh2 \
@@ -37,10 +37,6 @@ EXTRA_OECONF = "--without-libssh2 \
                 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
 "
 
-do_configure_prepend() {
-	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac
-}
-
 do_install_append() {
 	oe_multilib_header curl/curlbuild.h
 }