From 45075eec86c6ff4709263337dbb06fa3e31a9690 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 6 Nov 2023 12:16:44 -0800
Subject: [PATCH] Revert "configure: move HAVE_LINUX_INPUT_H to
CheckInputEvents()"
This reverts commit 221d6ea8a8ca7141248aa8e16bf2200df7439688.
Fixes https://github.com/libsdl-org/SDL/issues/8488
---
configure | 9 ++++++---
configure.ac | 3 +--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 8f86fcd2103a..c5b466b5f655 100755
--- a/configure
+++ b/configure
@@ -18942,6 +18942,12 @@ if test "x$ac_cv_header_signal_h" = xyes
then :
printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h
+fi
+ac_fn_c_check_header_compile "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_input_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_LINUX_INPUT_H 1" >>confdefs.h
+
fi
@@ -26428,9 +26434,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
printf "%s\n" "$use_input_events" >&6; }
if test x$use_input_events = xyes; then
-printf "%s\n" "#define HAVE_LINUX_INPUT_H 1" >>confdefs.h
-
-
printf "%s\n" "#define SDL_INPUT_LINUXEV 1" >>confdefs.h
SUMMARY_input="${SUMMARY_input} linuxev"
diff --git a/configure.ac b/configure.ac
index 7b71e43567e9..5588958598bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,7 +330,7 @@ if test x$enable_libc = xyes; then
dnl Check for C library headers
dnl AC_CHECK_INCLUDES_DEFAULT is an autoconf-2.7x thing where AC_HEADER_STDC is deprecated.
m4_ifdef([AC_CHECK_INCLUDES_DEFAULT], [AC_CHECK_INCLUDES_DEFAULT], [AC_HEADER_STDC])
- AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h wchar.h inttypes.h stdint.h limits.h ctype.h math.h float.h iconv.h signal.h)
+ AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h wchar.h inttypes.h stdint.h limits.h ctype.h math.h float.h iconv.h signal.h linux/input.h)
dnl Check for typedefs, structures, etc.
AC_TYPE_SIZE_T
@@ -2769,7 +2769,6 @@ dnl Check for Linux 2.4 unified input event interface support
]])], [use_input_events=yes],[])
AC_MSG_RESULT($use_input_events)
if test x$use_input_events = xyes; then
- AC_DEFINE(HAVE_LINUX_INPUT_H, 1, [ ])
AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ])
SUMMARY_input="${SUMMARY_input} linuxev"
fi