From a8360013249dbdbe831dbe4659c8e5745ef4b6db Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias <gustavo@zacarias.com.ar> Date: Wed, 17 Sep 2014 10:08:20 -0300 Subject: [PATCH] alsa-utils: fixup ncurses config script Point the build to the proper (which BTW was broken since it pointed to the wrong directory) ncurses config by using $(NCURSES_CONFIG_SCRIPTS) from the ncurses package directly. Also select the proper variant (widec/non-widec) in configure. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/alsa-utils/alsa-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 4536b07bd6..2afd6f93c4 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -14,11 +14,11 @@ ALSA_UTILS_DEPENDENCIES = host-gettext host-pkgconf alsa-lib \ $(if $(BR2_PACKAGE_NCURSES),ncurses) ALSA_UTILS_CONF_ENV = \ - ac_cv_prog_ncurses5_config=$(STAGING_DIR)/bin/ncurses5-config + ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) ALSA_UTILS_CONF_OPT = \ --disable-xmlto \ - --with-curses=ncurses + --with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses) ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y) ALSA_UTILS_CONF_OPT += --disable-alsamixer --disable-alsatest