Commit 43e894d2 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

wireshark: gcrypt support is optional 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent c27a2540

package/wireshark/Config.in

+0 −1
Original line number Diff line number Diff line 
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

package/wireshark/wireshark.mk

+9 −2
Original line number Diff line number Diff line
@@ -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