Merge pull request #524 from ricardo0y/cross_compile_with_ncurses_config

Allow to override ncurses*-config path
This commit is contained in:
Hisham Muhammad 2016-07-12 10:02:51 -03:00 committed by GitHub
commit 265d04821a
1 changed files with 6 additions and 1 deletions

View File

@ -152,7 +152,12 @@ fi
# HTOP_CHECK_SCRIPT(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART) # HTOP_CHECK_SCRIPT(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART)
m4_define([HTOP_CHECK_SCRIPT], m4_define([HTOP_CHECK_SCRIPT],
[ [
htop_config_script=$([$4] --libs 2> /dev/null) if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then
# to be used to set the path to ncurses*-config when cross-compiling
htop_config_script=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
else
htop_config_script=$([$4] --libs 2> /dev/null)
fi
htop_script_success=no htop_script_success=no
htop_save_LDFLAGS="$LDFLAGS" htop_save_LDFLAGS="$LDFLAGS"
if test ! "x$htop_config_script" = x; then if test ! "x$htop_config_script" = x; then