diff --git a/configure.in b/configure.in
index 4cafd8d74..9472e0ec5 100644
--- a/configure.in
+++ b/configure.in
@@ -2916,8 +2916,8 @@ esac
 
 # 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"
diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c
index ae42e753a..f608ede14 100644
--- a/src/joystick/dummy/SDL_sysjoystick.c
+++ b/src/joystick/dummy/SDL_sysjoystick.c
@@ -87,4 +87,5 @@ SDL_SYS_JoystickQuit(void)
 }
 
 #endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */
+
 /* vi: set ts=4 sw=4 expandtab: */