[FFmpeg-cvslog] Merge commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 12 00:38:09 2017 -0300| [e0f84c303db71b4d57dff84e13f868f3f7cf7b5a] | committer: James Almer

Merge commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c'

* commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c':
  configure: Miscellaneous small changes to helper functions

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0f84c303db71b4d57dff84e13f868f3f7cf7b5a
---

 configure | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 20e36066e2..c0f3706c05 100755
--- a/configure
+++ b/configure
@@ -639,13 +639,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
 }
 
@@ -678,17 +678,17 @@ enable_deep_weak(){
 }
 
 requested(){
-    test "${1#!}" = "$1" && op='=' || op=!=
+    test "${1#!}" = "$1" && op="=" || op="!="
     eval test "x\$${1#!}_requested" $op "xyes"
 }
 
 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"
 }
 
@@ -1081,6 +1081,7 @@ check_objcflags(){
 
 test_ldflags(){
     log test_ldflags "$@"
+    set -- $($ldflags_filter "$@")
     check_ld "cc" "$@" <<EOF
 int main(void){ return 0; }
 EOF
@@ -1390,14 +1391,14 @@ require_cpp(){
 }
 
 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


======================================================================

diff --cc configure
index 20e36066e2,4dfe24e39e..c0f3706c05
--- a/configure
+++ b/configure
@@@ -677,13 -551,8 +677,13 @@@ enable_deep_weak()
      done
  }
  
 +requested(){
-     test "${1#!}" = "$1" && op='=' || op=!=
++    test "${1#!}" = "$1" && op="=" || op="!="
 +    eval test "x\$${1#!}_requested" $op "xyes"
 +}
 +
  enabled(){
-     test "${1#!}" = "$1" && op='=' || op=!=
+     test "${1#!}" = "$1" && op="=" || op="!="
      eval test "x\$${1#!}" $op "xyes"
  }
  
@@@ -1081,7 -899,8 +1081,8 @@@ check_objcflags()
  
  test_ldflags(){
      log test_ldflags "$@"
+     set -- $($ldflags_filter "$@")
 -    check_ld "$@" <<EOF
 +    check_ld "cc" "$@" <<EOF
  int main(void){ return 0; }
  EOF
  }
@@@ -1381,16 -1125,8 +1382,16 @@@ require()
      check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not found"
  }
  
 +require_cpp(){
 +    name="$1"
 +    headers="$2"
 +    classes="$3"
 +    shift 3
 +    check_lib_cpp "$headers" "$classes" "$@" || die "ERROR: $name not found"
 +}
 +
  require_header(){
-     log require "$@"
+     log require_header "$@"
      headers="$1"
      shift
      check_header "$headers" "$@" || die "ERROR: $headers not found"