Added check for the presence of Mesa's header files.

configure.in

@@ -107,7 +107,8 @@ then
     dnl Check for XFree86 VMODE extension
     AC_CHECK_LIB(Xxf86vm,XF86VidModeQueryExtension,AC_DEFINE(HAVE_LIBXXF86VM) X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm",,$X_LIBS -lXext -lX11)
     dnl Check for the presence of Mesa
-    AC_CHECK_LIB(MesaGL,OSMesaCreateContext,AC_DEFINE(HAVE_MESAGL) X_PRE_LIBS="$X_PRE_LIBS -lMesaGL",,$X_LIBS -lXext -lX11 -lm)
+    AC_CHECK_LIB(MesaGL,OSMesaCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lMesaGL",,$X_LIBS -lXext -lX11 -lm)
+    AC_CHECK_HEADERS(GL/osmesa.h)
 else
     XLIB=""
     X_CFLAGS=""

graphics/d3d_private.h

@@ -7,10 +7,11 @@
 #ifndef _WINE_D3D_PRIVATE_H
 #define _WINE_D3D_PRIVATE_H
 
+#include "wine_gl.h"
+
 #ifdef HAVE_MESAGL
 
 #include "d3d.h"
-#include "wine_gl.h"
 
 /* Matrix copy WITH transposition */
 #define conv_mat2(mat,gl_mat)			\

include/acconfig.h

@@ -76,4 +76,4 @@
 #undef HAVE_IPX_LINUX
 
 /* Define if Mesa is present on the system or not */
-#undef HAVE_MESAGL
+#undef HAVE_LIBMESAGL

include/config.h.in

@@ -79,7 +79,7 @@
 #undef HAVE_IPX_LINUX
 
 /* Define if Mesa is present on the system or not */
-#undef HAVE_MESAGL
+#undef HAVE_LIBMESAGL
 
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
@@ -126,6 +126,9 @@
 /* Define if you have the waitpid function.  */
 #undef HAVE_WAITPID
 
+/* Define if you have the <GL/osmesa.h> header file.  */
+#undef HAVE_GL_OSMESA_H
+
 /* Define if you have the <curses.h> header file.  */
 #undef HAVE_CURSES_H
 

include/d3d.h

@@ -4,9 +4,7 @@
 #include "ddraw.h"
 
 /* This is needed for GL_LIGHT */
-#ifdef HAVE_MESAGL
 #include "wine_gl.h"
-#endif
 
 typedef BOOL32 *LPBOOL;
 typedef BOOL32 BOOL;

include/wine_gl.h

@@ -7,7 +7,11 @@
 #ifndef __WINE_GL_H
 #define __WINE_GL_H
 
-#ifdef HAVE_MESAGL
+#include "config.h"
+
+#if defined(HAVE_LIBMESAGL) && defined(HAVE_GL_OSMESA_H)
+
+#define HAVE_MESAGL
 
 #undef APIENTRY
 #undef CALLBACK
@@ -27,6 +31,10 @@
 #define WINAPI      __stdcall
 #define APIENTRY    WINAPI
 
-#endif /* HAVE_MESAGL */
+#else /* HAVE_LIBMESAGL */
+
+#undef HAVE_MESAGL
+
+#endif /* HAVE_LIBMESAGL */
 
 #endif /* __WINE_GL_H */