From 68788e4e8e0ec547cf2da28d22fc9261c84688e1 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 10 Jan 2010 05:06:03 +0000
Subject: [PATCH] Reverted r5460 ... this was merged from 1.2, but was later
 reverted there.

---
 configure.in      | 12 ++++++------
 test/configure.in |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 2f16feda0..b5ea7f4a4 100644
--- a/configure.in
+++ b/configure.in
@@ -1639,7 +1639,7 @@ CheckMacGL()
         case "$host" in
             *-*-darwin*)
                 if test x$enable_video_cocoa = xyes; then
-                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework OpenGL"
+                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL"
                 fi
         esac
     fi
@@ -2652,7 +2652,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
             AC_DEFINE(SDL_HAPTIC_IOKIT)
             SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c"
             have_haptic=yes
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework ForceFeedback"
+            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback"
         fi
         # Set up files for the power library
         if test x$enable_power = xyes; then
@@ -2669,12 +2669,12 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
         # The Mac OS X platform requires special setup.
         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Cocoa"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
         # If audio is used, add the AudioUnit framework
         if test x$enable_audio = xyes; then
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework CoreAudio -framework AudioToolbox -framework AudioUnit"
+            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
         fi
         ;;
     *-riscos)
diff --git a/test/configure.in b/test/configure.in
index fc6ae5009..b24b6a6fe 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -28,7 +28,7 @@ case "$host" in
     *-*-darwin* )
         EXE=""
         MATHLIB=""
-        SYS_GL_LIBS="-framework,OpenGL"
+        SYS_GL_LIBS="-Wl,-framework,OpenGL"
         ;;
     *-*-aix*)
         EXE=""