commit 5d68f79a8b819761693d7f1e7b1cd79dfb23e2af
author Lionel Ulmer <lionel.ulmer@free.fr> Fri Jul 23 19:33:24 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jul 23 19:33:24 1999 +0000
tree d62515129d5944732c2ae278bb8e5d6ded38385c
parent 22d2c527b8bb70902ac6ea95898007156dd58498

Better detection of OpenGL.

configure.in

diff --git a/configure.in b/configure.in
index 28cefc4..f63f0f9 100644
--- a/configure.in
+++ b/configure.in
@@ -135,8 +135,8 @@
     fi
 
     dnl Check for the presence of Mesa
-    AC_CHECK_HEADERS(GL/gl.h GL/osmesa.h)
-    if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_osmesa_h" = "yes"
+    AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/osmesa.h)
+    if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes"
     then
         dnl Check for some problems due to old Mesa versions
         AC_CACHE_CHECK("for up-to-date Mesa version", wine_cv_mesa_version_OK,
@@ -151,7 +151,11 @@
         if test "$wine_cv_mesa_version_OK" = "yes"
         then
 	    dnl Check for the presense of the library
-            AC_CHECK_LIB(MesaGL,OSMesaCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lMesaGL",,$X_LIBS -lXext -lX11 -lm)
+            AC_CHECK_LIB(GL,glXCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lGL",,$X_LIBS -lXext -lX11 -lm)
+	    if test "$ac_cv_lib_GL_glXCreateContext" = "no"
+	    then
+		AC_CHECK_LIB(MesaGL,glXCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lGL",,$X_LIBS -lXext -lX11 -lm)
+	    fi
         fi
     fi