From 68ffd24c58b1936d5a6840bdc43a2f09dc10d355 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Tue, 16 Nov 2021 23:37:20 +0300
Subject: [PATCH] autotools, cmake: don't define SDL_JOYSTICK_HIDAPI in
CheckHIDAPI()
---
cmake/sdlchecks.cmake | 2 --
configure | 14 ++++----------
configure.ac | 8 +++-----
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
index 6ba476fd1f..f6a985f416 100644
--- a/cmake/sdlchecks.cmake
+++ b/cmake/sdlchecks.cmake
@@ -1172,8 +1172,6 @@ macro(CheckHIDAPI)
file(GLOB HIDAPI_JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/hidapi/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${HIDAPI_JOYSTICK_SOURCES})
endif()
- else()
- set(SDL_HIDAPI_DISABLED 1)
endif()
endmacro()
diff --git a/configure b/configure
index 65178a0bb3..1806ca7b43 100755
--- a/configure
+++ b/configure
@@ -24777,28 +24777,22 @@ $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic li
if test x$libusb_lib = x; then
libusb_lib=`find_lib "libusb-1.0.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`
fi
-
-cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
#define SDL_LIBUSB_DYNAMIC "$libusb_lib"
_ACEOF
fi
fi
- else
-
-$as_echo "#define SDL_HIDAPI_DISABLED 1" >>confdefs.h
-
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hidapi support" >&5
-$as_echo_n "checking for hidapi support... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hidapi joystick support" >&5
+$as_echo_n "checking for hidapi joystick support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hidapi_support" >&5
$as_echo "$hidapi_support" >&6; }
fi
if test x$enable_joystick = xyes -a x$hidapi_support = xyes -a x$enable_hidapi_joystick = xyes; then
-
-$as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
+ $as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
fi
diff --git a/configure.ac b/configure.ac
index 519b2d1737..9f4e1a1120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3475,19 +3475,17 @@ CheckHIDAPI()
if test x$libusb_lib = x; then
libusb_lib=[`find_lib "libusb-1.0.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`]
fi
- AC_DEFINE_UNQUOTED(SDL_LIBUSB_DYNAMIC, "$libusb_lib", [ ])
+ AC_DEFINE_UNQUOTED(SDL_LIBUSB_DYNAMIC, "$libusb_lib", [])
fi
fi
- else
- AC_DEFINE(SDL_HIDAPI_DISABLED, 1, [ ])
fi
- AC_MSG_CHECKING(for hidapi support)
+ AC_MSG_CHECKING(for hidapi joystick support)
AC_MSG_RESULT($hidapi_support)
fi
if test x$enable_joystick = xyes -a x$hidapi_support = xyes -a x$enable_hidapi_joystick = xyes; then
- AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
+ AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [])
SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
fi
}