Merge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'

* commit 'bdc111a162094c14660d1e88839d103a4d79e42a':
  configure: Detect newer (>=4.1) versions of MinGW32

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

diff --cc configure
index 83f20ed,40d12e2..cb2156c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3850,12 -3415,9 +3850,13 @@@ probe_libc()
      # MinGW64 is backwards compatible with MinGW32, so check for it first.
      elif check_${pfx}cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
          eval ${pfx}libc_type=mingw64
 +        if check_${pfx}cpp_condition _mingw.h "__MINGW64_VERSION_MAJOR < 3"; then
 +            add_compat msvcrt/snprintf.o
 +            add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
 +        fi
          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)" ||