aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-12-12 00:34:43 +0100
committerDiego Biurrun <diego@biurrun.de>2013-12-13 16:47:49 +0100
commitbdc111a162094c14660d1e88839d103a4d79e42a (patch)
treef25c570db96c225dbadcb0942b27dbb7572e5719 /configure
parenta1d7d5524799bd90bc5d12e8b3063238cc0c02dd (diff)
downloadffmpeg-bdc111a162094c14660d1e88839d103a4d79e42a.tar.gz
configure: Detect newer (>=4.1) versions of MinGW32
The MinGW32 project is deprecating its old version macros.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index ea3d8cacb4..40d12e2606 100755
--- a/configure
+++ b/configure
@@ -3416,7 +3416,8 @@ probe_libc(){
elif check_${pfx}cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
eval ${pfx}libc_type=mingw64
add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
- elif check_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
+ elif check_${pfx}cpp_condition _mingw.h "defined __MINGW_VERSION" ||
+ check_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
eval ${pfx}libc_type=mingw32
check_${pfx}cpp_condition _mingw.h "__MINGW32_MAJOR_VERSION > 3 || \
(__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||