Detlef Riekenberg : winex11: Get rid of glext.h in remaining locations.
Alexandre Julliard
julliard at winehq.org
Mon Jun 22 09:04:09 CDT 2009
Module: wine
Branch: master
Commit: a30624143a633be225f724736dd042023bcc2717
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30624143a633be225f724736dd042023bcc2717
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Fri Jun 19 16:00:37 2009 +0200
winex11: Get rid of glext.h in remaining locations.
---
configure | 3 +--
configure.ac | 2 +-
dlls/winex11.drv/opengl.c | 3 ---
include/config.h.in | 3 ---
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index fb5ef54..1142c59 100755
--- a/configure
+++ b/configure
@@ -11317,8 +11317,7 @@ fi
-
-for ac_header in GL/gl.h GL/glx.h GL/glext.h GL/glu.h
+for ac_header in GL/gl.h GL/glx.h GL/glu.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/configure.ac b/configure.ac
index bef311e..356f6b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -850,7 +850,7 @@ then
opengl_msg=""
if test "x$with_opengl" != "xno"
then
- AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glext.h GL/glu.h,,,
+ AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glu.h,,,
[#ifdef HAVE_GL_GLX_H
# include <GL/glx.h>
#endif])
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index f1557b6..b2cf82a 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -48,9 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl);
#ifdef HAVE_GL_GLX_H
# include <GL/glx.h>
#endif
-#ifdef HAVE_GL_GLEXT_H
-# include <GL/glext.h>
-#endif
#include "wine/wgl.h"
diff --git a/include/config.h.in b/include/config.h.in
index c113fcb..99ecae3 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -222,9 +222,6 @@
/* Define to 1 if you have the `getuid' function. */
#undef HAVE_GETUID
-/* Define to 1 if you have the <GL/glext.h> header file. */
-#undef HAVE_GL_GLEXT_H
-
/* Define to 1 if you have the <GL/glu.h> header file. */
#undef HAVE_GL_GLU_H
More information about the wine-cvs
mailing list