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.
libsdl-org · Jan 12, 2006 · 2ab3501 · 2ab3501
1 parent 430d8af
commit 2ab3501
Show file tree

Hide file tree

Showing 7 changed files with 450 additions and 12 deletions.
diff --git a/configure.in b/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

diff --git a/src/video/Xext/Makefile.am b/src/video/Xext/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS = extensions Xinerama Xv Xxf86dga Xxf86vm
+SUBDIRS = extensions Xinerama Xv Xxf86dga Xxf86vm XME
 
 EXTRA_DIST = README
diff --git a/src/video/Xext/XME/Makefile.am b/src/video/Xext/XME/Makefile.am
@@ -0,0 +1,6 @@
+
+## Makefile.am for the XME library
+
+noinst_LTLIBRARIES = libXME.la
+libXME_la_SOURCES = xme.c
+