diff --git a/package/mtr/mtr.hash b/package/mtr/mtr.hash index 7771e091e2..d6062ef08f 100644 --- a/package/mtr/mtr.hash +++ b/package/mtr/mtr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3a1ab330104ddee3135af3cfa567b9608001c5deecbf200c08b545ed6d7a4c8f mtr-0.93.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 ea036fdd45da488c241603f6ea59a06bbcfe6c26177ebd34fff54336a44494b8 mtr-0.94.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk index 0400a12021..07c58a1e93 100644 --- a/package/mtr/mtr.mk +++ b/package/mtr/mtr.mk @@ -4,10 +4,9 @@ # ################################################################################ -MTR_VERSION = 0.93 +MTR_VERSION = 0.94 MTR_SITE = $(call github,traviscross,mtr,v$(MTR_VERSION)) MTR_AUTORECONF = YES -MTR_CONF_OPTS = --without-gtk MTR_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBCAP),libcap) @@ -15,6 +14,20 @@ MTR_LICENSE = GPL-2.0 MTR_LICENSE_FILES = COPYING MTR_SELINUX_MODULES = netutils +ifeq ($(BR2_PACKAGE_JANSSON),y) +MTR_CONF_OPTS += --with-jansson +MTR_DEPENDENCIES += jansson +else +MTR_CONF_OPTS += --without-jansson +endif + +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +MTR_CONF_OPTS += --with-gtk +MTR_DEPENDENCIES += libgtk3 +else +MTR_CONF_OPTS += --without-gtk +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) MTR_CONF_OPTS += --with-ncurses MTR_DEPENDENCIES += ncurses