X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=8dec5693929c4effceba4dca74558d53e3b795b6;hp=532aea3aad8d2e4c19dd9cedaf471ea9de80832b;hb=refs%2Ftags%2FBefore_type_family_merge;hpb=c4597dfe0b0de808b6e024b7d7e898e5ae14de19 diff --git a/configure.ac b/configure.ac index 532aea3..8dec569 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. # @@ -13,7 +13,25 @@ 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]) + +# 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 'sh boot'?" + exit 1 +fi + +AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args]) FP_SETUP_PROJECT_VERSION @@ -28,13 +46,6 @@ dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE. dnl We need 2.52 due to the use of AS_TR_CPP and AS_TR_SH. AC_PREREQ([2.52]) -dnl * Declare subdirectories that have a private configure script -dnl -dnl After the toplevel configuration is complete, the script will recurse into -dnl these subdirectories if they exist. The use of a cache file makes repeated -dnl checks cheap. -AC_CONFIG_SUBDIRS([libraries]) - # ------------------------------------------------------------------------- # Prepare to generate the following header files # @@ -48,6 +59,25 @@ if test x"$srcdir" != 'x.' ; then fi dnl-------------------------------------------------------------------- +dnl * Deal with arguments telling us gmp is somewhere odd +dnl-------------------------------------------------------------------- + +FP_ARG_GMP + +GMP_INCLUDE_DIRS= +GMP_LIB_DIRS= +if test "x$gmp_libraries" != "xNONE"; then + LDFLAGS="-L$gmp_libraries $LDFLAGS" + GMP_LIB_DIRS=$gmp_libraries +fi +if test "x$gmp_includes" != "xNONE"; then + CPPFLAGS="-I$gmp_includes $CPPFLAGS" + GMP_INCLUDE_DIRS=$gmp_includes +fi +AC_SUBST(GMP_INCLUDE_DIRS) +AC_SUBST(GMP_LIB_DIRS) + +dnl-------------------------------------------------------------------- dnl * Choose host(/target/build) platform dnl-------------------------------------------------------------------- @@ -70,6 +100,7 @@ if test x"$TargetPlatform" != x"$HostPlatform" ; then fi exeext='' +soext='.so' # # The following will be more difficult when we *are* cross-compiling. # Suitable names to slam in *_CPP are in platform.h.in. @@ -265,6 +296,7 @@ i[[3456]]86-*-cygwin*) HostVendor_CPP='unknown' HostOS_CPP='cygwin32' exeext='.exe' + soext='.dll' ;; i[[3456]]86-*-mingw32*) HostPlatform=i386-unknown-mingw32 # hack again @@ -275,6 +307,7 @@ i[[3456]]86-*-mingw32*) HostVendor_CPP='unknown' HostOS_CPP='mingw32' exeext='.exe' + soext='.dll' ;; i[[3456]]86-apple-darwin*) HostPlatform=i386-apple-darwin @@ -284,6 +317,7 @@ i[[3456]]86-apple-darwin*) HostArch_CPP='i386' HostVendor_CPP='apple' HostOS_CPP='darwin' + soext='.dylib' ;; i[[3456]]86-*-gnu*) HostPlatform=i386-unknown-gnu @@ -312,6 +346,16 @@ 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' + soext='.dylib' + ;; m68k-*-linux*) HostPlatform=m68k-unknown-linux # hack again TargetPlatform=m68k-unknown-linux @@ -387,6 +431,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 @@ -428,6 +481,7 @@ powerpc-apple-darwin*) HostArch_CPP='powerpc' HostVendor_CPP='apple' HostOS_CPP='darwin' + soext='.dylib' ;; powerpc-unknown-linux*) HostPlatform=powerpc-unknown-linux @@ -560,66 +614,7 @@ AC_SUBST(BuildVendor_CPP) AC_SUBST(TargetVendor_CPP) AC_SUBST(exeext) - -dnl -------------------------------------------------------------- -dnl * Calculate absolute path to build tree -dnl -------------------------------------------------------------- - -AC_MSG_CHECKING(for path to top of build tree) - -hardtop=`pwd` - -dnl Remove common automounter nonsense -dnl -hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' ` - -dnl Find 'hardtop_plat', the native format for 'hardtop' -dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes -dnl being escaped). -dnl -dnl Note OSTYPE: On Cygwin we need to use 'cygpath' to convert -dnl /cygdrive/c/foo to c:/foo but we must not do that if we -dnl aren't building using Cygwin (notably msys), because -dnl cygpath doesn't exist. It seems that 'bash' sets -dnl OSTYPE to 'cygwin' or 'msys' respectively, but cygwin's -dnl 'sh' does not. So we hackily assume that if the shell -dnl hasn't set it to 'msys' then we must be in Cygwin. -dnl Sigh. -dnl -dnl The Right Thing is probably to test $BuildPlatform -dnl instead, but we are sloppy about setting that correctly -dnl at the moment, so we just work around for now. -dnl -dnl The quotes round "$(OSTYPE)" are essential, for the -dnl Cygwin-sh case where OSTYPE is not set. -case $HostPlatform in - i386-unknown-mingw32 | i386-unknown-cygwin32) - if test "${OSTYPE}" != "msys" - then - # convert $hardtop to a path that mingw will understand too - cyghardtop=${hardtop} - hardtop=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@/@g'` - hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'` - else - hardtop_plat=${hardtop} - fi - ;; - *) - hardtop_plat=${hardtop} - ;; -esac -AC_SUBST(hardtop) -AC_SUBST(hardtop_plat) - -AC_MSG_RESULT(${hardtop}) - -# We don't support building in directories with spaces. -case "$hardtop" in - *' '*) AC_MSG_ERROR([ - The build system does not support building in a directory containing - space characters. Suggestion: move the build tree somewhere else.]) - ;; -esac +AC_SUBST(soext) dnl -------------------------------------------------------------- dnl * Project specific configuration options @@ -642,6 +637,8 @@ AC_ARG_WITH([ghc], WithGhc="$GHC"]) AC_SUBST([WithGhc]) +FP_FIND_ROOT + AC_ARG_WITH(hc, [AC_HELP_STRING([--with-hc=ARG], [Use ARG as the path to the compiler for compiling ordinary @@ -657,6 +654,18 @@ if test "$WithGhc" != ""; then AC_SUBST(GhcMajVersion)dnl AC_SUBST(GhcMinVersion)dnl AC_SUBST(GhcPatchLevel)dnl + GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'` + GhcCanonVersion="$GhcMajVersion$GhcMinVersion2" + if test $GhcCanonVersion -ge 601; then ghc_ge_601=YES; else ghc_ge_601=NO; fi + if test $GhcCanonVersion -ge 602; then ghc_ge_602=YES; else ghc_ge_602=NO; fi + if test $GhcCanonVersion -ge 603; then ghc_ge_603=YES; else ghc_ge_603=NO; fi + if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi + if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi + AC_SUBST(ghc_ge_601)dnl + AC_SUBST(ghc_ge_602)dnl + AC_SUBST(ghc_ge_603)dnl + AC_SUBST(ghc_ge_605)dnl + AC_SUBST(ghc_ge_607)dnl fi # Check whether this GHC has readline installed @@ -686,6 +695,25 @@ AC_ARG_WITH(gcc, ) AC_SUBST(WhatGccIsCalled) +dnl ** Which ld to use? +dnl -------------------------------------------------------------- +AC_ARG_WITH(ld, +[AC_HELP_STRING([--with-ld=ARG], + [Use ARG as the path to LD [default=autodetect]])], +[if test "x$HostPlatform" = "xi386-unknown-mingw32" + then + if test "${OSTYPE}" != "msys" + then + # Canonicalise to :/path/to/ld + withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' ` + fi + fi; + LD=$withval + FP_PROG_LD([$LD]) + ], + [FP_PROG_LD()] +) + dnl ** Booting from .hc files? dnl -------------------------------------------------------------- AC_ARG_ENABLE(hc-boot, @@ -848,8 +876,7 @@ dnl If gcc, make sure it's at least 2.1 dnl FP_HAVE_GCC FP_MINGW_GCC -FP_GCC_NEEDS_NO_OMIT_LFPTR -FP_GCC_HAS_NO_UNIT_AT_A_TIME +FP_GCC_EXTRA_FLAGS dnl ** figure out how to invoke cpp directly (gcc -E is no good) AC_PROG_CPP @@ -874,6 +901,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.]) @@ -899,7 +929,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 +992,6 @@ AC_SUBST(GhcLibsWithReadline) dnl ** check if it is safe to include both and 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]) @@ -1049,6 +1073,9 @@ dnl ** check whether this machine has gmp3 installed AC_CHECK_LIB(gmp, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp, AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp3, HaveLibGmp=NO; LibGmp=not-installed)) + if test $HaveLibGmp = YES; then + AC_DEFINE([HAVE_LIB_GMP], [1], [Define to 1 if GMP library is installed.]) + fi; AC_SUBST(HaveLibGmp) AC_SUBST(LibGmp) @@ -1123,6 +1150,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 +1164,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) @@ -1162,11 +1186,12 @@ AC_COMPILE_IFELSE( dnl ** check for librt AC_CHECK_LIB(rt, clock_gettime) -AC_CHECK_FUNCS(clock_gettime) +AC_CHECK_FUNCS(clock_gettime timer_create timer_settime) +FP_CHECK_TIMER_CREATE 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 +1215,19 @@ if test -n "$GTK_CONFIG"; then fi AC_SUBST([GTK_CONFIG]) -AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml]) +#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 extra-gcc-opts docs/users_guide/ug-book.xml]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT