From 084a32add3ae8f2976ff0c164b49170484a34bc4 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 21 Aug 2009 18:27:39 +0200
Subject: Don't try to use -rpath to support link-time library searching.

This is breaking the MacOS X build because -rpath is a supported
option, but it conflicts with others (namely
-mmacosx-version-min=10.4). So it's causing the Mac build to fail.
---
 configure | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configure b/configure
index 48a0202..97edc56 100755
--- a/configure
+++ b/configure
@@ -7039,8 +7039,6 @@ EOF
 # Ensure we can link to uninistalled libraries
 if linkerSupportsFlag -rpath-link "$outpath/lib"; then
     echo "QMAKE_LFLAGS    += -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp"
-elif linkerSupportsFlag -rpath "$outpath/lib"; then
-    echo "QMAKE_LFLAGS    += -Wl,-rpath,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp"
 fi
 
 if [ -n "$QT_CFLAGS_PSQL" ]; then
-- 
cgit v0.12