From 2cfa74d7b88f51963847526c352a0bf37da9b70f Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 13 Apr 2006 13:29:00 +0000
Subject: [PATCH] Fixed bug #192

The change made to sdl-config.in on March 18 (rev 11, see
http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/sdl-config.in), broke static linking
under Mac OS X for unix style build systems. In other words, "sdl-config
--static-libs" no longer produces the correct output, as it is missing the
required -framework switches.

The attached patch fixes this.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401631
---
 configure.in | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 7b538f60e..5bf91e817 100644
--- a/configure.in
+++ b/configure.in
@@ -2315,6 +2315,13 @@ case "$host" in
         # just the OS X kernel sans upper layers like Carbon and Cocoa.
         # Next line is broken, and a few files below require Mac OS X (full)
         ARCH=macosx
+
+        # HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point is 
+        # -lm which is not needed under Mac OS X. But for some reasons it also
+        # tends to contain spurious -L switches, which we don't want to use
+        # here or in sdl-config. Hence we reset it.
+        EXTRA_LDFLAGS=""
+
         CheckDummyVideo
         CheckDiskAudio
         CheckDummyAudio
@@ -2528,7 +2535,7 @@ case "$ARCH" in
       SDL_LIBS="$SDL_LIBS -Wl,-framework,OpenGL"
     fi
     # Evil hack to allow static linking on Mac OS X
-    SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a"
+    SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
     ;;
   *)
     SDL_STATIC_LIBS="$SDL_LIBS"