[Scummvm-cvs-logs] SF.net SVN: scummvm:[39643] scummvm/branches/branch-0-13-0/configure

[dhewg at users.sourceforge.net]

Revision: 39643
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39643&view=rev
Author:   dhewg
Date:     2009-03-23 20:26:41 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
Backport of r39634: Fix compiler detection if CXX is preset to a working compiler but contains a space

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/configure

Modified: scummvm/branches/branch-0-13-0/configure
===================================================================
--- scummvm/branches/branch-0-13-0/configure	2009-03-23 20:25:57 UTC (rev 39642)
+++ scummvm/branches/branch-0-13-0/configure	2009-03-23 20:26:41 UTC (rev 39643)
@@ -882,20 +882,26 @@
 # Determine the C++ compiler
 #
 echo_n "Looking for C++ compiler... "
-if test -n "$_host"; then
-	compilers="$CXX $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++ $_host-g++ $_host-c++"
+if test -n "$CXX" && test_compiler "$CXX"; then
+	# Use the compiler specified in CXX
+	echo $CXX
 else
-	compilers="$CXX g++ c++"
+	if test -n "$_host"; then
+		compilers="$_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++ $_host-g++ $_host-c++"
+	else
+		compilers="g++ c++"
+	fi
+
+	CXX=
+	for compiler in $compilers; do
+		if test_compiler $compiler; then
+			CXX=$compiler
+			echo $CXX
+			break
+		fi
+	done
 fi
 
-CXX=
-for compiler in $compilers; do
-	if test_compiler $compiler; then
-	CXX=$compiler
-	echo $CXX
-	break
-	fi
-done
 if test -z "$CXX"; then
 	echo "none found!"
 	exit 1


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