From: panne <unknown>
Date: Thu, 20 Feb 2003 18:53:15 +0000 (+0000)
Subject: [project @ 2003-02-20 18:53:15 by panne]
X-Git-Tag: Approx_11550_changesets_converted~1121
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=caadd032dbf43449fbe48ce3fe144dd12e2d3560;p=ghc-hetmet.git

[project @ 2003-02-20 18:53:15 by panne]
* Nuked unused --with-glut-api and --with-glut-xlib arguments
* Only check for OpenGL headers and libs when --enable-hopengl is given
---

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