X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=30c4d7eb5486e5298602ad2d43dc4df663fe1a21;hb=c38560410334c59512630ac59f7c0e6330241077;hp=cb4562303630a2eaf0cf2e3e7e69a8460281f5c7;hpb=9eb4c7200cd0b8a77cbb10c71cb342bd83bd54ad;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index cb45623..30c4d7e 100644
--- a/configure.in
+++ b/configure.in
@@ -532,26 +532,6 @@ AC_ARG_ENABLE(hopengl,
 )
 AC_SUBST(GhcLibsWithHOpenGL)
 
-dnl ** Use a specific version of the GLUT API
-dnl --------------------------------------------------------------
-AC_ARG_WITH(glut-api,
-[  --with-glut-api=<version>
-        Use a specific version of the GLUT API when building HOpenGL.
-])
-test -n "$with_glut_api"  && CPPFLAGS="$CPPFLAGS -DGLUT_API_VERSION=$with_glut_api"
-
-
-dnl ** Use a specific version of the GLUT API
-dnl --------------------------------------------------------------
-AC_ARG_WITH(glut-xlib,
-[  --with-glut-xlib=<version>
-        Use a specific version of the GLUT Xlib implementation when building HOpenGL.
-])
-test -n "$with_glut_xlib" && CPPFLAGS="$CPPFLAGS -DGLUT_XLIB_IMPLEMENTATION=$with_glut_xlib"
-
-
-
-
 dnl --------------------------------------------------------------
 dnl End of configure script option section
 dnl --------------------------------------------------------------
@@ -1048,7 +1028,10 @@ mingw32)  ;;
 *) AC_PATH_XTRA() ;;
 esac
 
+dnl ** check for OpenGL/GLUT/GLX include paths and libraries
+if test $GhcLibsWithHOpenGL = YES ; then
 FPTOOLS_HAVE_OPENGL
+fi
 
 dnl ################################################################
 dnl Check for libraries