X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=38ba4b7ba82b45551a8eb5cb16dfb62dd8c1cbd3;hp=a2e4e1d69aadc3d4ff4de9ef349c769997606f38;hb=aedb94f5f220b5e442b23ecc445fd38c8d9b6ba0;hpb=89ce706af6ca2670600b510bf8be8bce0b4fe9ef diff --git a/configure.ac b/configure.ac index a2e4e1d..38ba4b7 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.9], [glasgow-haskell-bugs@haskell.org], [ghc]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11], [glasgow-haskell-bugs@haskell.org], [ghc]) # Set this to YES for a released version, otherwise NO : ${RELEASE=NO} @@ -644,6 +644,14 @@ AC_ARG_WITH([ghc], AC_PATH_PROG([GHC], [ghc]) fi WithGhc="$GHC"]) +# GHC is passed to Cabal, so we need a native path +if test "x$HostPlatform" = "xi386-unknown-mingw32" && \ + test "${OSTYPE}" != "msys" && \ + test "${WithGhc}" != "" +then + # Canonicalise to :/path/to/ghc + WithGhc=`cygpath -m ${WithGhc}` +fi AC_SUBST([WithGhc]) AC_ARG_WITH(hc, @@ -663,15 +671,31 @@ if test "$WithGhc" != ""; then AC_SUBST(GhcPatchLevel)dnl GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'` GhcCanonVersion="$GhcMajVersion$GhcMinVersion2" - 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_605)dnl + 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 fi # Check whether this GHC has editline installed FP_GHC_HAS_EDITLINE +# Dummy arguments to print help for --with-editline-* arguments. +# Those are actually passed to the editline package's configure script +# via the CONFIGURE_ARGS variable in mk/config.mk +AC_ARG_WITH(dummy-editline-includes, + [AC_HELP_STRING([--with-editline-includes], + [directory containing editline/editline.h or editline/readline.h])], + [], + []) + +AC_ARG_WITH(dummy-editline-libraries, + [AC_HELP_STRING([--with-editline-libraries], + [directory containing the editline library])], + [], + []) + + AC_PATH_PROGS(NHC,nhc nhc98) AC_PATH_PROG(HBC,hbc) @@ -681,13 +705,12 @@ 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" - then - if test "${OSTYPE}" != "msys" - then - # Canonicalise to :/path/to/gcc - withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' ` - fi + 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 @@ -701,13 +724,12 @@ 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 +[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]) @@ -715,6 +737,36 @@ AC_ARG_WITH(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, @@ -759,8 +811,8 @@ 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.4], - [AC_MSG_ERROR([GHC version 6.4 or later is required to compile GHC.])])dnl + FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.6], + [AC_MSG_ERROR([GHC version 6.6 or later is required to compile GHC.])])dnl fi; # This uses GHC, so put it after the "GHC is required" check above: @@ -799,35 +851,6 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then dnl AC_DEFINE(HAVE_WIN32_DLL_SUPPORT) dnl fi -dnl ** Enable the building of the ObjectIO? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(objectio, -[AC_HELP_STRING([--enable-objectio], -[Build ObjectIO, a portable GUI library for Haskell. [default=no]])], -[ if test x"$enableval" = x"yes"; then - GhcLibsWithObjectIO=YES - else - GhcLibsWithObjectIO=NO - fi -], -[GhcLibsWithObjectIO=NO] -) -AC_SUBST(GhcLibsWithObjectIO) - -dnl ** .NET interop support? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(dotnet, -[AC_HELP_STRING([--enable-dotnet], -[Build .NET interop layer. [default=no]])], -[ if test x"$enableval" = x"yes"; then - DotnetSupport=YES; AC_DEFINE([WANT_DOTNET_SUPPORT], [1], [Define to 1 if you want to include .NET interop support.]) - else - DotnetSupport=NO - fi], -[DotnetSupport=NO] -) -AC_SUBST(DotnetSupport) - dnl ** Mac OS X: explicit deployment target dnl -------------------------------------------------------------- AC_ARG_WITH([macosx-deployment-target], @@ -909,10 +932,6 @@ AC_PROG_CPP dnl ** Without optimization some INLINE trickery fails for GHCi SRC_CC_OPTS="-O" -dnl ** Try to add -mno-cygwin to the C compiler options -FP_CHECK_FLAG([-mno-cygwin], [ -SRC_CC_OPTS="-mno-cygwin $SRC_CC_OPTS" -CPPFLAGS="-mno-cygwin $CPPFLAGS"]) AC_SUBST(SRC_CC_OPTS) dnl ** figure out how to do context diffs @@ -954,13 +973,12 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar) AC_PATH_PROG(HSCOLOUR,HsColour) # HsColour is passed to Cabal, so we need a native path -if test "x$HostPlatform" = "xi386-unknown-mingw32" - then - if test "${OSTYPE}" != "msys" - then - # Canonicalise to :/path/to/gcc - HSCOLOUR=`cygpath -w ${HSCOLOUR} | sed -e 's@\\\\@/@g' ` - fi +if test "x$HostPlatform" = "xi386-unknown-mingw32" && \ + test "${OSTYPE}" != "msys" && \ + test "${HSCOLOUR}" != "" +then + # Canonicalise to :/path/to/gcc + HSCOLOUR=`cygpath -m ${HSCOLOUR}` fi dnl ** check for DocBook toolchain @@ -986,15 +1004,15 @@ if test "$BootingFromHc" = "NO"; then FPTOOLS_HAPPY fi; -dnl ** check for installed haddock -FPTOOLS_HADDOCK - dnl ** check for installed alex binary + version dnl (don't do it if we're booting from .hc files though.) 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 -------------------------------------------------- @@ -1259,6 +1277,6 @@ else fi AC_SUBST(HavePapi) -AC_CONFIG_FILES([mk/config.mk ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml]) +AC_CONFIG_FILES([mk/config.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT