comparison configure.in @ 2103:4a010418f3b9

Merged r3009:3011 from branches/SDL-1.2: Skip subsystem on --disable-joysticks.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 04 Apr 2007 10:39:16 +0000
parents cdaeb26ed66a
children a76e8b9f3d2e
comparison
equal deleted inserted replaced
2102:0975e24a3670 2103:4a010418f3b9
194 SOURCES="$SOURCES $srcdir/src/audio/*.c" 194 SOURCES="$SOURCES $srcdir/src/audio/*.c"
195 SOURCES="$SOURCES $srcdir/src/cdrom/*.c" 195 SOURCES="$SOURCES $srcdir/src/cdrom/*.c"
196 SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c" 196 SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c"
197 SOURCES="$SOURCES $srcdir/src/events/*.c" 197 SOURCES="$SOURCES $srcdir/src/events/*.c"
198 SOURCES="$SOURCES $srcdir/src/file/*.c" 198 SOURCES="$SOURCES $srcdir/src/file/*.c"
199 SOURCES="$SOURCES $srcdir/src/joystick/*.c"
200 SOURCES="$SOURCES $srcdir/src/stdlib/*.c" 199 SOURCES="$SOURCES $srcdir/src/stdlib/*.c"
201 SOURCES="$SOURCES $srcdir/src/thread/*.c" 200 SOURCES="$SOURCES $srcdir/src/thread/*.c"
202 SOURCES="$SOURCES $srcdir/src/timer/*.c" 201 SOURCES="$SOURCES $srcdir/src/timer/*.c"
203 SOURCES="$SOURCES $srcdir/src/video/*.c" 202 SOURCES="$SOURCES $srcdir/src/video/*.c"
204 203
225 AC_ARG_ENABLE(joystick, 224 AC_ARG_ENABLE(joystick,
226 AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]), 225 AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]),
227 , enable_joystick=yes) 226 , enable_joystick=yes)
228 if test x$enable_joystick != xyes; then 227 if test x$enable_joystick != xyes; then
229 AC_DEFINE(SDL_JOYSTICK_DISABLED) 228 AC_DEFINE(SDL_JOYSTICK_DISABLED)
229 else
230 SOURCES="$SOURCES $srcdir/src/joystick/*.c"
230 fi 231 fi
231 AC_ARG_ENABLE(cdrom, 232 AC_ARG_ENABLE(cdrom,
232 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), 233 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
233 , enable_cdrom=yes) 234 , enable_cdrom=yes)
234 if test x$enable_cdrom != xyes; then 235 if test x$enable_cdrom != xyes; then