aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-10 11:52:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-10 11:52:51 +0100
commitf8d8d2e235f6b1b940195c7223cdf749b3ac127b (patch)
tree0449ce2e15a25bde3604aedf594584b1290c07a6 /configure
parent8e5a2989a387e809d7367167114d2f2a45649ffa (diff)
parent1a5fdf9519d7f4b9a1bdda623516c37744f569bd (diff)
downloadffmpeg-f8d8d2e235f6b1b940195c7223cdf749b3ac127b.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: Move log2 dependency declaration to a place it takes effect Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 2ac6a3b157..04120f0c17 100755
--- a/configure
+++ b/configure
@@ -1815,6 +1815,9 @@ fast_unaligned_if_any="ppc x86"
need_memalign="altivec neon sse"
+# system capabilities
+log2_deps="!libc_msvcrt"
+
symver_if_any="symver_asm_label symver_gnu_asm"
# subsystems
@@ -3894,7 +3897,6 @@ case $libc_type in
add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \
_snprintf=avpriv_snprintf \
vsnprintf=avpriv_vsnprintf
- disable log2
;;
esac