--- a/configure	Tue Jan 15 20:50:23 2008 +0000
+++ b/configure	Thu Jan 31 00:19:20 2008 +0000
@@ -719,6 +719,8 @@
 AUDIO_ESOUND_FALSE
 CDROM_LINUX_TRUE
 CDROM_LINUX_FALSE
+JOY_LINUX_TRUE
+JOY_LINUX_FALSE
 SHCC
 SHLD
 SHOBJCOPY
@@ -6126,6 +6128,155 @@
 fi
 
 
+if test "${ac_cv_header_linux_joystick_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
+echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_linux_joystick_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking linux/joystick.h usability" >&5
+echo $ECHO_N "checking linux/joystick.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <linux/joystick.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking linux/joystick.h presence" >&5
+echo $ECHO_N "checking linux/joystick.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <linux/joystick.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: linux/joystick.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: linux/joystick.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: linux/joystick.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: linux/joystick.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: linux/joystick.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
+echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_linux_joystick_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_linux_joystick_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
+
+fi
+if test $ac_cv_header_linux_joystick_h = yes; then
+
+    HAVE_LINUX_JOYSTICK_H=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LINUX_JOYSTICK 1
+_ACEOF
+
+else
+   echo "Linux Joystick support not found, building without it."
+fi
+
+
+
+
+if test "$HAVE_LINUX_JOYSTICK_H" = "yes"; then
+  JOY_LINUX_TRUE=
+  JOY_LINUX_FALSE='#'
+else
+  JOY_LINUX_TRUE='#'
+  JOY_LINUX_FALSE=
+fi
+
+
 # Extract the first word of "sh-elf-gcc", so it can be a program name with args.
 set dummy sh-elf-gcc; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -8095,6 +8246,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${JOY_LINUX_TRUE}" && test -z "${JOY_LINUX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"JOY_LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"JOY_LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_SYSTEST_TRUE}" && test -z "${BUILD_SYSTEST_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_SYSTEST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -8792,6 +8950,8 @@
 AUDIO_ESOUND_FALSE!$AUDIO_ESOUND_FALSE$ac_delim
 CDROM_LINUX_TRUE!$CDROM_LINUX_TRUE$ac_delim
 CDROM_LINUX_FALSE!$CDROM_LINUX_FALSE$ac_delim
+JOY_LINUX_TRUE!$JOY_LINUX_TRUE$ac_delim
+JOY_LINUX_FALSE!$JOY_LINUX_FALSE$ac_delim
 SHCC!$SHCC$ac_delim
 SHLD!$SHLD$ac_delim
 SHOBJCOPY!$SHOBJCOPY$ac_delim
@@ -8823,7 +8983,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5