[PATCH 5/5] winex11: Remove some leftover X Shm code.

[Henri Verbeet]

---
 configure.ac              |   13 -------------
 dlls/winex11.drv/x11drv.h |    3 ---
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9a4848b..0b68774 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,8 +96,6 @@ AC_ARG_WITH(xrender,   AS_HELP_STRING([--without-xrender],[do not use the Xrende
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi])
 AC_ARG_WITH(xshape,    AS_HELP_STRING([--without-xshape],[do not use the Xshape extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi])
-AC_ARG_WITH(xshm,      AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)]),
-            [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
 AC_ARG_WITH(xslt,      AS_HELP_STRING([--without-xslt],[do not use XSLT]))
 AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
@@ -941,7 +939,6 @@ then
                       X11/extensions/shape.h \
                       X11/extensions/XInput.h \
                       X11/extensions/XInput2.h \
-                      X11/extensions/XShm.h \
                       X11/extensions/Xcomposite.h \
                       X11/extensions/Xinerama.h \
                       X11/extensions/Xrandr.h \
@@ -986,16 +983,6 @@ then
                              [XInput2 headers not found, the XInput 2 extension won't be supported.])
         fi
 
-        dnl *** Check for X Shm extension
-        if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
-        then
-              AC_CHECK_LIB(Xext, XShmQueryExtension,
-              AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
-              $X_LIBS $XLIB $X_EXTRA_LIBS)
-        fi
-        WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"],
-                         [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.])
-
         dnl *** Check for X shape extension
         if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
         then
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 32f51d7..64129a7 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -31,9 +31,6 @@
 #include <X11/Xresource.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#ifdef HAVE_LIBXXSHM
-# include <X11/extensions/XShm.h>
-#endif /* defined(HAVE_LIBXXSHM) */
 
 #define BOOL X_BOOL
 #define BYTE X_BYTE
-- 
1.7.3.4