configure.in
changeset 6311 4e5e46f43438
parent 6303 6bb657898f55
child 6313 d86efd889847
     1.1 --- a/configure.in	Fri May 25 18:21:22 2012 -0400
     1.2 +++ b/configure.in	Wed May 30 11:25:35 2012 -0400
     1.3 @@ -1091,6 +1091,8 @@
     1.4              fi
     1.5              have_video=yes
     1.6  
     1.7 +            AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
     1.8 +
     1.9              AC_ARG_ENABLE(video-x11-xcursor,
    1.10  AC_HELP_STRING([--enable-video-x11-xcursor], [enable X11 Xcursor support [[default=yes]]]),
    1.11                              , enable_video_x11_xcursor=yes)
    1.12 @@ -1150,7 +1152,7 @@
    1.13                              , enable_video_x11_xinput=yes)
    1.14              if test x$enable_video_x11_xinput = xyes; then
    1.15                  definitely_enable_video_x11_xinput=no
    1.16 -                AC_CHECK_HEADER(X11/extensions/XInput.h,
    1.17 +                AC_CHECK_HEADER(X11/extensions/XInput2.h,
    1.18                                  have_xinput_h_hdr=yes,
    1.19                                  have_xinput_h_hdr=no,
    1.20                                  [#include <X11/Xlib.h>
    1.21 @@ -1158,7 +1160,7 @@
    1.22                  if test x$have_xinput_h_hdr = xyes; then
    1.23                      if test x$enable_x11_shared = xyes && test x$xinput_lib != x ; then
    1.24                          echo "-- dynamic libXi -> $xinput_lib"
    1.25 -                        AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT, "$xinput_lib", [ ])
    1.26 +                        AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2, "$xinput_lib", [ ])
    1.27                          definitely_enable_video_x11_xinput=yes
    1.28                      else
    1.29                          AC_CHECK_LIB(Xi, XOpenDevice, have_xinput_lib=yes)
    1.30 @@ -1170,7 +1172,7 @@
    1.31                  fi
    1.32              fi
    1.33              if test x$definitely_enable_video_x11_xinput = xyes; then
    1.34 -                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT, 1, [ ])
    1.35 +                AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2, 1, [ ])
    1.36              fi
    1.37              AC_ARG_ENABLE(video-x11-xrandr,
    1.38  AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]),