[FFmpeg-cvslog] Merge commit '8c893aa3cd5f2d73896c72af330dcbfe299fbc5a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 15 18:09:58 2018 -0300| [3c56d6734186336723150d3bcaf3405538710c53] | committer: James Almer

Merge commit '8c893aa3cd5f2d73896c72af330dcbfe299fbc5a'

* commit '8c893aa3cd5f2d73896c72af330dcbfe299fbc5a':
  configure: Drop unnecessary variables, shifts, and quotes in helper functions

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

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

 configure | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 5e38bdab17..dad19f0106 100755
--- a/configure
+++ b/configure
@@ -999,7 +999,7 @@ EOF
 
 check_insn(){
     log check_insn "$@"
-    check_inline_asm ${1}_inline "\"$2\""
+    check_inline_asm ${1}_inline "$2"
     echo "$2" | check_as && enable ${1}_external || disable ${1}_external
 }
 
@@ -1386,10 +1386,8 @@ require(){
     log require "$@"
     name_version="$1"
     name="${1%% *}"
-    headers="$2"
-    func="$3"
-    shift 3
-    check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not found"
+    shift
+    check_lib $name "$@" || die "ERROR: $name_version not found"
 }
 
 require_cpp(){
@@ -1403,16 +1401,13 @@ require_cpp(){
 require_header(){
     log require_header "$@"
     headers="$1"
-    shift
-    check_header "$headers" "$@" || die "ERROR: $headers not found"
+    check_header "$@" || die "ERROR: $headers not found"
 }
 
 require_cpp_condition(){
     log require_cpp_condition "$@"
-    header="$1"
     condition="$2"
-    shift 2
-    check_cpp_condition "$header" "$condition" "$@" || die "ERROR: $condition not satisfied"
+    check_cpp_condition "$@" || die "ERROR: $condition not satisfied"
 }
 
 require_pkg_config(){


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

diff --cc configure
index 5e38bdab17,f373698b6c..dad19f0106
--- a/configure
+++ b/configure
@@@ -978,28 -814,9 +978,28 @@@ void foo(void){ __asm__ volatile($code)
  EOF
  }
  
 +check_inline_asm_flags(){
 +    log check_inline_asm_flags "$@"
 +    name="$1"
 +    code="$2"
 +    flags=''
 +    shift 2
 +    while [ "$1" != "" ]; do
 +      append flags $1
 +      shift
 +    done;
 +    disable $name
 +    cat > $TMPC <<EOF
 +void foo(void){ __asm__ volatile($code); }
 +EOF
 +    log_file $TMPC
 +    check_cmd $cc $CPPFLAGS $CFLAGS $flags "$@" $CC_C $(cc_o $TMPO) $TMPC &&
 +    enable $name && add_cflags $flags && add_asflags $flags && add_ldflags $flags
 +}
 +
  check_insn(){
      log check_insn "$@"
-     check_inline_asm ${1}_inline "\"$2\""
+     check_inline_asm ${1}_inline "$2"
      echo "$2" | check_as && enable ${1}_external || disable ${1}_external
  }
  
@@@ -1386,20 -1116,10 +1386,18 @@@ require()
      log require "$@"
      name_version="$1"
      name="${1%% *}"
-     headers="$2"
-     func="$3"
-     shift 3
-     check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not found"
+     shift
+     check_lib $name "$@" || 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_header "$@"
      headers="$1"