X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=a1a9861b8234054ecc6877577ccbd7a3af54457a;hb=1a1164f580d910ad41cb52a17c989cef02010dae;hp=1d28aa8d5acaddaea3b2a66f4a00feb4c9b10556;hpb=51f782f416a8aa05153a9f2dcef34d8bcb79f1ed;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 1d28aa8..a1a9861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,9 @@ dnl (run "grep '^dnl \*' configure.ac | sed -e 's/dnl / /g; s/\*\*/   +/g;'"
 dnl  (or some such) to see the outline of this file)
 dnl
 #
-# (c) The AQUA Project, Glasgow University, 1994-2004
+# (c) The University of Glasgow 1994-2004
 #
-# Configure script template for the Glasgow functional programming tools
+# Configure script template for GHC
 #
 # Process with 'autoreconf' to get a working configure script.
 #
@@ -15,6 +15,17 @@ dnl
 
 AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [glasgow-haskell-bugs@haskell.org], [ghc])
 
+# Set this to YES for a released version, otherwise NO
+RELEASE=NO
+
+# The primary version (e.g. 6.7, 6.6.1) is set in the AC_INIT line
+# above.  If this is not a released version, then we will append the
+# date to the version number (e.g. 6.7.20070204).  The date is
+# constructed by finding the date of the most recent patch in the
+# darcs repository.  If this is a source distribution (not a darcs
+# checkout), then we ship a file 'VERSION' containing the full version
+# when the source distribution was created.
+
 if test ! -f mk/config.h.in; then
    echo "mk/config.h.in doesn't exist: perhaps you haven't run 'autoreconf'?"
    exit 1
@@ -317,6 +328,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 +889,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
@@ -893,6 +914,9 @@ FP_PROG_SORT
 
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
+dnl Let's make sure install-sh is executable here.  If we got it from
+dnl a darcs repo, it might not be (see bug #978).
+chmod +x install-sh
 
 dnl If you can run configure, you certainly have /bin/sh
 AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])
@@ -1175,8 +1199,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],
@@ -1200,6 +1224,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