# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1162590774 0
# Node ID 636320238bc86606a9fcedb8e2dbd23a0d7070ec
# Parent  67d518069d9a9373d8cc70f815c91fece5602832
Merged r2896:2897 from trunk (use dummy joystick if subsystem enabled and
 no platform-specific driver exists).

Fixes Bugzilla #356 (and maybe Bugzilla #350).

diff -r 67d518069d9a -r 636320238bc8 configure.in
--- a/configure.in	Sun Oct 29 04:08:50 2006 +0000
+++ b/configure.in	Fri Nov 03 21:52:54 2006 +0000
@@ -2564,11 +2564,12 @@
 esac
 
 # Verify that we have all the platform specific files we need
-if test x$have_joystick != xyes; then
-    if test x$enable_joystick = xyes; then
-        AC_DEFINE(SDL_JOYSTICK_DISABLED)
-    fi
+
+if test x$enable_joystick = xyes; then
+  if test x$have_joystick != xyes; then
+    # Wants joystick subsystem, but doesn't have a platform-specific backend...
     SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
+  fi
 fi
 if test x$have_cdrom != xyes; then
     if test x$enable_cdrom = xyes; then