From b6f9fade5f9ca3b3dca1ace6239ba0ce532c47dc Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 4 Apr 2007 10:34:42 +0000 Subject: [PATCH] There are several subsystems that need IOKit linked in on Mac OS X, so handle cases where one or more of them are disabled. --- configure.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 49a290233..1d456a143 100644 --- a/configure.in +++ b/configure.in @@ -2462,8 +2462,8 @@ case "$host" in if test x$enable_joystick = xyes; then AC_DEFINE(SDL_JOYSTICK_IOKIT) SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit" have_joystick=yes + need_iokit_framework=yes fi # Set up files for the cdrom library if test x$enable_cdrom = xyes; then @@ -2483,6 +2483,7 @@ case "$host" in SDL_LIBS="-lSDLmain $SDL_LIBS" if test x$enable_video_cocoa = xyes; then EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa" + need_iokit_framework=yes fi if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then # The Cocoa backend still needs Carbon, and the YUV code QuickTime @@ -2493,6 +2494,10 @@ case "$host" in if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit" fi + # Some subsystems reference IOKit... + if test x$need_iokit_framework = xyes; then + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit" + fi ;; *-*-mint*) ARCH=mint