Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:25:08 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:25:13 +0000 (22:25 +0100)
* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
  
          check_yasm "movbe ecx, [5]" && enable yasm ||
              die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
 +        check_yasm "vextractf128 xmm0, ymm0, 0"      || disable avx_external avresample
 +        check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
 +        check_yasm "vfmadd132ps ymm0, ymm1, ymm2"    || disable fma3_external
          check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
-         check_yasm "CPU amdnop" && enable cpunop
+         check_yasm "CPU amdnop" || disable cpunop
      fi
  
      case "$cpu" in