Change GLUT_H to FG_GLUT_H to prevent a naming clash with freeglut.

diff --git a/configure.ac b/configure.ac
index d202423b4611577b1803f27c651c673667d9311e..7360988eba05053d3349686b0cfe2c401ba119a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -242,11 +242,11 @@ base_LIBS="$LIBS"
 dnl check for glut location
 AC_CHECK_HEADER(GL/glut.h)
 if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-    AC_DEFINE([GLUT_H], <GL/glut.h>, [Define as glut.h include location])
+    AC_DEFINE([FG_GLUT_H], <GL/glut.h>, [Define as glut.h include location])
 else
     AC_CHECK_HEADER(GLUT/glut.h)
     if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-        AC_DEFINE([GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
+        AC_DEFINE([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
     else
         echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
         exit

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index 69d0026c68fb9368ad1b36ff9e45f0c6a722ed4c..18794e5a761532f6c99967ad246c7e889b51c884 100644 (file)
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -33,7 +33,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H                 // needed before pu.h
+#include FG_GLUT_H              // needed before pu.h
 
 #include <plib/pu.h>           // plib include
 

diff --git a/src/GUI/gui_local.cxx b/src/GUI/gui_local.cxx
index 018760e98239d752cd6e1d7d44c27ddf961c2c3b..01aab18b21bcefe618616b50c38cde6be65d03da 100644 (file)
--- a/src/GUI/gui_local.cxx
+++ b/src/GUI/gui_local.cxx
@@ -6,7 +6,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H                 // needed before pu.h
+#include FG_GLUT_H          // needed before pu.h
 #include <plib/pu.h>        // plib include
 
 #include <FDM/flight.hxx>

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index 4f63d7c4f522a2e26b572b747a78a8e47c9d9c92..10290f7d3ae019ce953fca2846a7823da815fa33 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -38,7 +38,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include FG_GLUT_H
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>

diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6
index 91c9e9b2d011dd257a825ec559e0a9b2cb6fe4fb..fcb2b9152a177262b6edfec2ab1524fb5bd1d11d 100644 (file)
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -189,8 +189,8 @@
 #define  ENABLE_AUDIO_SUPPORT
 #endif
 
-#ifndef  GLUT_H
-#define  GLUT_H   <GL/glut.h>
-#endif   // #ifndef GLUT_H
+#ifndef  FG_GLUT_H
+#define  FG_GLUT_H   <GL/glut.h>
+#endif   // #ifndef FG_GLUT_H
 
 // eof - config.h-msvc6 - single flightgear config.h file

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index cc6ca78fe10537c97b4a6b157fc179f23bb96966..df01295591dfc341105a13692c953c24f0e34c59 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -37,7 +37,7 @@
 #include STL_STRING
 #include <vector>
 
-#include GLUT_H
+#include FG_GLUT_H
 
 #include <plib/pu.h>
 

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 4f12ad1eedbbd4c5e72d27de67e8df6850217557..6ee3eb1501494f274c3b77b436b3cbc696b8252f 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -48,7 +48,7 @@ SG_USING_STD(endl);
 #  include <float.h>
 #endif
 
-#include GLUT_H
+#include FG_GLUT_H
 
 #ifdef macintosh
 #  include <console.h>         // -dw- for command line dialog

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index 12e7bb6eb4ca562abe3e83f182453ae000c7c77c..56e0daff6589fd40eae4417775c68464fa6ac65b 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -34,7 +34,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include FG_GLUT_H
 
 #include <string.h>
 

diff --git a/src/NetworkOLK/net_hud.cxx b/src/NetworkOLK/net_hud.cxx
index 941043676141b4f4cdbedb0e19d400ea5eeccdee..18d48083111a500e7e8f56aef9618e8c39aea9d7 100644 (file)
--- a/src/NetworkOLK/net_hud.cxx
+++ b/src/NetworkOLK/net_hud.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <math.h>
 
-#include GLUT_H
+#include FG_GLUT_H
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/NetworkOLK/network.cxx b/src/NetworkOLK/network.cxx
index f1ce49658258aaa4b6554e42fb1681e87ff45e0d..430c23752d30e72076f9293bef725dafff38dda7 100644 (file)
--- a/src/NetworkOLK/network.cxx
+++ b/src/NetworkOLK/network.cxx
@@ -35,7 +35,7 @@
 #endif
 #include <math.h>
 
-#include GLUT_H
+#include FG_GLUT_H
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index 40ae8ef798d5f5b4a39516e7269b6bbb4651dc0d..4ae68a10a63161a9434cfce32be143b42bc31b6b 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -38,7 +38,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include FG_GLUT_H
 
 #include <plib/sg.h>                   // plib include