reorganise PAPI configuration: off by default, even if library is found

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9420663..67875e1 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -431,6 +431,11 @@ GhcRtsCcOpts=-fomit-frame-pointer
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
 
+# Include support for CPU performance counters via the PAPI library in the RTS?
+# (PAPI: http://icl.cs.utk.edu/papi/)
+GhcRtsWithPapi = NO
+HavePapi = @HavePapi@
+
 ################################################################################
 #
 #              nofib
@@ -987,9 +992,6 @@ UNAME                       = uname
 # GTK+
 GTK_CONFIG = @GTK_CONFIG@
 
-# PAPI
-USE_PAPI   = @USE_PAPI@
-
 #-----------------------------------------------------------------------------
 # DocBook XML stuff