- (ugly) fix for the 'Xmd.h' problem

- fix the detection of DGA 2 in configure script

- (ugly) fix for the 'Xmd.h' problem
7be462dd · Lionel Ulmer · Alexandre Julliard · 74341020 · 7be462dd · 7be462dd
Commit 7be462dd authored Jan 15, 2000 by Lionel Ulmer Committed by Alexandre Julliard Jan 15, 2000
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

configure configure +0 -0

configure.in configure.in +3 -1

wine_gl.h include/wine_gl.h +2 -0

No files found.
--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
@@ -153,7 +153,9 @@ then
    AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h)
    if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
    then 
-         AC_CHECK_LIB(Xxf86dga,XDGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA2) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+         AC_CHECK_LIB(Xxf86dga,
+	              XDGAQueryExtension,
+		      AC_DEFINE(HAVE_LIBXXF86DGA2) AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
 	 if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no"
 	 then
           AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)

--- a/include/wine_gl.h
+++ b/include/wine_gl.h
@@ -17,8 +17,10 @@
 #undef CALLBACK
 #undef WINAPI

+#define XMD_H /* This is to prevent the Xmd.h inclusion bug to happen :-/ */
 #include <GL/gl.h>
 #include <GL/glx.h>
+#undef  XMD_H

 #undef APIENTRY
 #undef CALLBACK