wireshark: gcrypt support is optional

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index f559c220cd33d66cb5dc3a4dd0a436888d0ba6cd..52b0f52e64cc2cfdce8b354d3152442703f48966 100644 (file)
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_WIRESHARK
        bool "wireshark"
        select BR2_PACKAGE_LIBPCAP
-       select BR2_PACKAGE_LIBGCRYPT
        select BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_MMU # fork(), glib2
        depends on BR2_USE_WCHAR # glib2

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 2940d2656eaca8531318d766b1f7dda8c49fd424..cc9fb415b350c425f453ab2d98e41fb1747355d0 100644 (file)
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -9,9 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license
 WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
+WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
 WIRESHARK_CONF_ENV = \
-       LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
        ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
 
 # patch touching configure.ac
@@ -64,6 +63,14 @@ else
 WIREHARK_CONF_OPTS += --without-c-ares
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+WIRESHARK_CONF_OPTS += --with-gcrypt=yes
+WIRESHARK_DEPENDENCIES += libgcrypt
+else
+WIRESHARK_CONF_OPTS += --with-gcrypt=no
+endif
+
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 WIRESHARK_CONF_OPTS += --with-libnl
 WIRESHARK_DEPENDENCIES += libnl