Merge commit '5800ba0d'

* commit '5800ba0d':
  configure: disable cpunop if the check fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

configure

@@ -4257,7 +4257,7 @@ EOF
         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