Add XME hooks to X11 driver instead of relying on libxme...libxme hasn't

 changed in five years, and it's a small .c file that just calls into the X11
 dependencies we already use elsewhere. Including it directly allows us to
 make use of the dynamic X11 code.

Fixes Bugzilla #41.

--ryan.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401245

configure.in

@@ -760,19 +760,11 @@ CheckX11()
                             , enable_video_x11_xme=yes)
             if test x$enable_video_x11_xme = xyes; then
                 AC_MSG_CHECKING(for Xi Graphics XiGMiscExtension support)
-                video_x11_xme=no
-                AC_TRY_COMPILE([
-                 #include <X11/Xlib.h>
-                 #include <X11/extensions/xme.h>
-                ],[
-                 XiGMiscResolutionInfo *resolutions;
-                ],[
                 video_x11_xme=yes
-                ])
                 AC_MSG_RESULT($video_x11_xme)
                 if test x$video_x11_xme = xyes; then
                     CFLAGS="$CFLAGS -DHAVE_XIGXME"
-                    SYSTEM_LIBS="$SYSTEM_LIBS -lxme"
+                    SYSTEM_LIBS="$SYSTEM_LIBS"
                 fi
             fi
         fi

src/video/Xext/Makefile.am

 
-SUBDIRS = extensions Xinerama Xv Xxf86dga Xxf86vm
+SUBDIRS = extensions Xinerama Xv Xxf86dga Xxf86vm XME
 
 EXTRA_DIST = README

src/video/Xext/XME/Makefile.am

+
+## Makefile.am for the XME library
+
+noinst_LTLIBRARIES = libXME.la
+libXME_la_SOURCES = xme.c
+

src/video/Xext/extensions/Makefile.am

@@ -12,4 +12,6 @@ noinst_HEADERS =	\
 	Xinerama.h	\
 	Xv.h		\
 	Xvlib.h		\
-	Xvproto.h
+	Xvproto.h	\
+	xme.h
+

src/video/Xext/extensions/xme.h

+/*
+ * Copyright 1993-2001 by Xi Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * Please see the LICENSE file accompanying this distribution for licensing 
+ * information. 
+ *
+ * Please send any bug fixes and modifications to src@xig.com.
+ *
+ * $XiGId: xme.h,v 1.1.1.1 2001/11/19 19:01:10 jon Exp $
+ *
+ */
+
+
+#ifndef _XME_H_INCLUDED 
+#define _XME_H_INCLUDED
+
+typedef struct {        
+  short		        x;
+  short		        y;
+  unsigned short	w;
+  unsigned short	h;
+} XiGMiscViewInfo;
+
+typedef struct {        
+  unsigned short        width;
+  unsigned short        height;
+  int                   refresh;
+} XiGMiscResolutionInfo;
+
+extern Bool XiGMiscQueryVersion(Display *dpy, int *major, int *minor);
+extern int XiGMiscQueryViews(Display *dpy, int screen, 
+			     XiGMiscViewInfo **pviews);
+extern int XiGMiscQueryResolutions(Display *dpy, int screen, int view, 
+			    int *pactive, 
+			    XiGMiscResolutionInfo **presolutions);
+extern void XiGMiscChangeResolution(Display *dpy, int screen, int view, 
+			     int width, int height, int refresh);
+#endif /* _XME_H_INCLUDED */
+
+

src/video/x11/SDL_x11video.h

@@ -39,7 +39,7 @@ static char rcsid =
 #include <XFree86/extensions/xf86vmode.h>
 #endif
 #ifdef HAVE_XIGXME
-#include <X11/extensions/xme.h>
+#include <XFree86/extensions/xme.h>
 #endif
 
 #include <string.h>