This repository has been archived by the owner on Sep 8, 2020. It is now read-only.
Allow to override ncurses*-config path #524
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -147,7 +147,11 @@ 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 "$htop_[$1]_config_script"; then | |||
There was a problem hiding this comment.
please make the name of this variable all-uppercase (as in HTOP_[$1]_CONFIG_SCRIPT). the htop_* versions were meant to be "local" variables for the macro. Adding a short comment here explaining this was motivated by cross-compiling scenarios would also be welcome, for future maintenance.
This will be used when cross-compiling with ncurses*-config generated for the target, using constructs like HTOP_NCURSES_CONFIG_SCRIPT=/path/to/ncurses5-config Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
ricardo-martincoski
force-pushed
the
cross_compile_with_ncurses_config
branch
from
666f12f
to
78b82d0
Compare
| @@ -147,7 +147,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 | |||
There was a problem hiding this comment.
I used
m4_toupper($HTOP_[$1]CONFIG_SCRIPT)
because I think it is more readable, but I can change to
$HTOP[]m4_toupper($1)_CONFIG_SCRIPT
if you want
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will be used when cross-compiling with ncurses*-config generated for the
target, using constructs like
htop_ncurses_config_script=/path/to/ncurses5-config
Signed-off-by: Ricardo Martincoski ricardo.martincoski@gmail.com