bmon: make ncurses dependency optional

bmon can be built without ncurses support (needs a small patch though),
so don't enforce it in kconfig.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-06-17 09:15:42 +02:00
parent 587863b039
commit 6533b1e362
3 changed files with 32 additions and 2 deletions

View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_BMON
bool "bmon"
depends on BR2_INET_IPV6
select BR2_PACKAGE_NCURSES
help
Linux bandwidth monitor

View File

@ -0,0 +1,26 @@
[PATCH] fix build without curses
bmon supports a --disable-curses configure option, but still #error
out if curses wasn't detected, even though the rest of the code is
written to work without curses support.
Fix it by removing the bogus #error line.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
include/bmon/config.h | 2 --
1 file changed, 2 deletions(-)
Index: bmon-2.1.0/include/bmon/config.h
===================================================================
--- bmon-2.1.0.orig/include/bmon/config.h
+++ bmon-2.1.0/include/bmon/config.h
@@ -118,8 +118,6 @@
# endif /* !HAVE_CURSES */
#elif defined HAVE_CURSES
# include <curses.h>
-#else
-# error "*** ERROR: Neither ncurses nor curses is present on your system. ***"
#endif /* HAVE_[N]CURSES */
#if defined HAVE_RRD

View File

@ -7,7 +7,12 @@
BMON_VERSION = 2.1.0
BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
BMON_SITE = http://distfiles.gentoo.org/distfiles
BMON_DEPENDENCIES = ncurses
ifeq ($(BR2_PACKAGE_NCURSES),y)
BMON_DEPENDENCIES += ncurses
else
BMON_CONF_OPT += --disable-curses
endif
ifneq ($(BR2_PREFER_STATIC_LIB),y)
# link dynamically unless explicitly requested otherwise