[FFmpeg-cvslog] mingw32: merge checks for mingw-w64 and mingw32-runtime >= 3.15 into one

[Ramiro Polla]

ffmpeg | branch: release/0.6 | Ramiro Polla <ramiro.polla at gmail.com> | Sun Jul 11 22:31:41 2010 +0000| [77630b68e584b3493ae5691dad8f5346fa3fea15] | committer: Derek Buitenhuis

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

Originally committed as revision 24204 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit e26011d0f495de1148b8014995cbe923611b6b76)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

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

diff --git a/configure b/configure
index 4d0705b..0e72cb9 100755
--- a/configure
+++ b/configure
@@ -2230,10 +2230,9 @@ case $target_os in
         dlltool="${cross_prefix}dlltool"
         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