Remove extraneous/unneeded dependencies on glut. SimGear should no longer

have any glut dependies.

diff --git a/configure.ac b/configure.ac
index 7ca9d534e9115bcc8e5fe556ebda67f78ac72fd9..ba93665e731e05c326b0d60db32412f117e6aae3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -184,20 +184,6 @@ AC_SEARCH_LIBS(cos, m)
 
 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])
-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])
-    else
-        echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
-        exit
-    fi
-fi
-
 dnl check for OpenGL related libraries
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
@@ -207,7 +193,7 @@ case "${host}" in
     AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
     AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
-    LIBS="$LIBS -lglut32 -lglu32 -lopengl32"
+    LIBS="$LIBS -lglu32 -lopengl32"
     LIBS="$LIBS -luser32 -lgdi32 -lwinmm"
 
     dnl add -lwsock32 for mingwin
@@ -223,7 +209,7 @@ case "${host}" in
 *-apple-darwin*)
     dnl Mac OS X
 
-    LIBS="$LIBS -framework GLUT -framework OpenGL -framework Carbon -lobjc"
+    LIBS="$LIBS -framework OpenGL -framework Carbon -lobjc"
     ;;
 
 *)
@@ -253,7 +239,6 @@ case "${host}" in
     fi
 
     AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ])
-    AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ])
     ;;
 
 esac
@@ -453,13 +438,6 @@ fi
 echo -n "Automake version: "
 automake --version | head -1
 
-if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-   echo "With GL/glut.h"
-fi
-if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-   echo "With GLUT/glut.h"
-fi
-
 if test "x$with_jpeg_factory" = "xyes"; then
    echo "With JPEG Factory support"
 else

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index d3e49c8293c82baf5a44f73c04197a5dadfeb19e..35d341d3003670464b23b7a0b5c4948a1e31c182 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -33,7 +33,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>

diff --git a/simgear/scene/sky/dome.cxx b/simgear/scene/sky/dome.cxx
index c0fdf65ff425b0b77651f16c43c78a953dcbc12e..4048409ea271350b8029a503d7dfe5a54ca146c3 100644 (file)
--- a/simgear/scene/sky/dome.cxx
+++ b/simgear/scene/sky/dome.cxx
@@ -33,7 +33,7 @@
 
 #include <math.h>
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include <plib/sg.h>
 

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 57f95e07a0a76df6cde1bdc929091ea2adb2dfb6..f8b137022632cdbfd86289bed3799f586bd689cd 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -11,7 +11,7 @@
 #include <limits.h>
 #include <string.h>            // memcpy()
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include "GLBitmaps.h"
 

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index 27c6e9bc8b8666f4fbfd87d43ac9291b6346b522..862fbdd1470d473a788da9b36aa62db33904a194 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include "screen-dump.hxx"
 

diff --git a/simgear/xgl/xgl.c b/simgear/xgl/xgl.c
index bd74a0540ad6b8484789346059fd54e62d0bf6cc..ae7a91f183ac43a165a19a9fa07d1ddbd8a3f979 100644 (file)
--- a/simgear/xgl/xgl.c
+++ b/simgear/xgl/xgl.c
@@ -7,7 +7,10 @@
 #endif
 
 #include "xgl.h"
+
+#ifdef USING_GLUT
 #include GLUT_H
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -2729,6 +2732,7 @@ void xglViewport ( GLint x, GLint y, GLsizei width, GLsizei height )
     glViewport ( x, y, width, height ) ;
 }
 
+#ifdef USING_GLUT
 void xglutAddMenuEntry ( char* label, int value )
 {
   if ( xglTraceIsEnabled("glutAddMenuEntry") )
@@ -2864,6 +2868,7 @@ void xglutSwapBuffers ()
   if ( xglExecuteIsEnabled("glutSwapBuffers") )
     glutSwapBuffers () ;
 }
+#endif
 
 GLboolean xglAreTexturesResidentEXT ( GLsizei n, GLuint* textures, GLboolean* residences )
 {