diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 406a4a60d4..aba71a3eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -160,9 +160,9 @@ FP_COMPARE_VERSIONS([$GhcVersion],[-gt],[7.7], AC_SUBST(CMM_SINK_BOOTSTRAP_IS_NEEDED) FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.9], - SUPPORTS_PACKAGE_KEY=NO, - SUPPORTS_PACKAGE_KEY=YES) -AC_SUBST(SUPPORTS_PACKAGE_KEY) + SUPPORTS_COMPONENT_ID=NO, + SUPPORTS_COMPONENT_ID=YES) +AC_SUBST(SUPPORTS_COMPONENT_ID) # GHC is passed to Cabal, so we need a native path if test "${WithGhc}" != "" @@ -553,8 +553,10 @@ esac # tools we are looking for. In the past, GHC supported a number of # versions of LLVM simultaneously, but that stopped working around # 3.5/3.6 release of LLVM. -LlvmVersion=3.6 +LlvmVersion=3.7 AC_SUBST([LlvmVersion]) +sUPPORTED_LLVM_VERSION=$(echo \($LlvmVersion\) | sed 's/\./,/') +AC_DEFINE_UNQUOTED([sUPPORTED_LLVM_VERSION], ${sUPPORTED_LLVM_VERSION}, [The supported LLVM version number]) dnl ** Which LLVM llc to use? dnl -------------------------------------------------------------- @@ -768,10 +770,11 @@ then HSCOLOUR=`cygpath -m ${HSCOLOUR}` fi -dnl ** check for DocBook toolchain -FP_CHECK_DOCBOOK_DTD -FP_DOCBOOK_XSL -FP_PROG_DBLATEX +dnl ** check for Sphinx toolchain +AC_PATH_PROG(SPHINXBUILD,sphinx-build) + +dnl ** check for xelatex +AC_PATH_PROG(XELATEX,xelatex) dnl ** check for ghc-pkg command FP_PROG_GHC_PKG @@ -1092,25 +1095,22 @@ if test "$use_large_address_space" = "yes" ; then AC_DEFINE([USE_LARGE_ADDRESS_SPACE], [1], [Enable single heap address space support]) fi -if test "$HAVE_DOCBOOK_XSL" = "NO" || - test "$XsltprocCmd" = "" -then - BUILD_DOCBOOK_HTML=NO -else - BUILD_DOCBOOK_HTML=YES -fi -AC_SUBST(BUILD_DOCBOOK_HTML) - -if test "$DblatexCmd" = "" -then - BUILD_DOCBOOK_PS=NO - BUILD_DOCBOOK_PDF=NO +if test -n "$SPHINXBUILD"; then + BUILD_MAN=YES + BUILD_SPHINX_HTML=YES + if test -n "$XELATEX"; then + BUILD_SPHINX_PDF=YES + else + BUILD_SPHINX_PDF=NO + fi else - BUILD_DOCBOOK_PS=YES - BUILD_DOCBOOK_PDF=YES + BUILD_MAN=NO + BUILD_SPHINX_HTML=NO + BUILD_SPHINX_PDF=NO fi -AC_SUBST(BUILD_DOCBOOK_PS) -AC_SUBST(BUILD_DOCBOOK_PDF) +AC_SUBST(BUILD_MAN) +AC_SUBST(BUILD_SPHINX_HTML) +AC_SUBST(BUILD_SPHINX_PDF) LIBRARY_VERSION(base) LIBRARY_VERSION(Cabal, Cabal/Cabal) @@ -1122,7 +1122,7 @@ 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 utils/runghc/runghc.cabal settings docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/configure.ac]) +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac]) AC_OUTPUT # We got caught by @@ -1181,8 +1181,8 @@ echo ["\ Happy : $HappyCmd ($HappyVersion) Alex : $AlexCmd ($AlexVersion) Perl : $PerlCmd - dblatex : $DblatexCmd - xsltproc : $XsltprocCmd + sphinx-build : $SPHINXBUILD + xelatex : $XELATEX Using LLVM tools llc : $LlcCmd @@ -1199,9 +1199,8 @@ echo ["\ fi echo ["\ - Can build DocBook HTML documentation : $BUILD_DOCBOOK_HTML - Can build DocBook PS documentation : $BUILD_DOCBOOK_PS - Can build DocBook PDF documentation : $BUILD_DOCBOOK_PDF"] + Tools to build Sphinx HTML documentation available: $BUILD_SPHINX_HTML + Tools to build Sphinx PDF documentation available: $BUILD_SPHINX_PDF"] echo ["---------------------------------------------------------------------- "] |