Fixed uninitialised FunBind fun_tick field

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 532aea3..8b00e5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,12 @@ 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'?"
+   exit 1
+fi
 
 FP_SETUP_PROJECT_VERSION
 
@@ -312,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
@@ -387,6 +401,15 @@ mips-*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
+mipsel-*-linux*)
+        HostPlatform=mipsel-unknown-linux # hack again
+        TargetPlatform=mipsel-unknown-linux
+        BuildPlatform=mipsel-unknown-linux
+        HostPlatform_CPP='mipsel_unknown_linux'
+        HostArch_CPP='mipsel'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='linux'
+        ;;
 mips-dec-ultrix*)
         HostPlatform_CPP='mips_dec_ultrix'
         HostArch_CPP='mipsel'   # NB a little different
@@ -601,7 +624,12 @@ case $HostPlatform in
             hardtop=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@/@g'`
             hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'`
           else
-            hardtop_plat=${hardtop}
+dnl OK, so we're in the MSYS case.  hardtop looks like /c/....
+dnl We want to make hardtop_plat into c:/...
+dnl Stop using [] for quotes temporarily, so we can use [] in the sed regexp
+changequote(, )dnl
+               hardtop_plat=`echo ${hardtop} | sed -e 's@^/\\([a-zA-Z]\\)/@\\1:/@g'`
+changequote([, ])dnl
         fi
         ;;
   *)
@@ -899,7 +927,7 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 dnl ** check for DocBook toolchain
 FP_CHECK_DOCBOOK_DTD
-FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl])
+FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl])
 FP_PROG_FO_PROCESSOR
 
 dnl ** check for ghc-pkg command
@@ -962,12 +990,6 @@ AC_SUBST(GhcLibsWithReadline)
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
 
-dnl ** how do we get a timezone name, and UTC offset ?
-AC_STRUCT_TIMEZONE
-
-dnl ** do we have altzone?
-FP_DECL_ALTZONE
-
 dnl ** do we have long longs?
 AC_CHECK_TYPES([long long])
 
@@ -1123,6 +1145,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
@@ -1136,17 +1159,13 @@ dnl    (.subsections-via-symbols assembler directive)
 
 
 AC_MSG_CHECKING(for .subsections_via_symbols)
-AC_TRY_COMPILE(,[__asm__ (".subsections_via_symbols");],
-    [
-        AC_MSG_RESULT(yes)
-        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[1],
-            [Define to 1 if Apple-style dead-stripping is supported.])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([], [__asm__ (".subsections_via_symbols");])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[1],
+               [Define to 1 if Apple-style dead-stripping is supported.])
     ],
-    [
-        AC_MSG_RESULT(no)
-        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[0],
-            [Define to 1 if Apple-style dead-stripping is supported.])
-    ])
+    [AC_MSG_RESULT(no)])
 
 dnl *** check for GNU non-executable stack note support (ELF only)
 dnl     (.section .note.GNU-stack,"",@progbits)
@@ -1165,8 +1184,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],
@@ -1190,6 +1209,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