[FFmpeg-cvslog] r24204 - trunk/configure

[ramiro]

Author: ramiro
Date: Mon Jul 12 00:31:41 2010
New Revision: 24204

Log:
mingw32: merge checks for mingw-w64 and mingw32-runtime >= 3.15 into one

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Jul 12 00:17:17 2010	(r24203)
+++ trunk/configure	Mon Jul 12 00:31:41 2010	(r24204)
@@ -2271,10 +2271,9 @@ case $target_os in
         objformat="win32"
         enable dos_paths
         check_cflags -fno-common
-        if ! check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR)"; then
-            check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
+        check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) \
+                                      || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
                 die "ERROR: MinGW runtime version must be >= 3.15."
-        fi
         ;;
     cygwin*)
         target_os=cygwin