X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4e8790fe4b9af62d3287585114cc1ec649445625;hb=31442604c1d4ee4102a459a64e4afc39c49fc8a2;hp=4ba14bafaea51c39c4a8b7245cf14a988ba0e66e;hpb=7ca3bb74a9acbcccc6dd8a84d03120e3a684fa9b;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4ba14ba..4e8790f 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -346,6 +346,10 @@ ReadlineIncludePath=
 # Math library
 LIBM=@LIBM@
 
+# Build the ObjectIO ?
+#
+GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
+
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@ -531,7 +535,6 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
-
 ################################################################################
 #
 #		Utilities programs: flags
@@ -681,6 +684,11 @@ LibGmp		= @LibGmp@
 HaveLibMingwEx	= @HaveLibMingwEx@
 
 #-----------------------------------------------------------------------------
+# HaskellSupport framework (Mac OS X)
+#
+HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
+
+#-----------------------------------------------------------------------------
 # Regex libraries
 # (if present in libc use that one, otherwise use the one in the tree)
 #
@@ -740,9 +748,9 @@ MSMACROS 		= -ms
 MV			= mv
 NROFF			= nroff
 PERL 			= @PerlCmd@
+PYTHON			= @PythonCmd@
 PIC			= pic
 PREPROCESSCMD		= $(CC) -E
-PRINTER			= lpr
 RANLIB			= @RANLIB@
 RM			= rm -f
 SED			= @SedCmd@
@@ -783,11 +791,6 @@ TAR			= @TarCmd@
 ZIP			= zip
 
 #
-# Under Windows, we have to deal with .exe suffixes
-#
-EXE_SUFFIX=@exeext@
-
-#
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
 #
@@ -860,6 +863,7 @@ GHC_HAPPY_OPTS		= -agc
 #
 # Haddock
 # 
+HADDOCK			= @HaddockCmd@
 HADDOCK_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
 
 #
@@ -875,8 +879,8 @@ LIT2TEXT 		= $(LITERATE_PREFIX)lit2text
 #
 # Stuff from fptools/ghc/utils
 #
-UNLIT	 		= $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-HP2PS			= $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
+UNLIT	 		= $(UNLIT_PREFIX)unlit$(exeext)
+HP2PS			= $(HP2PS_PREFIX)hp2ps$(exeext)
 HSTAGS			= $(HSTAGS_PREFIX)hstags
 HSC2HS			= $(HSC2HS_PREFIX)hsc2hs-inplace