Added configure gadgets to detect Papi, and fixed build problems

diff --git a/configure.ac b/configure.ac
index 1d28aa8..a4a229c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1200,6 +1200,17 @@ if test -n "$GTK_CONFIG"; then
 fi
 AC_SUBST([GTK_CONFIG])
 
+#Checking for PAPI
+AC_CHECK_LIB(papi, PAPI_library_init, HavePapiLib=YES, HavePapiLib=NO)
+AC_CHECK_HEADER([papi.h], [HavePapiHeader=YES], [HavePapiHeader=NO])
+AC_SUBST(HavePapiLib)
+AC_SUBST(HavePapiHeader)
+
+if test "$HavePapiLib" = "YES" -a "$HavePapiHeader" = "YES"; then
+   USE_PAPI=YES
+fi
+AC_SUBST(USE_PAPI)
+
 AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 996fe6e..9420663 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -987,6 +987,9 @@ UNAME                       = uname
 # GTK+
 GTK_CONFIG = @GTK_CONFIG@
 
+# PAPI
+USE_PAPI   = @USE_PAPI@
+
 #-----------------------------------------------------------------------------
 # DocBook XML stuff
 

diff --git a/rts/Makefile b/rts/Makefile
index 2b05eff..08240a1 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -179,6 +179,14 @@ EXCLUDED_SRCS              += $(wildcard Vis*.c)
 endif
 
 #-----------------------------------------------------------------------------
+# Add PAPI library if needed
+
+ifeq "$(USE_PAPI)" "YES"
+SRC_HC_OPTS            += -lpapi -optc-DUSE_PAPI
+PACKAGE_CPP_OPTS       += -DUSE_PAPI
+endif
+
+#-----------------------------------------------------------------------------
 # make depend setup
 
 SRC_MKDEPENDC_OPTS += -I. -I../includes