X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=30c4d7eb5486e5298602ad2d43dc4df663fe1a21;hb=e6d14f325f2c6c580025d0dc97dd70b723b6f92a;hp=86e3a989083227ed173b3871296614beb401b0d2;hpb=56bcfea3a498c945ef223ecab8f415ee18580724;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 86e3a98..30c4d7e 100644
--- a/configure.in
+++ b/configure.in
@@ -468,6 +468,10 @@ AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
 fi;
 fi;
 
+dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
+if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then
+AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+fi;
 
 dnl ** Enable multi-thread friendly RTS?
 dnl --------------------------------------------------------------
@@ -528,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 --------------------------------------------------------------
@@ -1044,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