winex11: Remove some leftover X Shm code.

configure

@@ -816,7 +816,6 @@ with_xml
 with_xrandr
 with_xrender
 with_xshape
-with_xshm
 with_xslt
 with_xxf86vm
 with_zlib
@@ -1507,7 +1506,6 @@ Optional Packages:
   --without-xrandr        do not use Xrandr (resolution changes)
   --without-xrender       do not use the Xrender extension
   --without-xshape        do not use the Xshape extension
-  --without-xshm          do not use XShm (shared memory extension)
   --without-xslt          do not use XSLT
   --without-xxf86vm       do not use XFree video mode extension
   --without-zlib          do not use Zlib (data compression)
@@ -2752,12 +2750,6 @@ if test "${with_xshape+set}" = set; then :
 fi
 
 
-# Check whether --with-xshm was given.
-if test "${with_xshm+set}" = set; then :
-  withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi
-fi
-
-
 # Check whether --with-xslt was given.
 if test "${with_xslt+set}" = set; then :
   withval=$with_xslt;
@@ -8014,7 +8006,6 @@ fi
                       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 \
@@ -8222,60 +8213,6 @@ esac
 fi
         fi
 
-                if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
-        then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5
-$as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; }
-if ${ac_cv_lib_Xext_XShmQueryExtension+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XShmQueryExtension ();
-int
-main ()
-{
-return XShmQueryExtension ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xext_XShmQueryExtension=yes
-else
-  ac_cv_lib_Xext_XShmQueryExtension=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xext_XShmQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xext_XShmQueryExtension" = xyes; then :
-
-$as_echo "#define HAVE_LIBXXSHM 1" >>confdefs.h
-
-fi
-
-        fi
-        if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then :
-  case "x$with_xshm" in
-  x)   as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;;
-  xno) ;;
-  *)   as_fn_error $? "XShm ${notice_platform}development files not found, X Shared Memory won't be supported.
-This is an error since --with-xshm was requested." "$LINENO" 5 ;;
-esac
-fi
-
                 if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
         then
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5

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

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

include/config.h.in

@@ -371,9 +371,6 @@
 /* Define to 1 if you have the <libxslt/transform.h> header file. */
 #undef HAVE_LIBXSLT_TRANSFORM_H
 
-/* Define if you have the X Shm extension */
-#undef HAVE_LIBXXSHM
-
 /* Define to 1 if you have the <link.h> header file. */
 #undef HAVE_LINK_H
 
@@ -1079,9 +1076,6 @@
 /* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */
 #undef HAVE_X11_EXTENSIONS_XRENDER_H
 
-/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
-#undef HAVE_X11_EXTENSIONS_XSHM_H
-
 /* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */
 #undef HAVE_X11_XCURSOR_XCURSOR_H