From 5024c3a7db7ed5c3514693f2704cf50fe04b35d5 Mon Sep 17 00:00:00 2001
From: Sven Hesse <drmccoy@users.sourceforge.net>
Date: Mon, 28 Mar 2011 19:00:11 +0200
Subject: [PATCH] BUILD: Remove the dependency on GLU

---
 Makefile.common | 4 ++--
 config.h.in     | 9 ---------
 configure.ac    | 5 -----
 glew/glew.h     | 9 ---------
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 8421aeacaf..1d6af3ea39 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -2,13 +2,13 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 FLAGS_C_CXX = -I$(top_srcdir) -I$(top_srcdir)/src/ -ggdb -Wall -Wno-multichar \
               -Wpointer-arith -Wshadow $(EOS_CXXFLAGS) $(BOOST_CPPFLAGS) \
-              $(GL_CFLAGS) $(GLU_CFLAGS) -DGLEW_STATIC $(WERROR)
+              $(GL_CFLAGS) -DGLEW_STATIC $(WERROR)
 
 AM_CXXFLAGS = $(FLAGS_C_CXX) -Wnon-virtual-dtor
 AM_CFLAGS   = $(FLAGS_C_CXX)
 
 AM_LDFLAGS = $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) \
-             $(BOOST_REGEX_LDFLAGS) $(GL_LIBS) $(GLU_LIBS) $(EOS_LIBS)
+             $(BOOST_REGEX_LDFLAGS) $(GL_LIBS) $(EOS_LIBS)
 
 LIBS = $(LTLIBICONV) $(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS) \
        $(BOOST_REGEX_LIBS)
diff --git a/config.h.in b/config.h.in
index 5524de743b..2b1eeab05a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -57,9 +57,6 @@
 /* Define to 1 if you have the `fminf' function. */
 #undef HAVE_FMINF
 
-/* Define to 1 if you have the <GL/glu.h> header file. */
-#undef HAVE_GL_GLU_H
-
 /* Define to 1 if you have the <GL/gl.h> header file. */
 #undef HAVE_GL_GL_H
 
@@ -75,9 +72,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the <OpenGL/glu.h> header file. */
-#undef HAVE_OPENGL_GLU_H
-
 /* Define to 1 if you have the <OpenGL/gl.h> header file. */
 #undef HAVE_OPENGL_GL_H
 
@@ -105,9 +99,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Use nonstandard varargs form for the GLU tesselator callback */
-#undef HAVE_VARARGS_GLU_TESSCB
-
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
diff --git a/configure.ac b/configure.ac
index 8205b323ab..39bd91f682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,6 @@ case "$target" in
 		;;
 	*)
 		AX_CHECK_GL
-		AX_CHECK_GLU
 
 		AC_CHECK_HEADER("AL/al.h", , noopenal=1)
 		AC_CHECK_HEADER("AL/alc.h", , noopenal=1)
@@ -107,10 +106,6 @@ case "$target" in
 			AC_MSG_ERROR([OpenGL is required and could not be found!])
 		fi
 
-		if test -n "$no_glu"; then
-			AC_MSG_ERROR([GLU is required and could not be found!])
-		fi
-
 		if test -n "$noopenal"; then
 			AC_MSG_ERROR([OpenAL is required and could not be found!])
 		fi
diff --git a/glew/glew.h b/glew/glew.h
index 13bb8a6db8..542c5fa5fc 100644
--- a/glew/glew.h
+++ b/glew/glew.h
@@ -1156,15 +1156,6 @@ GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei heigh
 
 #endif /* GL_VERSION_1_1 */
 
-/* ---------------------------------- GLU ---------------------------------- */
-
-/* this is where we can safely include GLU */
-#if defined(__APPLE__) && defined(__MACH__)
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-
 /* ----------------------------- GL_VERSION_1_2 ---------------------------- */
 
 #ifndef GL_VERSION_1_2