Migrate FlightGear code to use "#include SG_GL*" defined in

"#include <simgear/compiler.h>".

configure.ac

@@ -231,22 +231,6 @@ else
     AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
 fi
 
-dnl check for glut location
-AC_CHECK_HEADER(GL/glut.h)
-if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-    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([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
-    else
-        if test "x$enable_sdl" != "xyes"; then
-            echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
-            exit
-        fi
-    fi
-fi
-
 dnl check for OpenGL related libraries
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)

src/ATC/ATCdisplay.cxx

@@ -26,7 +26,9 @@
 #   include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <simgear/props/props.hxx>
 

src/Cockpit/cockpit.cxx

@@ -29,7 +29,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <stdlib.h>
 #include <stdio.h>

src/Cockpit/hud.cxx

@@ -44,7 +44,7 @@
 #include <stdio.h>		// char related functions
 #include <string.h>		// strcmp()
 
-#include <GL/glu.h>
+#include SG_GLU_H
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>

src/Cockpit/panel.cxx

@@ -29,7 +29,9 @@
 #include <stdio.h>	// sprintf
 #include <string.h>
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <plib/ssg.h>
 #include <plib/fnt.h>

src/GUI/gui_funcs.cxx

@@ -40,7 +40,7 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include SG_GL_H
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>

src/GUI/layout-test.cxx

@@ -1,6 +1,7 @@
 #include <iostream>
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+#include SG_GL_H
 #include <plib/pw.h>
 #include <plib/pu.h>
 #include <simgear/props/props.hxx>

src/Main/fg_os.cxx

@@ -1,16 +1,16 @@
-// The mac puts this in a weird location (GLUT/glut.h), so the
-// configure script detects the location and defines it as a macro.
 #ifndef _MSC_VER // MSVC really needs a definition for wchar_t
 #define _WCHAR_T_DEFINED 1 // Glut needs this, or else it tries to
                            // redefine it
 #endif
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
-#  include FG_GLUT_H
-#else
-#  include <GL/glut.h>
 #endif
 
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
+
 #include <plib/pu.h>
 
 #include "fg_props.hxx"

src/Main/splash.cxx

@@ -36,7 +36,9 @@
 
 #include <string.h>
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/screen/texture.hxx>

src/Network/net_fdm.hxx

@@ -48,8 +48,8 @@ public:
     float phi;			// roll (radians)
     float theta;		// pitch (radians)
     float psi;			// yaw or true heading (radians)
-    float alpha;                // angle of attack
+    float alpha;                // angle of attack (radians)
-    float beta;                 // side slip angle
+    float beta;                 // side slip angle (radians)
 
     // Velocities
     float phidot;		// roll rate (radians/sec)

src/Time/light.cxx

@@ -30,10 +30,10 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
-
 #include <simgear/compiler.h>
 
+#include SG_GL_H
+
 #ifdef SG_MATH_EXCEPTION_CLASH
 #  define exception c_exception
 #endif

src/Time/light.hxx

@@ -38,7 +38,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include <plib/sg.h>			// plib include
 

tests/est-epsilon.c

@@ -8,7 +8,9 @@
 
 #include <stdio.h>
 
-#include FG_GLUT_H
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
 
 
 int main() {

tests/gl-info.c

@@ -18,7 +18,9 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800
 #include <stdio.h>
 #include <stdlib.h>
 
-#include FG_GLUT_H
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
 
 
 void getPrints ( GLenum token, char *string )

tests/test-env-map.cxx

@@ -10,7 +10,9 @@
 #include <stdio.h>
 #include <math.h>
 
-#include FG_GLUT_H
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
 
 #define TEXRES_X 256
 #define TEXRES_Y 256

utils/Modeller/3dconvert.cxx

@@ -1,5 +1,13 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
 #include <iostream>
-#include <GL/glut.h>
+
+#include SG_GLUT_H
+
 #include <plib/ssg.h>
 
 using std::cerr;