From 317ad270c9cc92361a55e5f0ec999449878bcffa Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 13 Jul 2010 02:43:10 -0400 Subject: [PATCH] Add XShape test to configure scripts. --- configure.in | 13 +++++++++++++ include/SDL_config.h.in | 1 + include/SDL_config_macosx.h | 1 + 3 files changed, 15 insertions(+) diff --git a/configure.in b/configure.in index 00c15101d..70e667cdb 100644 --- a/configure.in +++ b/configure.in @@ -1116,6 +1116,19 @@ AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[def AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA) SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c" fi + AC_ARG_ENABLE(video-x11-xshape, +AC_HELP_STRING([--enable-video-x11-xshape], [enable X11 XShape support [[default=yes]]]), + , enable_video_x11_xshape=yes) + if test x$enable_video_x11_xshape = xyes; then + AC_CHECK_HEADER(X11/extensions/shape.h, + have_shape_h_hdr=yes, + have_shape_h_hdr=no, + [#include + ]) + if test x$have_shape_h_hdr = xyes; then + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XSHAPE) + fi + fi AC_ARG_ENABLE(video-x11-xrandr, AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]), , enable_video_x11_xrandr=yes) diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 5c47f11b2..d3f1fdf6a 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -278,6 +278,7 @@ #undef SDL_VIDEO_DRIVER_X11_XINPUT #undef SDL_VIDEO_DRIVER_X11_SCRNSAVER #undef SDL_VIDEO_DRIVER_X11_XV +#undef SDL_VIDEO_DRIVER_X11_XSHAPE #undef SDL_VIDEO_RENDER_D3D #undef SDL_VIDEO_RENDER_GDI diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h index b650068ad..5080c84fa 100644 --- a/include/SDL_config_macosx.h +++ b/include/SDL_config_macosx.h @@ -144,6 +144,7 @@ #define SDL_VIDEO_DRIVER_X11_XINPUT 1 #define SDL_VIDEO_DRIVER_X11_SCRNSAVER 1 #define SDL_VIDEO_DRIVER_X11_XV 1 +#define SDL_VIDEO_DRIVER_X11_XSHAPE 1 #define SDL_VIDEO_RENDER_OGL 1 #define SDL_VIDEO_RENDER_X11 1