alsa-utils: fixup ncurses config script
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Wed, 17 Sep 2014 13:08:20 +0000 (10:08 -0300)
committerPeter Korsgaard <peter@korsgaard.com>
Wed, 17 Sep 2014 22:07:04 +0000 (00:07 +0200)
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

index 4536b07bd6dc32a7dc7dbb178812ff245e888bf4..2afd6f93c4fa76c8618e73106c9a648a11674acc 100644 (file)
@@ -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