xapp_xman: fix dependencies

xman needs libXaw, has optional Xprintutil support and doesn't have a
--disable-IPv6 option.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/x11r7/xapp_xman/Config.in b/package/x11r7/xapp_xman/Config.in
index af9525bf4031905a28be44535879a52b1d62cd34..4f4f067e311e52c604751511ea09ac719291afe8 100644 (file)
--- a/package/x11r7/xapp_xman/Config.in
+++ b/package/x11r7/xapp_xman/Config.in
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_XAPP_XMAN
        bool "xman"
+       select BR2_PACKAGE_XLIB_LIBXAW
        help
          Manual page display program for the X Window System

diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index e3f623e50396bb9135952e873beee07ebd66776f..2706d61a5fe55a7ecc2200cfbe8e70257ed4cf47 100644 (file)
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -7,11 +7,14 @@ XAPP_XMAN_VERSION:=1.0.3
 XAPP_XMAN_SOURCE:=xman-$(XAPP_XMAN_VERSION).tar.bz2
 XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAN_INSTALL_TARGET = YES
+XAPP_XMAN_DEPENDENCIES = xlib_libXaw
 
 XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
                ac_cv_file__etc_man_config=no \
                ac_cv_file__etc_manpath_config=no
 
-XAPP_XMAN_CONF_OPT = --disable-IPv6
+ifeq ($(BR2_PACKAGE_XLIB_LIBXPRINTUTIL),y)
+XAPP_XMAN_CONF_OPT += --enable-xprint
+endif
 
 $(eval $(call AUTOTARGETS))