From e489e9bc82823f1922a38f1b0805ac8537b1dc77 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 5 Mar 2010 17:31:32 +0100
Subject: fixed treatment of zlib on Mac when crossbuilding

Merge-request: 478
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 16c1fcd..369ace8 100755
--- a/configure
+++ b/configure
@@ -6324,7 +6324,7 @@ else
     QT_CONFIG="$QT_CONFIG freetype"
 fi
 
-if [ "x$PLATFORM_MAC" = "xyes" ]; then
+if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then
     #On Mac we implicitly link against libz, so we
     #never use the 3rdparty stuff.
     [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
-- 
cgit v0.12