--- a/configure.in	Fri Apr 03 13:27:33 2009 +0000
+++ b/configure.in	Fri Apr 03 13:35:05 2009 +0000
@@ -2916,8 +2916,8 @@
 
 # Verify that we have all the platform specific files we need
 
-if test x$enable_joystick = xyes; then
-    if test x$have_joystick != xyes; then
+if test x$have_joystick != xyes; then
+    if test x$enable_joystick = xyes; then
         AC_DEFINE(SDL_JOYSTICK_DISABLED)
     fi
     SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"

--- a/src/joystick/dummy/SDL_sysjoystick.c	Fri Apr 03 13:27:33 2009 +0000
+++ b/src/joystick/dummy/SDL_sysjoystick.c	Fri Apr 03 13:35:05 2009 +0000
@@ -87,4 +87,5 @@
 }
 
 #endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */
+
 /* vi: set ts=4 sw=4 expandtab: */