From de24c470b4979a644e79c8c0061a9c28de6c68df Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sat, 23 Mar 2002 10:29:38 +0000
Subject: [PATCH] Use SDL joystick automatically

---
 acconfig.h             |  2 ++
 arch/linux/Makefile.am |  6 +-----
 arch/sdl/Makefile.am   |  2 --
 configure.ac           | 10 ----------
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index 9b61c306..afd86b03 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -55,6 +55,7 @@
 #ifdef __linux__
 # define __SDL__ 1
 # define SDL_AUDIO 1
+# define SDL_JOYSTICK 1
 
 # ifdef OGL
 #  define SDL_GL_VIDEO 1
@@ -79,6 +80,7 @@
 # define __SDL__ 1
 # define SDL_AUDIO 1
 # define SDL_INPUT 1
+# define SDL_JOYSTICK 1
 # ifdef OGL
 #  define SDL_GL_VIDEO 1
 # else
diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am
index 4c95e59e..044c0760 100644
--- a/arch/linux/Makefile.am
+++ b/arch/linux/Makefile.am
@@ -10,11 +10,7 @@ NETWORK_SRCS = ipx_bsd.c ipx_kali.c ipx_lin.c linuxnet.c ukali.c \
                arch_ip.cpp
 endif
 
-if !SDL_JOYSTICK
-JOYSTICK_SRCS = joydefs.c joystick.c
-endif
-
-libarch_linux_a_SOURCES = ${NETWORK_SRCS} ${JOYSTICK_SRCS} findfile.c init.c
+libarch_linux_a_SOURCES = ${NETWORK_SRCS} findfile.c init.c
 
 EXTRA_libarch_linux_a_SOURCES = \
 ipx_bsd.c ipx_kali.c ipx_lin.c joydefs.c joystick.c linuxnet.c ukali.c
diff --git a/arch/sdl/Makefile.am b/arch/sdl/Makefile.am
index 53665047..cbee1a27 100644
--- a/arch/sdl/Makefile.am
+++ b/arch/sdl/Makefile.am
@@ -4,9 +4,7 @@ noinst_LIBRARIES = libarch_sdl.a
 
 INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main
 
-if SDL_JOYSTICK
 JOYSTICK_SRCS = joy.c joydefs.c
-endif
 
 if !USE_SVGALIB
 if !USE_GGI
diff --git a/configure.ac b/configure.ac
index d6e0a2d7..203ff439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,19 +217,9 @@ else
 
   if test x$MINGW32 = xyes; then
     D2X_ARCH_SUBDIRS="win32 ${D2X_ARCH_SUBDIRS}"
-    AC_DEFINE(SDL_JOYSTICK)
   else
     CFLAGS="-I \$(top_srcdir)/arch/linux/include $CFLAGS"
     D2X_ARCH_SUBDIRS="linux ${D2X_ARCH_SUBDIRS}"
-
-    dnl Check for SDL joystick
-    AC_ARG_ENABLE(sdl-joystick,
-      [  --enable-sdl-joystick   Use SDL joystick (required for mingw) ],,)
-    if test x$enable_sdl_joystick = xyes; then
-        AC_DEFINE(SDL_JOYSTICK)
-        D2X_FEATURES="sdl_joystick ${D2X_FEATURES}"
-    fi
-    AM_CONDITIONAL(SDL_JOYSTICK, test x$enable_sdl_joystick = xyes)
   fi
 fi
 
-- 
2.39.2