From 62830747f27eaf2dd77819e898deac55b52cb700 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 1 Dec 2008 20:22:43 +0000
Subject: [PATCH] workaround faulty fltk installs (e.g. in current Debian or
 Ubuntu)

---
 Fltk/Draw.cpp            | 10 +++++++++-
 Graphics/drawContext.cpp | 10 +++++++++-
 Graphics/drawGlyph.cpp   | 10 +++++++++-
 Plugin/CutSphere.cpp     | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Fltk/Draw.cpp b/Fltk/Draw.cpp
index 5582a29b4a..5faf16e664 100644
--- a/Fltk/Draw.cpp
+++ b/Fltk/Draw.cpp
@@ -4,7 +4,15 @@
 // bugs and problems to <gmsh@geuz.org>.
 
 #include <FL/gl.h>
-#include <FL/glu.h>
+
+//FIXME: workaround faulty fltk installs
+//#include <FL/glu.h>
+#ifdef __APPLE__
+#  include <OpenGL/glu.h>
+#else
+#  include <GL/glu.h>
+#endif
+
 #include "GUI.h"
 #include "graphicWindow.h"
 #include "GmshDefines.h"
diff --git a/Graphics/drawContext.cpp b/Graphics/drawContext.cpp
index ee8cc50d09..9cf2dbce3d 100644
--- a/Graphics/drawContext.cpp
+++ b/Graphics/drawContext.cpp
@@ -4,7 +4,15 @@
 // bugs and problems to <gmsh@geuz.org>.
 
 #include <FL/gl.h>
-#include <FL/glu.h>
+
+//FIXME: workaround faulty fltk installs
+//#include <FL/glu.h>
+#ifdef __APPLE__
+#  include <OpenGL/glu.h>
+#else
+#  include <GL/glu.h>
+#endif
+
 #include "GmshMessage.h"
 #include "Draw.h"
 #include "drawContext.h"
diff --git a/Graphics/drawGlyph.cpp b/Graphics/drawGlyph.cpp
index 6d2da6e567..1564fa674d 100644
--- a/Graphics/drawGlyph.cpp
+++ b/Graphics/drawGlyph.cpp
@@ -5,7 +5,15 @@
 
 #include <string.h>
 #include <FL/gl.h>
-#include <FL/glu.h>
+
+//FIXME: workaround faulty fltk installs
+//#include <FL/glu.h>
+#ifdef __APPLE__
+#  include <OpenGL/glu.h>
+#else
+#  include <GL/glu.h>
+#endif
+
 #include "drawContext.h"
 #include "Numeric.h"
 #include "Draw.h"
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index 96e0f989bb..96aacecd81 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -9,7 +9,15 @@
 
 #if defined(HAVE_FLTK)
 #include <FL/gl.h>
-#include <FL/glu.h>
+
+//FIXME: workaround faulty fltk installs
+//#include <FL/glu.h>
+#ifdef __APPLE__
+#  include <OpenGL/glu.h>
+#else
+#  include <GL/glu.h>
+#endif
+
 #include "Draw.h"
 #endif
 
-- 
GitLab