From eb72e866d7fcca0ac086de97054576023cef880b Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 3 Nov 2006 21:52:54 +0000
Subject: [PATCH] Merged r2896:2897 from trunk (use dummy joystick if subsystem
 enabled and  no platform-specific driver exists).

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

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402220
---
 configure.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 1983f66d9..893a8b961 100644
--- a/configure.in
+++ b/configure.in
@@ -2564,11 +2564,12 @@ case "$host" in
 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