[oe-commits] Andre McCurdy : gnutls: control zlib support via PACKAGECONFIG

[git at git.openembedded.org]

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

Author: Andre McCurdy <armccurdy at gmail.com>
Date:   Wed May 27 11:48:50 2015 -0700

gnutls: control zlib support via PACKAGECONFIG

Remains enabled by default, no functional change.

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

---

 meta/recipes-support/gnutls/gnutls.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 87f275a..e9b138a 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -1,7 +1,7 @@
 SUMMARY = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib nettle"
+DEPENDS = "nettle"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
@@ -34,8 +34,9 @@ do_configure_prepend() {
 	done
 }
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "zlib"
 PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers"
+PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib"
 
 PACKAGES =+ "${PN}-openssl ${PN}-xx"