summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-08-19 15:21:20 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-08-19 16:31:44 +0200
commit10b9b19ced20b50aab2205d36e53a9071e55f6cf (patch)
treee6098dc92b08eed1f8fa1ced13cb3288123d47bf
parent122927c3404348415ee5816a787b17d348b6407c (diff)
downloadptxdist-10b9b19ced20b50aab2205d36e53a9071e55f6cf.tar.gz
ptxdist-10b9b19ced20b50aab2205d36e53a9071e55f6cf.tar.xz
alsa-utils: cleanup ncurses handling
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/alsa-utils.in2
-rw-r--r--rules/alsa-utils.make8
2 files changed, 7 insertions, 3 deletions
diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
index 2a953f844..0cf9bca48 100644
--- a/rules/alsa-utils.in
+++ b/rules/alsa-utils.in
@@ -3,7 +3,7 @@
menuconfig ALSA_UTILS
tristate
prompt "alsa utils "
- select NCURSES
+ select NCURSES if ALSA_UTILS_ALSAMIXER
select ALSA_LIB
# alsa-utils fails with the salsa-lib
select ALSA_LIB_FULL
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index cfc6e82a0..2b1741f19 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -56,9 +56,13 @@ ALSA_UTILS_AUTOCONF := \
--disable-xmlto
ifdef PTXCONF_ALSA_UTILS_ALSAMIXER
-ALSA_UTILS_AUTOCONF += --enable-alsamixer
+ALSA_UTILS_AUTOCONF += \
+ --enable-alsamixer \
+ --with-curses=$(call ptx/ifdef,PTXCONF_NCURSES_WIDE_CHAR,ncursesw,ncurses)
else
-ALSA_UTILS_AUTOCONF += --disable-alsamixer
+ALSA_UTILS_AUTOCONF += \
+ --disable-alsamixer \
+ --without-curses
endif
# ----------------------------------------------------------------------------