[Scummvm-cvs-logs] scummvm master -> b97a5dcfb2e71d358274e017e4f1fdca02db4fa7

[dhewg]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b97a5dcfb2 CONFIGURE: Fix cxx test linking for Android


Commit: b97a5dcfb2e71d358274e017e4f1fdca02db4fa7
    https://github.com/scummvm/scummvm/commit/b97a5dcfb2e71d358274e017e4f1fdca02db4fa7
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-06-15T10:09:50-07:00

Commit Message:
CONFIGURE: Fix cxx test linking for Android

Libraries are now properly detected by configure again.

Changed paths:
    configure



diff --git a/configure b/configure
index e7a4335..cb06643 100755
--- a/configure
+++ b/configure
@@ -2208,16 +2208,9 @@ fi
 #
 case $_backend in
 	android)
-		# ssp at this point so the cxxtests link
-		if test "$_debug_build" = yes; then
-			CXXFLAGS="$CXXFLAGS -fstack-protector"
-		else
-			CXXFLAGS="$CXXFLAGS -fno-stack-protector"
-		fi
+		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
 		LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc'
@@ -3178,6 +3171,13 @@ fi
 #
 case $_backend in
 	android)
+		# ssp at this point so the cxxtests link
+		if test "$_debug_build" = yes; then
+			CXXFLAGS="$CXXFLAGS -fstack-protector"
+		else
+			CXXFLAGS="$CXXFLAGS -fno-stack-protector"
+		fi
+
 		static_libs=''
 		system_libs=''
 		for lib in $LIBS; do