# HG changeset patch
# User address@hidden
# Date 1216401761 -7200
# Node ID 585decfd6eeb550967aefc15d368a2c9d2cd99e5
# Parent  7b8aca1cdf0ad71a075aa9823320cd31a985fd1a
check for OpenGL/gl[u].h

diff -r 7b8aca1cdf0a -r 585decfd6eeb ChangeLog
--- a/ChangeLog	Fri Jul 18 13:00:52 2008 -0400
+++ b/ChangeLog	Fri Jul 18 19:22:41 2008 +0200
@@ -1,3 +1,8 @@
+2008-07-18 Carlo de Falco <address@hidden>
+
+	* aclocal.m4: Search for gl.h and glu.h in OpenGL/ as well
+	as in GL/.
+
 2008-07-17  David Bateman  <address@hidden>
 
 	* configure.in (HAVE_MAGICK): New define for presence of
diff -r 7b8aca1cdf0a -r 585decfd6eeb aclocal.m4
--- a/aclocal.m4	Fri Jul 18 13:00:52 2008 -0400
+++ b/aclocal.m4	Fri Jul 18 19:22:41 2008 +0200
@@ -1066,12 +1066,12 @@
     ;;
 esac
 have_opengl_incs=no
-AC_CHECK_HEADERS(GL/gl.h, [
-  AC_CHECK_HEADERS(GL/glu.h, [
-    have_opengl_incs=yes], [], [
+AC_CHECK_HEADERS(GL/gl.h OpenGL/gl.h, [
+  AC_CHECK_HEADERS(GL/glu.h OpenGL/glu.h, [
+    have_opengl_incs=yes, break], [], [
 #ifdef HAVE_WINDOWS_H
 # include <windows.h>
-#endif])], [], [
+#endif ]), break], [], [
 #ifdef HAVE_WINDOWS_H
 # include <windows.h>
 #endif])
diff -r 7b8aca1cdf0a -r 585decfd6eeb src/ChangeLog
--- a/src/ChangeLog	Fri Jul 18 13:00:52 2008 -0400
+++ b/src/ChangeLog	Fri Jul 18 19:22:41 2008 +0200
@@ -1,3 +1,8 @@
+2008-07-18 Carlo de Falco  <address@hidden>
+
+	* gl-render.h: Conditionally include GL/gl.h or OpenGL/gl.h
+	and GL/glu.h or OpenGL/glu.h
+
 2008-07-17  John W. Eaton  <address@hidden>
 
 	* symtab.cc (out_of_date_check_internal): New arg, dispatch_type.
diff -r 7b8aca1cdf0a -r 585decfd6eeb src/gl-render.h
--- a/src/gl-render.h	Fri Jul 18 13:00:52 2008 -0400
+++ b/src/gl-render.h	Fri Jul 18 19:22:41 2008 +0200
@@ -29,8 +29,17 @@
 #include <windows.h>
 #endif
 
+#ifdef HAVE_GL_GL_H
 #include <GL/gl.h>
+#elif defined HAVE_OPENGL_GL_H
+#include <OpenGL/gl.h>
+#endif
+
+#ifdef HAVE_GL_GLU_H
 #include <GL/glu.h>
+#elif defined HAVE_OPENGL_GLU_H
+#include <OpenGL/glu.h>
+#endif
 
 #include "graphics.h"