X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=51b04d6bc73a78bd069cc60eb08d9bdc01a9326b;hp=218b6419038dad68f393c5febf0081fc3c43b7a2;hb=302e2e29f2e1074bfba561e077a484dc4e1d15f6;hpb=e0064eda414b686fde7c600837cbad6e09007be8 diff --git a/configure.ac b/configure.ac index 218b641..51b04d6 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.11], [glasgow-haskell-bugs@haskell.org], [ghc]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.13], [glasgow-haskell-bugs@haskell.org], [ghc]) # Set this to YES for a released version, otherwise NO : ${RELEASE=NO} @@ -33,6 +33,17 @@ fi AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args]) +dnl ---------------------------------------------------------- +dnl ** Find unixy sort and find commands, +dnl ** which are needed by FP_SETUP_PROJECT_VERSION + +dnl ** Find find command (for Win32's benefit) +FP_PROG_FIND + +dnl ** Find sort command (for the benefit of Win32 environs) +FP_PROG_SORT + +dnl ---------------------------------------------------------- FP_SETUP_PROJECT_VERSION # Hmmm, we fix the RPM release number to 1 here... Is this convenient? @@ -58,25 +69,6 @@ if test x"$srcdir" != 'x.' ; then exit 1 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 * Project specific configuration options dnl -------------------------------------------------------------- @@ -97,48 +89,21 @@ AC_ARG_WITH([ghc], fi WithGhc="$GHC"]) -dnl ** Booting from unregisterised .hc files? +dnl ** Booting from .hc files? dnl -------------------------------------------------------------- -AC_ARG_ENABLE(hc-boot-unregisterised, -[AC_HELP_STRING([--enable-hc-boot-unregisterised], -[ With --enable-hc-boot, treat the intermediate .hc files as - unregisterised rather than registerised code. +AC_ARG_ENABLE(hc-boot, +[AC_HELP_STRING([--enable-hc-boot], +[Boot the Glasgow Haskell Compiler from intermediate .hc files. (This option is mostly of interest to porters.) [default=no]])], [ if test x"$enableval" = x"yes"; then - BootingFromUnregisterisedHc=YES + BootingFromHc=YES else - BootingFromUnregisterisedHc=NO + BootingFromHc=NO fi ], -[BootingFromUnregisterisedHc=NO] +[BootingFromHc=NO] ) -AC_SUBST(BootingFromUnregisterisedHc) - -if test "$BootingFromHc" = "NO"; then -if test "$BootingFromUnregisterisedHc" = "YES"; then -AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.]) -fi; -fi; - -dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on -if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then - if test "$WithGhc" = ""; then - AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.]) - fi - FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.8], - [AC_MSG_ERROR([GHC version 6.8 or later is required to compile GHC.])])dnl - - if test `expr $GhcMinVersion % 2` = "1"; then - echo $EnableBootstrapWithDevelSnaphost - if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then - AC_MSG_ERROR([ - $WithGhc is a development snapshot of GHC, version $GhcVersion. - Bootstrapping using this version of GHC is not supported, and may not - work. Use --enable-bootstrap-with-devel-snapshot to try it anyway, - or --with-ghc to specify a different GHC to use.]) - fi - fi -fi; +AC_SUBST(BootingFromHc) AC_ARG_ENABLE(bootstrap-with-devel-snapshot, [AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot], @@ -160,16 +125,38 @@ if test "$WithGhc" != ""; then AC_SUBST(GhcPatchLevel)dnl GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'` GhcCanonVersion="$GhcMajVersion$GhcMinVersion2" - if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi - if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi - AC_SUBST(ghc_ge_607)dnl - AC_SUBST(ghc_ge_609)dnl + FP_COMPARE_VERSIONS($GhcVersion,[-ge],[6.10.2], + [ghc_ge_6102=YES], [ghc_ge_6102=NO]) + if test $GhcCanonVersion -ge 611; then ghc_ge_611=YES; else ghc_ge_611=NO; fi + if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi + AC_SUBST(ghc_ge_6102)dnl + AC_SUBST(ghc_ge_611)dnl + AC_SUBST(ghc_ge_613)dnl fi +dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on +if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then + if test "$WithGhc" = ""; then + AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.]) + fi + FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.10], + [AC_MSG_ERROR([GHC version 6.10 or later is required to compile GHC.])])dnl + + if test `expr $GhcMinVersion % 2` = "1"; then + if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then + AC_MSG_ERROR([ + $WithGhc is a development snapshot of GHC, version $GhcVersion. + Bootstrapping using this version of GHC is not supported, and may not + work. Use --enable-bootstrap-with-devel-snapshot to try it anyway, + or --with-ghc to specify a different GHC to use.]) + fi + fi +fi; + # GHC is passed to Cabal, so we need a native path if test "${WithGhc}" != "" then - ghc_host=`${WithGhc} +RTS --info | grep 'Host platform' | sed -e 's/.*, "//' -e 's/")//'` + ghc_host=`"${WithGhc}" +RTS --info | grep 'Host platform' | sed -e 's/.*, "//' -e 's/")//'` if test "$ghc_host" = "i386-unknown-mingw32" then @@ -178,13 +165,35 @@ then WithGhc=`echo "${WithGhc}" | sed "s#^/\([a-zA-Z]\)/#\1:/#"` else # Canonicalise to :/path/to/ghc - WithGhc=`cygpath -m ${WithGhc}` + WithGhc=`cygpath -m "${WithGhc}"` fi echo "GHC path canonicalised to: ${WithGhc}" fi fi AC_SUBST([WithGhc]) +dnl ** Without optimization some INLINE trickery fails for GHCi +SRC_CC_OPTS="-O" + +dnl Allow to specify iconv options to the toplevel configure script +dnl so they can be properly passed to sub-builds. +dnl Note: ICONV_LIB_DIRS and ICONV_INCLUDE_DIRS are not predefined +dnl to the empty string to allow them to be overridden from the +dnl environment. + +AC_ARG_WITH([iconv-includes], + [AC_HELP_STRING([--with-iconv-includes], + [directory containing iconv.h])], + [ICONV_INCLUDE_DIRS=$withval]) + +AC_ARG_WITH([iconv-libraries], + [AC_HELP_STRING([--with-iconv-libraries], + [directory containing iconv library])], + [ICONV_LIB_DIRS=$withval]) + +AC_SUBST(ICONV_INCLUDE_DIRS) +AC_SUBST(ICONV_LIB_DIRS) + dnl-------------------------------------------------------------------- dnl * Choose host(/target/build) platform dnl-------------------------------------------------------------------- @@ -199,45 +208,92 @@ System types: --host=HOST cross-compile to build programs to run on HOST [guessed] --target=TARGET configure for building compilers for TARGET [guessed]]])dnl -if test "$build" = "" +if test "${WithGhc}" != "" +then + bootstrap_host=`"${WithGhc}" +RTS --info | grep '^ ,("Host platform"' | sed -e 's/.*, "//' -e 's/")//' | tr -d '\r'` + bootstrap_target=`"${WithGhc}" +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//' | tr -d '\r'` + if test "$bootstrap_host" != "$bootstrap_target" + then + echo "Bootstrapping GHC is a cross compiler. This probably isn't going to work" + fi +fi + +# We have to run these unconditionally, but we may discard their +# results in the following code +AC_CANONICAL_BUILD +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + +# If no argument was given for a configuration variable, then discard +# the guessed canonical system and use the configuration of the +# bootstrapping ghc. If an argument was given, map it from gnu format +# to ghc format. +# +# For why we do it this way, see: #3637, #1717, #2951 + +if test "$build_alias" = "" then if test "${WithGhc}" != "" then - build=`${WithGhc} +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//'` + build=$bootstrap_target echo "Build platform inferred as: $build" else echo "Can't work out build platform" exit 1 fi + + BuildArch=`echo "$build" | sed 's/-.*//'` + BuildVendor=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/'` + BuildOS=`echo "$build" | sed 's/.*-//'` +else + GHC_CONVERT_CPU([$build_cpu], [BuildArch]) + GHC_CONVERT_VENDOR([$build_vendor], [BuildVendor]) + GHC_CONVERT_OS([$build_os], [BuildOS]) fi -if test "$host" = "" +if test "$host_alias" = "" then if test "${WithGhc}" != "" then - host=`${WithGhc} +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//'` + host=$bootstrap_target echo "Host platform inferred as: $host" else echo "Can't work out host platform" exit 1 fi + + HostArch=`echo "$host" | sed 's/-.*//'` + HostVendor=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/'` + HostOS=`echo "$host" | sed 's/.*-//'` +else + GHC_CONVERT_CPU([$host_cpu], [HostArch]) + GHC_CONVERT_VENDOR([$host_vendor], [HostVendor]) + GHC_CONVERT_OS([$host_os], [HostOS]) fi -if test "$target" = "" +if test "$target_alias" = "" then if test "${WithGhc}" != "" then - target=`${WithGhc} +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//'` + target=$bootstrap_target echo "Target platform inferred as: $target" else echo "Can't work out target platform" exit 1 fi + + TargetArch=`echo "$target" | sed 's/-.*//'` + TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'` + TargetOS=`echo "$target" | sed 's/.*-//'` +else + GHC_CONVERT_CPU([$target_cpu], [TargetArch]) + GHC_CONVERT_VENDOR([$target_vendor], [TargetVendor]) + GHC_CONVERT_OS([$target_os], [TargetOS]) fi exeext='' soext='.so' -case $HostPlatform in +case $host in *-unknown-cygwin32) AC_MSG_WARN([GHC does not support the Cygwin target at the moment]) AC_MSG_WARN([I'm assuming you wanted to build for i386-unknown-mingw32]) @@ -249,11 +305,17 @@ case $HostPlatform in ;; i386-apple-darwin|powerpc-apple-darwin) soext='.dylib' + CFLAGS="$CFLAGS -m32" + LDFLAGS="$LDFLAGS -m32" + CONF_CC_OPTS="$CONF_CC_OPTS -m32" + CONF_LD_OPTS="$CONF_LD_OPTS -m32" ;; x86_64-apple-darwin) soext='.dylib' CFLAGS="$CFLAGS -m64" LDFLAGS="$LDFLAGS -m64" + CONF_CC_OPTS="$CONF_CC_OPTS -m64" + CONF_LD_OPTS="$CONF_LD_OPTS -m64" ;; esac @@ -281,49 +343,40 @@ checkVendor() { checkOS() { case $1 in - linux|freebsd|netbsd|openbsd|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix) + linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) ;; *) - echo "Unknown OS $1" + echo "Unknown OS '$1'" exit 1 ;; esac } -BuildPlatform=$build -BuildArch=`echo "$build" | sed 's/-.*//'` -BuildVendor=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/'` -BuildOS=`echo "$build" | sed 's/.*-//'` -BuildPlatform_CPP=`echo "$BuildPlatform" | sed 's/\.\|-/_/g'` -BuildArch_CPP=`echo "$BuildArch" | sed 's/\.\|-/_/g'` -BuildVendor_CPP=`echo "$BuildVendor" | sed 's/\.\|-/_/g'` -BuildOS_CPP=`echo "$BuildOS" | sed 's/\.\|-/_/g'` +BuildPlatform="$BuildArch-$BuildVendor-$BuildOS" +BuildPlatform_CPP=`echo "$BuildPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'` +BuildArch_CPP=` echo "$BuildArch" | sed -e 's/\./_/g' -e 's/-/_/g'` +BuildVendor_CPP=` echo "$BuildVendor" | sed -e 's/\./_/g' -e 's/-/_/g'` +BuildOS_CPP=` echo "$BuildOS" | sed -e 's/\./_/g' -e 's/-/_/g'` checkArch "$BuildArch" checkVendor "$BuildVendor" checkOS "$BuildOS" -HostPlatform=$host -HostArch=`echo "$host" | sed 's/-.*//'` -HostVendor=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/'` -HostOS=`echo "$host" | sed 's/.*-//'` -HostPlatform_CPP=`echo "$HostPlatform" | sed 's/\.\|-/_/g'` -HostArch_CPP=`echo "$HostArch" | sed 's/\.\|-/_/g'` -HostVendor_CPP=`echo "$HostVendor" | sed 's/\.\|-/_/g'` -HostOS_CPP=`echo "$HostOS" | sed 's/\.\|-/_/g'` +HostPlatform="$HostArch-$HostVendor-$HostOS" +HostPlatform_CPP=`echo "$HostPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'` +HostArch_CPP=` echo "$HostArch" | sed -e 's/\./_/g' -e 's/-/_/g'` +HostVendor_CPP=` echo "$HostVendor" | sed -e 's/\./_/g' -e 's/-/_/g'` +HostOS_CPP=` echo "$HostOS" | sed -e 's/\./_/g' -e 's/-/_/g'` checkArch "$HostArch" checkVendor "$HostVendor" checkOS "$HostOS" -TargetPlatform=$target -TargetArch=`echo "$target" | sed 's/-.*//'` -TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'` -TargetOS=`echo "$target" | sed 's/.*-//'` -TargetPlatform_CPP=`echo "$TargetPlatform" | sed 's/\.\|-/_/g'` -TargetArch_CPP=`echo "$TargetArch" | sed 's/\.\|-/_/g'` -TargetVendor_CPP=`echo "$TargetVendor" | sed 's/\.\|-/_/g'` -TargetOS_CPP=`echo "$TargetOS" | sed 's/\.\|-/_/g'` +TargetPlatform="$TargetArch-$TargetVendor-$TargetOS" +TargetPlatform_CPP=`echo "$TargetPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'` +TargetArch_CPP=` echo "$TargetArch" | sed -e 's/\./_/g' -e 's/-/_/g'` +TargetVendor_CPP=` echo "$TargetVendor" | sed -e 's/\./_/g' -e 's/-/_/g'` +TargetOS_CPP=` echo "$TargetOS" | sed -e 's/\./_/g' -e 's/-/_/g'` checkArch "$TargetArch" checkVendor "$TargetVendor" @@ -363,125 +416,72 @@ AC_SUBST(WithHc) AC_PATH_PROGS(NHC,nhc nhc98) AC_PATH_PROG(HBC,hbc) +# This uses GHC, so put it after the "GHC is required" check above: +FP_FIND_ROOT + +if test "$HostOS" = "mingw32" +then + CC="$hardtop/inplace/mingw/bin/gcc.exe" + LD="$hardtop/inplace/mingw/bin/ld.exe" + NM="$hardtop/inplace/mingw/bin/nm.exe" + if ! test -d inplace/mingw || + test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.gz || + test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.gz || + test inplace/mingw -ot ghc-tarballs/mingw/gcc-g++*.tar.gz || + test inplace/mingw -ot ghc-tarballs/mingw/libcrypt*.tar.bz2 || + test inplace/mingw -ot ghc-tarballs/mingw/mingw-runtime*.tar.gz || + test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.gz + then + AC_MSG_NOTICE([Making in-tree mingw tree]) + rm -rf inplace/mingw + mkdir inplace + mkdir inplace/mingw + ( + cd inplace/mingw && + tar -zxf ../../ghc-tarballs/mingw/binutils*.tar.gz && + tar -zxf ../../ghc-tarballs/mingw/gcc-core*.tar.gz && + tar -zxf ../../ghc-tarballs/mingw/gcc-g++*.tar.gz && + tar -jxf ../../ghc-tarballs/mingw/libcrypt*.tar.bz2 && + tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz && + tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz && + mv bin/gcc.exe bin/realgcc.exe + ) + inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe + AC_MSG_NOTICE([In-tree mingw tree created]) + fi + if ! test -d inplace/perl || + test inplace/perl -ot ghc-tarballs/perl/ghc-perl*.tar.gz + then + AC_MSG_NOTICE([Making in-tree perl tree]) + rm -rf inplace/perl + mkdir inplace + mkdir inplace/perl + ( + cd inplace/perl && + tar -zxf ../../ghc-tarballs/perl/ghc-perl*.tar.gz + ) + AC_MSG_NOTICE([In-tree perl tree created]) + fi +fi + dnl ** Which gcc to use? dnl -------------------------------------------------------------- -AC_ARG_WITH(gcc, -[AC_HELP_STRING([--with-gcc=ARG], - [Use ARG as the path to GCC [default=autodetect]])], -[WhatGccIsCalled="$withval" - if test "x$HostPlatform" = "xi386-unknown-mingw32" && \ - test "${OSTYPE}" != "msys" && \ - test "${withval}" != "" - then - # Canonicalise to :/path/to/gcc - withval=`cygpath -m ${withval}` - fi; - CC="$withval" - export CC - ], -[WhatGccIsCalled="gcc"] -) +FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) +export CC +WhatGccIsCalled="$CC" 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" && \ - test "${OSTYPE}" != "msys" && \ - test "${withval}" != "" - then - # Canonicalise to :/path/to/ld - withval=`cygpath -m ${withval}` - fi; - LD=$withval - FP_PROG_LD([$LD]) - ], - [FP_PROG_LD()] -) - -dnl ** Build shared and/or static libs? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(shared, -[AC_HELP_STRING([--enable-shared], -[Build shared libraries, if available (EXPERIMENTAL, non-working). [default=no]])], -[ if test x"$enableval" = x"yes"; then - AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time]) - BuildSharedLibs=YES - else - BuildSharedLibs=NO - fi -], -[BuildSharedLibs=NO] -) -AC_SUBST(BuildSharedLibs) - -# ToDo later: -# AC_ARG_ENABLE(static, -# [AC_HELP_STRING([--enable-static], -# [Build static libraries. [default=yes]])], -# [ if test x"$enableval" = x"yes"; then -# BuildStaticLibs=YES -# else -# BuildStaticLibs=NO -# fi -# ], -# [BuildStaticLibs=YES] -# ) -# AC_SUBST(BuildStaticLibs) - -dnl ** Booting from .hc files? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(hc-boot, -[AC_HELP_STRING([--enable-hc-boot], -[Boot the Glasgow Haskell Compiler from intermediate .hc files. - (This option is mostly of interest to porters.) [default=no]])], -[ if test x"$enableval" = x"yes"; then - BootingFromHc=YES - else - BootingFromHc=NO - fi -], -[BootingFromHc=NO] -) -AC_SUBST(BootingFromHc) - -# This uses GHC, so put it after the "GHC is required" check above: -FP_FIND_ROOT +FP_ARG_WITH_PATH_GNU_PROG([LD], [ld]) +LdCmd="$LD" +AC_SUBST([LdCmd]) -dnl ** Enable the construction of Win32 DLLs? +dnl ** Which nm to use? dnl -------------------------------------------------------------- -dnl -dnl [ The ability to build the RTS and libraries as separate DLLs used -dnl to be supported, but isn't currently (updates to the RTS, compiler -dnl and build system would be required to bring it back again.) -dnl Hence, exposing it as an option is false advertisement, so better -dnl disable it to avoid confusion (but leave it commented-out rather -dnl than removed in order to remind ourselves to bring back the -dnl feature at some stage.) ] -dnl -dnl AC_ARG_ENABLE(win32-dlls, -dnl [ --enable-win32-dlls -dnl If on a Win32 platform running mingw32/cygwin, enable the -dnl construction of DLLs containing ghc-compiled code. -dnl ], -dnl [ -dnl case $HostOS_CPP in -dnl cygwin32) ;; -dnl mingw32) ;; -dnl *) echo "Unrecognised win32 platform: $HostPlatform" -dnl exit 1 -dnl ;; -dnl esac -dnl EnableWin32DLLs=YES -dnl ], -dnl [EnableWin32DLLs=NO] -dnl ) -dnl AC_SUBST(EnableWin32DLLs) -dnl if test x"$EnableWin32DLLs" = "xYES" ; then -dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT) -dnl fi +FP_ARG_WITH_PATH_GNU_PROG([NM], [nm]) +NmCmd="$NM" +AC_SUBST([NmCmd]) dnl ** Mac OS X: explicit deployment target dnl -------------------------------------------------------------- @@ -555,30 +555,17 @@ dnl Figure out which C compiler to use. Gcc is preferred. dnl If gcc, make sure it's at least 2.1 dnl FP_HAVE_GCC -FP_MINGW_GCC FP_GCC_EXTRA_FLAGS dnl ** figure out how to invoke cpp directly (gcc -E is no good) AC_PROG_CPP -dnl ** Without optimization some INLINE trickery fails for GHCi -SRC_CC_OPTS="-O" - -SRC_CC_OPTS="$SRC_CC_OPTS $CFLAGS" -SRC_LD_OPTS="$SRC_LD_OPTS $LDFLAGS" - -AC_SUBST(SRC_CC_OPTS) -AC_SUBST(SRC_LD_OPTS) +AC_SUBST(CONF_CC_OPTS) +AC_SUBST(CONF_LD_OPTS) dnl ** figure out how to do context diffs FP_PROG_CONTEXT_DIFF -dnl ** Find find command (for Win32's benefit) -FP_PROG_FIND - -dnl ** Find sort command (for the benefit of Win32 environs) -FP_PROG_SORT - 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 @@ -589,6 +576,7 @@ 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.]) dnl ** how to invoke `ar' and `ranlib' +FP_PROG_AR_SUPPORTS_ATFILE FP_PROG_AR_NEEDS_RANLIB FP_PROG_AR_SUPPORTS_INPUT @@ -597,7 +585,7 @@ AC_PROG_LN_S dnl ** Find the path to sed -AC_PATH_PROG(SedCmd,sed) +AC_PATH_PROGS(SedCmd,gsed sed,sed) dnl ** check for time command @@ -605,12 +593,22 @@ AC_PATH_PROG(TimeCmd,time) dnl ** check for tar dnl if GNU tar is named gtar, look for it first. -AC_PATH_PROGS(TarCmd,gtar tar,tar) +AC_PATH_PROGS(TarCmd,gnutar gtar tar,tar) dnl ** check for patch dnl if GNU patch is named gpatch, look for it first AC_PATH_PROGS(PatchCmd,gpatch patch, patch) +dnl ** check for dtrace (currently only implemented for Mac OS X) +HaveDtrace=NO +AC_PATH_PROG(DtraceCmd,dtrace) +if test -n "$DtraceCmd"; then + if test "x$TargetOS_CPP-$TargetVendor_CPP" == "xdarwin-apple"; then + HaveDtrace=YES + fi +fi +AC_SUBST(HaveDtrace) + AC_PATH_PROG(HSCOLOUR,HsColour) # HsColour is passed to Cabal, so we need a native path if test "x$HostPlatform" = "xi386-unknown-mingw32" && \ @@ -623,8 +621,7 @@ fi 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/xml/docbook/xsl-stylesheets* /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_DOCBOOK_XSL FP_PROG_DBLATEX FP_PROG_HSTAGS @@ -644,9 +641,6 @@ if test "$BootingFromHc" = "NO"; then FPTOOLS_ALEX fi; -dnl Check we have an acceptable version of windres -FPTOOLS_WINDRES - dnl -------------------------------------------------- dnl ### program checking section ends here ### dnl -------------------------------------------------- @@ -663,7 +657,7 @@ dnl off_t, because it will affect the result of that test. AC_SYS_LARGEFILE dnl ** check for specific header (.h) files that we are interested in -AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h sched.h]) +AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h sched.h]) dnl ** check if it is safe to include both and AC_HEADER_TIME @@ -741,7 +735,7 @@ fi dnl ** check for more functions dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too. -AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r, sched_setaffinity]) +AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r sched_setaffinity setlocale]) AC_TRY_RUN([ #include @@ -762,36 +756,6 @@ AC_CHECK_DECLS([ctime_r], , , #define _POSIX_C_SOURCE 199506L #include ]) -dnl ** For ghc/rts/gmp: -AC_CHECK_FUNCS([getpagesize]) - -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) - -dnl ** (Mac OS X only: check for GMP.framework) -HaveFrameworkGMP=NO -case $HostPlatform in -*-apple-darwin) - AC_MSG_CHECKING([for GMP.framework]) - save_libs="$LIBS" - LIBS="-framework GMP" - AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,) - if test $HaveFrameworkGMP = YES; then - AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).]) - fi; - LIBS="$save_libs" - AC_MSG_RESULT([$HaveFrameworkGMP]) - ;; -esac -AC_SUBST(HaveFrameworkGMP) - dnl ** check for mingwex library AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO) AC_SUBST(HaveLibMingwEx) @@ -800,24 +764,19 @@ if test $HaveLibMingwEx = YES ; then AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.]) fi -if test "$HaveLibGmp" = "NO"; then -if test "$HostArch_CPP" = "ia64" -o "$HostArch_CPP" = "mipseb" ; then -AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64 or mips64).]) -fi; -fi; +dnl ** check for math library +dnl Keep that check as early as possible. +dnl as we need to know whether we need libm +dnl for math functions or not +dnl (see http://hackage.haskell.org/trac/ghc/ticket/3730) +AC_SEARCH_LIBS(atan, m, + [AC_DEFINE([HAVE_LIBM], [1], [Define to 1 if you need to link with libm])]) dnl ** check whether this machine has BFD and liberty installed (used for debugging) dnl the order of these tests matters: bfd needs liberty AC_CHECK_LIB(iberty, xmalloc) AC_CHECK_LIB(bfd, bfd_init) -dnl ** check for math library -AC_CHECK_FUNC(atan,[fp_libm_not_needed=yes;LIBM=],[fp_libm_not_needed=dunno]) -if test x"$fp_libm_not_needed" = xdunno; then - AC_CHECK_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"],[LIBM=]) -fi -AC_SUBST([LIBM]) - dnl ################################################################ dnl Check for libraries dnl ################################################################ @@ -917,6 +876,8 @@ AC_CHECK_HEADER([papi.h], [HavePapiHeader=YES], [HavePapiHeader=NO]) AC_SUBST(HavePapiLib) AC_SUBST(HavePapiHeader) +AC_CHECK_FUNCS(__mingw_vfprintf) + if test "$HavePapiLib" = "YES" -a "$HavePapiHeader" = "YES"; then HavePapi=YES else @@ -924,7 +885,7 @@ else fi AC_SUBST(HavePapi) -if test "$DIR_DOCBOOK_XSL" = "" || +if test "$HAVE_DOCBOOK_XSL" = "NO" || test "$XsltprocCmd" = "" then BUILD_DOCBOOK_HTML=NO @@ -944,7 +905,17 @@ fi AC_SUBST(BUILD_DOCBOOK_PS) AC_SUBST(BUILD_DOCBOOK_PDF) -AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml]) +LIBRARY_VERSION(base) +LIBRARY_VERSION(Cabal) +LIBRARY_VERSION(ghc-prim) +LIBRARY_ghc_VERSION="$ProjectVersion" +AC_SUBST(LIBRARY_ghc_VERSION) + +if grep ' ' compiler/ghc.cabal.in 2>&1 >/dev/null; then + AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them]) +fi + +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/ghc.iss distrib/configure.ac]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT @@ -994,10 +965,12 @@ echo ["\ which is version : $GccVersion ld : $LdCmd - Happy : $HappyCmd - Alex : $AlexCmd + Happy : $HappyCmd ($HappyVersion) + Alex : $AlexCmd ($AlexVersion) Python : $PythonCmd - Perl : $PerlCmd"] + Perl : $PerlCmd + dblatex : $DblatexCmd + xsltproc : $XsltprocCmd"] if test "$HSCOLOUR" = ""; then echo [" @@ -1009,11 +982,10 @@ echo ["\ "] fi -echo "Building DocBook HTML documentation: $BUILD_DOCBOOK_HTML" -echo "Building DocBook PS documentation: $BUILD_DOCBOOK_PS" -echo "Building DocBook PDF documentation: $BUILD_DOCBOOK_PDF" - -echo ["Building shared libraries : $BuildSharedLibs"] +echo ["\ + Building DocBook HTML documentation : $BUILD_DOCBOOK_HTML + Building DocBook PS documentation : $BUILD_DOCBOOK_PS + Building DocBook PDF documentation : $BUILD_DOCBOOK_PDF"] echo ["---------------------------------------------------------------------- "]