There are several subsystems that need IOKit linked in on Mac OS X, s…

…o handle cases where one or more of them are disabled.
libsdl-org · Apr 4, 2007 · b6f9fad · b6f9fad
1 parent ccd44bd
commit b6f9fad
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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