diff options
author | Diego Biurrun <diego@biurrun.de> | 2017-10-20 20:58:12 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2017-11-02 10:55:47 +0100 |
commit | 61a17423d3711cb34a18b44e1ec2510c2f70a56c (patch) | |
tree | 2554e0ee1919e71e27b8958b4c57b0e99e25a91f | |
parent | 67c72f08a4707c18a67a4734660e3a23cc9488b6 (diff) | |
download | ffmpeg-streaming-61a17423d3711cb34a18b44e1ec2510c2f70a56c.zip ffmpeg-streaming-61a17423d3711cb34a18b44e1ec2510c2f70a56c.tar.gz |
configure: Miscellaneous small changes to helper functions
- Reuse sanitize_var_name() where appropriate
- Add some quotes to enabled()/disabled() to ease readability
- Fix logged names of some helper functions
- Filter LDFLAGS also in test_ldflags()
-rwxr-xr-x | configure | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -513,13 +513,13 @@ disable_weak(){ enable_sanitized(){ for var; do - enable $(echo "$var" | sed 's/[^A-Za-z0-9_]/_/g') + enable $(sanitize_var_name $var) done } disable_sanitized(){ for var; do - disable $(echo "$var" | sed 's/[^A-Za-z0-9_]/_/g') + disable $(sanitize_var_name $var) done } @@ -552,12 +552,12 @@ enable_deep_weak(){ } enabled(){ - test "${1#!}" = "$1" && op== || op=!= + test "${1#!}" = "$1" && op="=" || op="!=" eval test "x\$${1#!}" $op "xyes" } disabled(){ - test "${1#!}" = "$1" && op== || op=!= + test "${1#!}" = "$1" && op="=" || op="!=" eval test "x\$${1#!}" $op "xno" } @@ -899,6 +899,7 @@ check_objcflags(){ test_ldflags(){ log test_ldflags "$@" + set -- $($ldflags_filter "$@") check_ld "$@" <<EOF int main(void){ return 0; } EOF @@ -1125,14 +1126,14 @@ require(){ } require_header(){ - log require "$@" + log require_header "$@" headers="$1" shift check_header "$headers" "$@" || die "ERROR: $headers not found" } require_cpp_condition(){ - log require "$@" + log require_cpp_condition "$@" header="$1" condition="$2" shift 2 |