summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-12-02 17:48:19 -0300
committerPeter Korsgaard <peter@korsgaard.com>2015-12-03 22:37:57 +0100
commit796ab5f36e3f66e83c17c373820f83b4abfe4e45 (patch)
tree6551d4bc79afe758777306fb5a32de9909bd0980
parent43e894d2cf3a0ca3b86cdb6a28fd8fd3e01e0007 (diff)
downloadbuildroot-796ab5f36e3f66e83c17c373820f83b4abfe4e45.tar.gz
buildroot-796ab5f36e3f66e83c17c373820f83b4abfe4e45.zip
wireshark: add optional gnutls support
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/wireshark/wireshark.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index cc9fb415b3..0bc780172c 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -22,7 +22,6 @@ WIRESHARK_CONF_OPTS = \
--without-krb5 \
--disable-usr-local \
--enable-static=no \
- --with-gnutls=no \
--with-libsmi=no \
--with-lua=no \
--includedir=$(STAGING_DIR)/usr/include
@@ -63,6 +62,13 @@ else
WIREHARK_CONF_OPTS += --without-c-ares
endif
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+WIRESHARK_CONF_OPTS += --with-gnutls=yes
+WIRESHARK_DEPENDENCIES += gnutls
+else
+WIRESHARK_CONF_OPTS += --with-gnutls=no
+endif
+
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
WIRESHARK_CONF_OPTS += --with-gcrypt=yes
OpenPOWER on IntegriCloud