X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=afd294103e9e51d48321c6b4d95fe164115dfa25;hb=b71578e649e400677614f46a53ed11da7f3c9da2;hp=8d5b6d525e7f149d8b4194b92ff7eb30c1eeca1a;hpb=b55c9113d0e0ebdd5f4fcf579efdcfdd952566fa;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8d5b6d5..afd2941 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -168,6 +168,11 @@ ProjectsDontInstall = glafp-utils nofib
 IncludeTestDirsInBuild=NO
 
 #
+# Should the various project example directories be built?
+#
+IncludeExampleDirsInBuild=NO
+
+#
 # Which ways should SGML documents be built?
 # options are: dvi ps pdf html rtf
 #
@@ -225,11 +230,9 @@ GhcStage3HcOpts=
 # (way 'u') to get unregisterised code, but the default way will be
 # registerised.
 #
-# NOTE: this is not the same as building the compiler itself
-# unregisterised.  That's done by either (a) bootstrapping with a
-# compiler that was built with GhcUnregisterised=YES, or (b)
-# bootstrapping with a compiler that has way 'u' libraries, and the
-# flag '-unreg' is added to GhcHcOpts above.
+# NOTE: the stage1 compiler will be a registerised binary (assuming
+# the compiler you build with is generating registerised binaries), but
+# the stage2 compiler will be an unregisterised binary.
 #
 GhcUnregisterised=NO
 
@@ -371,7 +374,7 @@ GhcRtsThreaded=@ThreadedRts@
 
 # Build the Haskell Readline bindings?
 #
-GhcLibsWithReadline=@HaveReadlineHeaders@
+GhcLibsWithReadline=@GhcLibsWithReadline@
 
 # Libraries needed for linking with readline
 LibsReadline=@LibsReadline@
@@ -388,22 +391,34 @@ LIBM=@LIBM@
 #
 GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
 
-# Build the Haskell OpenGL/GLUT binding?
+# Build the Haskell OpenGL binding?
+#
+GhcLibsWithOpenGL=@GhcLibsWithOpenGL@
+GLU_CFLAGS=@GLU_CFLAGS@
+GLU_LIBS=@GLU_LIBS@
+
+# Build the Haskell OpenAL binding?
+#
+GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
+
+# Build the Haskell GLUT binding?
 #
-GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
-GL_CFLAGS=@GL_CFLAGS@
-GL_LIBS=@GL_LIBS@
+GhcLibsWithGLUT=@GhcLibsWithGLUT@
 GLUT_LIBS=@GLUT_LIBS@
 
+# X11 stuff
+#
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
 
-
-# 
 # .NET interop support?
 #
 DotnetSupport=@DotnetSupport@
 
+# Build unix package?
+#
+GhcLibsWithUnix=@GhcLibsWithUnix@
+
 ################################################################################
 #
 #		happy project
@@ -748,7 +763,6 @@ HavePosixRegex  = @HavePosixRegex@
 # GTK+
 
 GTK_CONFIG		= @GTK_CONFIG@
-GTK_VERSION		= @GTK_VERSION@
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
@@ -912,6 +926,10 @@ HAPPY_VERSION		= @HappyVersion@
 #
 GHC_HAPPY_OPTS		= -agc
 
+# Temp. to work around performance problems in the HEAD around 8/12/2003,
+# A Happy compiled with this compiler needs more stack.
+SRC_HAPPY_OPTS		= +RTS -K2m -RTS
+
 #
 # Alex
 #