# HG changeset patch # User Ryan C. Gordon # Date 1175682882 0 # Node ID 00959c391aa657aefd4fe58a93231f8dbc0e54c6 # Parent f8cc7c7ccf958812d4c96738dc8929507e91ec86 There are several subsystems that need IOKit linked in on Mac OS X, so handle cases where one or more of them are disabled. diff -r f8cc7c7ccf95 -r 00959c391aa6 configure.in --- a/configure.in Wed Apr 04 10:30:07 2007 +0000 +++ b/configure.in Wed Apr 04 10:34:42 2007 +0000 @@ -2462,8 +2462,8 @@ 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 @@ 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 @@ 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