[FFmpeg-cvslog] configure: Detect newer (>=4.1) versions of MinGW32

Diego Biurrun git at videolan.org
Fri Dec 13 21:27:06 CET 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Dec 12 00:34:43 2013 +0100| [bdc111a162094c14660d1e88839d103a4d79e42a] | committer: Diego Biurrun

configure: Detect newer (>=4.1) versions of MinGW32

The MinGW32 project is deprecating its old version macros.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdc111a162094c14660d1e88839d103a4d79e42a
---

 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index ea3d8ca..40d12e2 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)" ||



More information about the ffmpeg-cvslog mailing list