diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-12-02 17:48:15 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-12-03 22:34:55 +0100 |
| commit | 00be67d846963f2f2b9f7ccc25299d2fbfdecf58 (patch) | |
| tree | 1236e9232970cb638dd8a418145e56fbfe5c4aab | |
| parent | 96d667c46a3e384f7791012936dd268a9ae7da9f (diff) | |
| download | buildroot-00be67d846963f2f2b9f7ccc25299d2fbfdecf58.tar.gz buildroot-00be67d846963f2f2b9f7ccc25299d2fbfdecf58.zip | |
wireshark: enable GUI options
Enable gtk2, gtk3 & qt5 automatic GUI options.
gtk2 & qt5 only build-time tested, gtk3 runtime-tested with wayland.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/wireshark/wireshark.mk | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5d1d5f6448..9a8d3706d5 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -20,7 +20,6 @@ WIRESHARK_AUTORECONF = YES # wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup. # Work around it by pointing includedir at staging WIRESHARK_CONF_OPTS = \ - --disable-wireshark \ --without-krb5 \ --disable-usr-local \ --enable-static=no \ @@ -29,4 +28,33 @@ WIRESHARK_CONF_OPTS = \ --with-lua=no \ --includedir=$(STAGING_DIR)/usr/include +# wireshark GUI options +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +WIRESHARK_CONF_OPTS += --with-gtk3=yes +WIRESHARK_DEPENDENCIES += libgtk3 +else ifeq ($(BR2_PACKAGE_LIBGTK2),y) +WIRESHARK_CONF_OPTS += --with-gtk2=yes +WIRESHARK_DEPENDECIES += libgtk2 +else +WIRESHARK_CONF_OPTS += --with-gtk3=no --with-gtk2=no +endif + +# Qt4 needs accessibility, we don't support it +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +WIRESHARK_CONF_OPTS += --with-qt=5 +WIRESHARK_DEPENDENCIES += qt5base +# Seems it expects wrappers and passes a -qt=X parameter for version +WIRESHARK_MAKE_OPTS += \ + MOC="$(HOST_DIR)/usr/bin/moc" \ + RCC="$(HOST_DIR)/usr/bin/rcc" \ + UIC="$(HOST_DIR)/usr/bin/uic" +else +WIRESHARK_CONF_OPTS += --with-qt=no +endif + +# No GUI at all +ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),) +WIRESHARK_CONF_OPTS += --disable-wireshark +endif + $(eval $(autotools-package)) |
