X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=85301aa2b39262e8535c6f293fd74ddfcc8fe72c;hp=e9ad212a97ca4088752481ae9f04380740607978;hb=49d454d8f8f0e1a83369ec12f8aafc1dcf80aea9;hpb=5d44a1f9bf46c76fa9378e4e5bfcde8ee95b6694

diff --git a/configure.ac b/configure.ac
index e9ad212..85301aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 if test ! -f mk/config.h.in; then
    echo "mk/config.h.in doesn't exist: perhaps you haven't run 'autoreconf'?"
@@ -317,6 +317,15 @@ x86_64-*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+x86_64-apple-darwin*)
+        HostPlatform=x86_64-apple-darwin
+        TargetPlatform=x86_64-apple-darwin
+        BuildPlatform=x86_64-apple-darwin
+        HostPlatform_CPP='x86_64_apple_darwin'
+        HostArch_CPP='x86_64'
+        HostVendor_CPP='apple'
+        HostOS_CPP='darwin'
+        ;;
 m68k-*-linux*)
         HostPlatform=m68k-unknown-linux # hack again
         TargetPlatform=m68k-unknown-linux
@@ -869,6 +878,7 @@ FP_HAVE_GCC
 FP_MINGW_GCC
 FP_GCC_NEEDS_NO_OMIT_LFPTR
 FP_GCC_HAS_NO_UNIT_AT_A_TIME
+FP_GCC_HAS_WRAPV
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -1136,6 +1146,7 @@ AC_C_CONST
 
 dnl ** are we big endian?
 AC_C_BIGENDIAN
+FPTOOLS_FLOAT_WORD_ORDER_BIGENDIAN
 
 dnl ** check for leading underscores in symbol names
 FP_LEADING_UNDERSCORE
@@ -1174,8 +1185,8 @@ AC_CHECK_LIB(rt, clock_gettime)
 AC_CHECK_FUNCS(clock_gettime)
 
 dnl ** check for Apple's "interesting" long double compatibility scheme
-AC_MSG_CHECKING(for printf$LDBLStub)
-AC_TRY_LINK_FUNC(printf$LSBLStub,
+AC_MSG_CHECKING(for printf\$LDBLStub)
+AC_TRY_LINK_FUNC(printf\$LDBLStub,
     [
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_PRINTF_LDBLSTUB],[1],
@@ -1199,6 +1210,19 @@ 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
+   HavePapi=YES
+else
+   HavePapi=NO
+fi
+AC_SUBST(HavePapi)
+
 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