From 3682d661f3b3a6fa7d9ef37968746cbaf1ede078 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 13 Aug 2014 00:36:54 -0700 Subject: curl: let configure find gnutls via pkg-config Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_7.37.1.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'meta') diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.37.1.bb index e51e06d522..4b7f9ec922 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 } -- cgit v1.2.3