--- a/configure.in	Tue Jul 13 02:27:59 2010 -0400
+++ b/configure.in	Tue Jul 13 02:43:10 2010 -0400
@@ -1116,6 +1116,19 @@
                 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 <X11/Xlib.h>
+                                ])
+                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)

--- a/include/SDL_config.h.in	Tue Jul 13 02:27:59 2010 -0400
+++ b/include/SDL_config.h.in	Tue Jul 13 02:43:10 2010 -0400
@@ -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

--- a/include/SDL_config_macosx.h	Tue Jul 13 02:27:59 2010 -0400
+++ b/include/SDL_config_macosx.h	Tue Jul 13 02:43:10 2010 -0400
@@ -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