summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2016-07-12 10:02:51 -0300
committerGitHub <noreply@github.com>2016-07-12 10:02:51 -0300
commit265d04821a0349d598b3f334c1fa690ca4bd149a (patch)
treeaf0e732217b396e0d954bb748071dbbd42440f7c
parent7f9c82f28d8d1da1fa7ca8c2f5534ed0c41852ef (diff)
parent78b82d0fdcd2d1b0094fde088a414066f7bd3581 (diff)
Merge pull request #524 from ricardo0y/cross_compile_with_ncurses_config
Allow to override ncurses*-config path
-rw-r--r--configure.ac7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 0c399ca2..91420db1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,12 @@ fi
# HTOP_CHECK_SCRIPT(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART)
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_save_LDFLAGS="$LDFLAGS"
if test ! "x$htop_config_script" = x; then

© 2014-2024 Faster IT GmbH | imprint | privacy policy