[CHANGESET] Re: Configuring the latest default hg on OSX

[c.]

***** I'm sending again as my pirst attempt got bounced, sorry if the  
message gets duplicated *****

On 01/lug/08, at 13:06, c. wrote:

> P.S. As for the opengl includes I found a changeset posted by Thomas
> that seems to deal with this, but it seems it has not been applied...
>
> http://www.nabble.com/Re%3A-Latest-from-hg-on-OSX-p17932496.html

Replying to my own post,
I guess the patch below is more consistent with the idea
of checking for specific features rather than basing contions
on $canonical_host_type...
Would it be acceptable?

c.


# HG changeset patch
# User address@hidden
# Date 1214919122 -3600
# Node ID 5040c9abdea2806d2d68c6ad7625525cf8380791
# Parent  d56511a0288475622cb5b76725cafdbc09f000bb
opengl/gl.h

diff -r d56511a02884 -r 5040c9abdea2 ChangeLog
--- a/ChangeLog Thu Jun 26 16:06:14 2008 -0400
+++ b/ChangeLog Tue Jul 01 14:32:02 2008 +0100
@@ -1,3 +1,8 @@
+2008-07-01 Carlo de Falco <address@hidden>
+
+       * aclocal.m4: Search for gl.h and glu.h in OpenGL/ as well
+       as in GL/.
+
2008-06-12  Jaroslav Hajek <address@hidden>

        * configure.in: Move LIBS and CXXFLAGS restoration into
diff -r d56511a02884 -r 5040c9abdea2 aclocal.m4
--- a/aclocal.m4        Thu Jun 26 16:06:14 2008 -0400
+++ b/aclocal.m4        Tue Jul 01 14:32:02 2008 +0100
@@ -1065,16 +1065,21 @@
   AC_CHECK_HEADERS(windows.h)
   ;;
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])
+#endif
+])
+
if test "$have_opengl_incs" = "yes"; then
 case $canonical_host_type in
   *-*-msdosmsvc)
diff -r d56511a02884 -r 5040c9abdea2 src/ChangeLog
--- a/src/ChangeLog     Thu Jun 26 16:06:14 2008 -0400
+++ b/src/ChangeLog     Tue Jul 01 14:32:02 2008 +0100
@@ -1,3 +1,8 @@
+2008-07-01 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-06-23  John W. Eaton  <address@hidden>

        * debug.cc (Fdbstack): Avoid shadowed variable warning.
diff -r d56511a02884 -r 5040c9abdea2 src/gl-render.h
--- a/src/gl-render.h   Thu Jun 26 16:06:14 2008 -0400
+++ b/src/gl-render.h   Tue Jul 01 14:32:02 2008 +0100
@@ -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"