diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-12-01 23:06:02 -0500 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-12-08 21:09:02 +0100 |
| commit | 19c20a0a1a46f61606fdc8f0eb6a4a59bac8b63f (patch) | |
| tree | c6e48b0ae1487439c02dbd626afceb112a36c483 | |
| parent | 4958f35a2ebc307049ff2104ffb944f5f457feb3 (diff) | |
| download | ffmpeg-19c20a0a1a46f61606fdc8f0eb6a4a59bac8b63f.tar.gz | |
configure: Move adding of compat objects out of libc detection
| -rwxr-xr-x | configure | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -3398,10 +3398,6 @@ elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then add_cppflags -U__STRICT_ANSI__ elif check_cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then libc_type=msvcrt - add_compat strtod.o strtod=avpriv_strtod - add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ - _snprintf=avpriv_snprintf \ - vsnprintf=avpriv_vsnprintf # The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to # 0x601 by default unless something else is set by the user. # This can easily lead to us detecting functions only present @@ -3413,11 +3409,22 @@ elif check_cpp_condition stddef.h "defined __KLIBC__"; then libc_type=klibc elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then libc_type=bionic - add_compat strtod.o strtod=avpriv_strtod fi test -n "$libc_type" && enable $libc_type +case $libc_type in + bionic) + add_compat strtod.o strtod=avpriv_strtod + ;; + msvcrt) + add_compat strtod.o strtod=avpriv_strtod + add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ + _snprintf=avpriv_snprintf \ + vsnprintf=avpriv_vsnprintf + ;; +esac + # hacks for compiler/libc/os combinations if enabled_all tms470 glibc; then |