Don't perform any tests for joystick in configure under OS X.

The test for setEventCallout() was added in r34541 to work around some problem
with OS X 10.1 SDK. As we don't support this version of OS X since a very long
time, it shouldn't be needed any longer.

See #15692.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-21 00:07:41 +00:00
parent 304a005e7a
commit 7622a167fd
2 changed files with 3 additions and 57 deletions

View File

@@ -6326,26 +6326,10 @@ dnl ---------------------------------------------------------------------------
if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
wxUSE_JOYSTICK=no
dnl under MSW we always have joystick support
if test "$TOOLKIT" = "MSW"; then
dnl under MSW and OS X we always have joystick support
if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "OSX_COCOA" -o "$TOOLKIT" = "COCOA"; then
wxUSE_JOYSTICK=yes
dnl mac only available on darwin
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])
AC_LANG_PUSH(C++)
AC_TRY_COMPILE( [ #include <IOKit/hid/IOHIDLib.h> ],
[ IOHIDQueueInterface *qi = NULL;
IOHIDCallbackFunction cb = NULL;
qi->setEventCallout(NULL, cb, NULL, NULL); ],
[ wxUSE_JOYSTICK=yes ]
)
AC_LANG_POP()
AC_MSG_RESULT($wxUSE_JOYSTICK)
fi
dnl joystick support is only for Linux 2.1.x or greater
else
dnl notice the dummy includes argument: without it, AC_CHECK_HEADER