[FFmpeg-cvslog] configure: Miscellaneous small changes to helper functions
Diego Biurrun
git at videolan.org
Sun Nov 12 05:38:35 EET 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Oct 20 20:58:12 2017 +0200| [61a17423d3711cb34a18b44e1ec2510c2f70a56c] | committer: Diego Biurrun
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()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61a17423d3711cb34a18b44e1ec2510c2f70a56c
---
configure | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 5981223e31..4dfe24e39e 100755
--- a/configure
+++ b/configure
@@ -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
More information about the ffmpeg-cvslog
mailing list