Commit fa3330baecd3a90c7dc8f8539a7f048e6cf8d316
2021-11-12T12:55:50
autotools, cmake: test Xfixes along with XInput2.h: because we use Xfixes with XIBarrierReleasePointer
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
index 23b8793..dbf4490 100644
--- a/cmake/sdlchecks.cmake
+++ b/cmake/sdlchecks.cmake
@@ -525,14 +525,15 @@ macro(CheckX11)
endif()
endif()
- if(SDL_X11_XFIXES AND HAVE_XFIXES_H)
+ # check along with XInput2.h because we use Xfixes with XIBarrierReleasePointer
+ if(SDL_X11_XFIXES AND HAVE_XFIXES_H AND HAVE_XINPUT2_H)
if(HAVE_X11_SHARED AND XFIXES_LIB)
set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XFIXES "\"${XFIXES_LIB_SONAME}\"")
else()
list(APPEND EXTRA_LIBS ${XFIXES_LIB})
endif()
set(SDL_VIDEO_DRIVER_X11_XFIXES 1)
- set(HAVE_VIDEO_X11_XFIXES TRUE)
+ set(HAVE_X11_XFIXES TRUE)
endif()
if(SDL_X11_XRANDR AND HAVE_XRANDR_H)
diff --git a/configure b/configure
index 023f26b..65178a0 100755
--- a/configure
+++ b/configure
@@ -21502,8 +21502,10 @@ fi
if test x$enable_video_x11_xfixes = xyes; then
definitely_enable_video_x11_xfixes=no
+ # check along with XInput2.h because we use Xfixes with XIBarrierReleasePointer
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xfixes.h" "ac_cv_header_X11_extensions_Xfixes_h" "#include <X11/Xlib.h>
-
+ #include <X11/Xproto.h>
+ #include <X11/extensions/XInput2.h>
"
if test "x$ac_cv_header_X11_extensions_Xfixes_h" = xyes; then :
have_xfixes_h_hdr=yes
diff --git a/configure.ac b/configure.ac
index 322f166..519b2d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1974,11 +1974,13 @@ XITouchClassInfo *t;
, enable_video_x11_xfixes=yes)
if test x$enable_video_x11_xfixes = xyes; then
definitely_enable_video_x11_xfixes=no
+ # check along with XInput2.h because we use Xfixes with XIBarrierReleasePointer
AC_CHECK_HEADER(X11/extensions/Xfixes.h,
have_xfixes_h_hdr=yes,
have_xfixes_h_hdr=no,
[#include <X11/Xlib.h>
- ])
+ #include <X11/Xproto.h>
+ #include <X11/extensions/XInput2.h>])
if test x$have_xfixes_h_hdr = xyes; then
if test x$enable_x11_shared = xyes && test x$xfixes_lib != x ; then
echo "-- dynamic libXfixes -> $xfixes_lib"