[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4511/8267] libgcrypt.inc: Add PACKAGECONFIG for 'capabilities'

[Emmanuele Bassi <ebassi src gnome org>]

commit 621d78241570a655a32156c4dd25d94bc8a8b7d8
Author: Nathan Rossi <nathan nathanrossi com>
Date:   Mon Jan 30 17:47:45 2017 +1000

    libgcrypt.inc: Add PACKAGECONFIG for 'capabilities'
    
    Add PACKAGECONFIG options for 'capabilities' which enables the libcap
    dependency.
    
    (From OE-Core rev: a7dfe49a1236b0eb1cebcfe490bb0da68e3252a0)
    
    Signed-off-by: Nathan Rossi <nathan nathanrossi com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-support/libgcrypt/libgcrypt.inc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index c8a4862..84c1cc0 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -12,7 +12,7 @@ LICENSE_dumpsexp-dev = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
 
-DEPENDS = "libgpg-error libcap"
+DEPENDS = "libgpg-error"
 
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html";
 SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
@@ -26,7 +26,10 @@ BINCONFIG = "${bindir}/libgcrypt-config"
 
 inherit autotools texinfo binconfig-disabled pkgconfig
 
-EXTRA_OECONF = "--disable-asm --with-capabilities"
+EXTRA_OECONF = "--disable-asm"
+
+PACKAGECONFIG ??= "capabilities"
+PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap"
 
 do_configure_prepend () {
        # Else this could be used in preference to the one in aclocal-copy