From 304a005e7a60b31e9d5c7705e8f7f83e9e4b32c3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Nov 2013 00:07:36 +0000
Subject: [PATCH] Fix joystick detection in configure under OS X.

Don't compare toolkit with OSX which is never used for it, compare it with
OSX_COCOA instead.

Closes #15692.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 2 +-
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index cb15f8600d..cb7aac94e2 100755
--- a/configure
+++ b/configure
@@ -35512,7 +35512,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
         if test "$TOOLKIT" = "MSW"; then
         wxUSE_JOYSTICK=yes
 
-        elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
+        elif test "$TOOLKIT" = "OSX_COCOA" -o "$TOOLKIT" = "COCOA"; then
         if test "$USE_DARWIN" = 1; then
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking headers have declarations needed for joystick support" >&5
 $as_echo_n "checking headers have declarations needed for joystick support... " >&6; }
diff --git a/configure.in b/configure.in
index 53ccfe0ddc..1edc1388a5 100644
--- a/configure.in
+++ b/configure.in
@@ -6331,7 +6331,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
         wxUSE_JOYSTICK=yes
 
     dnl mac only available on darwin
-    elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
+    elif test "$TOOLKIT" = "OSX_COCOA" -o "$TOOLKIT" = "COCOA"; then
         if test "$USE_DARWIN" = 1; then
             dnl check for a bug in the headers, some have bad setEventCallout
             AC_MSG_CHECKING([headers have declarations needed for joystick support])