# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1175683156 0
# Node ID 4a010418f3b9392acd74bc2e06a32cf04ad59f56
# Parent  0975e24a3670c9e334e72328e321080a3b29c209
Merged r3009:3011 from branches/SDL-1.2: Skip subsystem on --disable-joysticks.

diff -r 0975e24a3670 -r 4a010418f3b9 configure.in
--- a/configure.in	Wed Apr 04 09:43:53 2007 +0000
+++ b/configure.in	Wed Apr 04 10:39:16 2007 +0000
@@ -196,7 +196,6 @@
 SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c"
 SOURCES="$SOURCES $srcdir/src/events/*.c"
 SOURCES="$SOURCES $srcdir/src/file/*.c"
-SOURCES="$SOURCES $srcdir/src/joystick/*.c"
 SOURCES="$SOURCES $srcdir/src/stdlib/*.c"
 SOURCES="$SOURCES $srcdir/src/thread/*.c"
 SOURCES="$SOURCES $srcdir/src/timer/*.c"
@@ -227,6 +226,8 @@
               , enable_joystick=yes)
 if test x$enable_joystick != xyes; then
     AC_DEFINE(SDL_JOYSTICK_DISABLED)
+else
+    SOURCES="$SOURCES $srcdir/src/joystick/*.c"
 fi
 AC_ARG_ENABLE(cdrom,
 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),