[project @ 2000-11-21 12:32:55 by rrt]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 24d43d9..146addc 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -169,26 +169,18 @@ GhcWithHscBuiltViaC=@BootingFromHc@
 #
 # Target platforms supported:
 #   i386, alpha & sparc
-GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi)
+ifneq "$(findstring $(HostArch_CPP), i386 alpha sparc)" ""
+GhcWithNativeCodeGen=YES
+else
+GhcWithNativeCodeGen=NO
+endif
 
 # Include GHCi in the compiler
-ifeq "$(linux_TARGET_OS)" "1"
+ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
 GhcWithInterpreter=YES
 else 
-ifeq "$(solaris_TARGET_OS)" "1"
-GhcWithInterpreter=YES
-else
-ifeq "$(freebsd_TARGET_OS)" "1"
-GhcWithInterpreter=YES
-else
-ifeq "$(netbsd_TARGET_OS)" "1"
-GhcWithInterpreter=YES
-else
 GhcWithInterpreter=NO
 endif
-endif
-endif
-endif
 
 #
 # Building various ways?
@@ -226,8 +218,8 @@ GhcLibHcOpts=-O
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 # Don't split object files for libs if we're building DLLs
-EnableWin32DLLs=@EnableWin32DLLs@
-ifeq "$(EnableWin32DLLs)" "YES"
+DLLized=@EnableWin32DLLs@
+ifeq "$(DLLized)" "YES"
 SplitObjs=NO
 else
 SplitObjs=YES
@@ -254,6 +246,9 @@ StripLibraries=NO
 GhcRtsHcOpts=-O2
 GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
 
+# Include the front panel code?  Needs GTK+.
+GhcRtsWithFrontPanel = NO
+
 ################################################################################
 #
 #              hslibs project
@@ -269,7 +264,7 @@ GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
 HsLibsFor      = ghc
 
 # hslibs for GHC also uses the following variables (defined above):
-#   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, EnableWin32DLLs, StripLibraries
+#   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
 
 # Haskell compiler options for tools in hslibs
 GhcLibToolsHcOpts=-O
@@ -438,7 +433,7 @@ endif
 ifeq "$(strip $(mandir))" ""
 mandir         = $(prefix)/man
 endif
- 
+
 
 ################################################################################
 #
@@ -565,6 +560,12 @@ LibGmp             = @LibGmp@
 HaveRegex      = @HaveRegex@
 
 #-----------------------------------------------------------------------------
+# GTK+
+
+GTK_CONFIG             = @GTK_CONFIG@
+GTK_VERSION            = @GTK_VERSION@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX                   = @LEX@
@@ -797,10 +798,6 @@ WAY_mp_HC_OPTS=-parallel
 WAY_mg_NAME=GranSim
 WAY_mg_HC_OPTS=-gransim
 
-# Way `dll': 
-WAY_dll_NAME=Win32 DLLs
-WAY_dll_HC_OPTS=-dll
-
 #
 # Add user-way configurations here:
 #