Merged r3009:3011 from branches/SDL-1.2: Skip subsystem on --disable-joysticks.
authorRyan C. Gordon <icculus@icculus.org>
Wed, 04 Apr 2007 10:39:16 +0000
changeset 21034a010418f3b9
parent 2102 0975e24a3670
child 2104 a76e8b9f3d2e
Merged r3009:3011 from branches/SDL-1.2: Skip subsystem on --disable-joysticks.
configure.in
     1.1 --- a/configure.in	Wed Apr 04 09:43:53 2007 +0000
     1.2 +++ b/configure.in	Wed Apr 04 10:39:16 2007 +0000
     1.3 @@ -196,7 +196,6 @@
     1.4  SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c"
     1.5  SOURCES="$SOURCES $srcdir/src/events/*.c"
     1.6  SOURCES="$SOURCES $srcdir/src/file/*.c"
     1.7 -SOURCES="$SOURCES $srcdir/src/joystick/*.c"
     1.8  SOURCES="$SOURCES $srcdir/src/stdlib/*.c"
     1.9  SOURCES="$SOURCES $srcdir/src/thread/*.c"
    1.10  SOURCES="$SOURCES $srcdir/src/timer/*.c"
    1.11 @@ -227,6 +226,8 @@
    1.12                , enable_joystick=yes)
    1.13  if test x$enable_joystick != xyes; then
    1.14      AC_DEFINE(SDL_JOYSTICK_DISABLED)
    1.15 +else
    1.16 +    SOURCES="$SOURCES $srcdir/src/joystick/*.c"
    1.17  fi
    1.18  AC_ARG_ENABLE(cdrom,
    1.19  AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),