[cairo-commit] libglc ChangeLog,1.39,1.40 configure.in,1.8,1.9

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libglc
In directory pdx:/tmp/cvs-serv18340

Modified Files:
	ChangeLog configure.in 
Log Message:
Included our own GL extension definitions

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/libglc/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** a/ChangeLog	5 Mar 2004 07:48:22 -0000	1.39
--- b/ChangeLog	6 Mar 2004 13:58:17 -0000	1.40
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-03-06    <c99drn at cs.umu.se>
+ 
+ 	Included our own GL extension definitions.
+ 
  2004-03-05    <c99drn at cs.umu.se>
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/libglc/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** a/configure.in	16 Feb 2004 22:02:40 -0000	1.8
--- b/configure.in	6 Mar 2004 13:58:17 -0000	1.9
***************
*** 85,89 ****
  
  AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
- AH_TEMPLATE([HAVE_GL_GLXATI_H], [Define if <GL/glxATI.h> exists])
  
  if test "x$use_glx" != "xyes"; then
--- 85,88 ----
***************
*** 121,188 ****
    fi
  
-   # Check glext.h version
-   AC_MSG_CHECKING(version of GL/glext.h)
-   AC_RUN_IFELSE([
-     AC_LANG_PROGRAM(
-     [
-       #include <GL/gl.h>
-       #include <GL/glext.h>
-     ], 
-     [
-       #if GL_GLEXT_VERSION < 21
-         return 1;
-       #endif
-     ])],
-   AC_MSG_RESULT(ok),
-   AC_MSG_RESULT(failed)
-   AC_MSG_RESULT(** WARNING **: I'd like to have a newer <GL/glext.h>. Please download it from http://oss.sgi.com/projects/ogl-sample/ABI/),
-   AC_MSG_RESULT(ok))
- 
-   # Check for GLX 1.3 in glx.h
-   AC_MSG_CHECKING(for GLX 1.3 in GL/glx.h)
-   AC_RUN_IFELSE([
-     AC_LANG_PROGRAM(
-     [
-       #include <GL/glx.h>
-     ], 
-     [
-       #ifndef GLX_VERSION_1_3
-         return 1;
-       #endif
-     ])],
-   AC_MSG_RESULT(ok),
-   AC_MSG_RESULT(failed)
-   AC_MSG_RESULT(** WARNING **: <GL/glx.h> is missing GLX 1.3),
-   AC_MSG_RESULT(ok))
- 
-   # Check glxext.h version
-   AC_MSG_CHECKING(version of GL/glxext.h)
-   AC_RUN_IFELSE([
-     AC_LANG_PROGRAM(
-     [
-       #include <GL/glx.h>
-       #include <GL/glxext.h>
-     ], 
-     [
-       #if GLX_GLXEXT_VERSION < 5
-         return 1;
-       #endif
-     ])],
-   AC_MSG_RESULT(ok),
-   AC_MSG_RESULT(failed)
-   AC_MSG_RESULT(** WARNING **: I'd like to have a newer <GL/glxext.h>. Please download it from http://oss.sgi.com/projects/ogl-sample/ABI/),
-   AC_MSG_RESULT(ok))
- 
-   # Check for glxATI.h
-   AC_MSG_CHECKING(for GL/glxATI.h)
-   AC_TRY_COMPILE(
-   [
-     #include <GL/glx.h>
-     #include <GL/glxATI.h>
-   ], [],
-   AC_DEFINE(HAVE_GL_GLXATI_H, 1)
-   AC_MSG_RESULT(yes),
-   AC_MSG_RESULT(no))
- 
    AM_CONDITIONAL(LIBGLC_HAS_GLX_BACKEND, true)
  fi
--- 120,123 ----