[Scummvm-cvs-logs] SF.net SVN: scummvm:[48595] scummvm/trunk/configure

[salty-horse at users.sourceforge.net]

Revision: 48595
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48595&view=rev
Author:   salty-horse
Date:     2010-04-09 12:30:45 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
Future-proof gcc >= 4.3 test (Will break on version 5.0)

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-04-09 12:23:43 UTC (rev 48594)
+++ scummvm/trunk/configure	2010-04-09 12:30:45 UTC (rev 48595)
@@ -2370,7 +2370,8 @@
 		add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
 	fi;
 
-	if test "$_cxx_major" -ge "4" && test "$_cxx_minor" -ge "3" ; then
+	if test "$_cxx_major" -eq 4 && test "$_cxx_minor" -ge 3 || \
+	   test "$_cxx_major" -gt 4 ; then
 		CXXFLAGS="$CXXFLAGS -Wno-empty-body"
 	else
 		CXXFLAGS="$CXXFLAGS -Wconversion"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.