diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-09-27 09:04:44 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-11-03 15:24:32 -0500 |
| commit | 2c0df86370ef70e439043a59b5c7d95b6c8f8319 (patch) | |
| tree | 9e03859dde929e2ad59e057b746c9f080930e4f8 | |
| parent | 2fe94000245b65c770e271612126739d4090cf98 (diff) | |
| download | haskell-2c0df86370ef70e439043a59b5c7d95b6c8f8319.tar.gz | |
configure: Determine library versions of template-haskell, et al.
These are needed by the user guide documentation. Fixes #17260.
(cherry picked from commit 0c53d0aa87d884707f77beea4f42b59d056116ea)
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | docs/users_guide/ghc_config.py.in | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e4c4b02fb4..c4494581f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1290,8 +1290,14 @@ AC_SUBST(BUILD_MAN) AC_SUBST(BUILD_SPHINX_HTML) AC_SUBST(BUILD_SPHINX_PDF) +dnl ** Determine library versions +dnl The packages below should include all packages needed by +dnl doc/users_guide/ghc_config.py.in. LIBRARY_VERSION(base) LIBRARY_VERSION(Cabal, Cabal/Cabal) +LIBRARY_VERSION(template-haskell) +LIBRARY_VERSION(parallel) +LIBRARY_VERSION(array) LIBRARY_VERSION(ghc-prim) LIBRARY_VERSION(ghc-compact) LIBRARY_ghc_VERSION="$ProjectVersion" diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in index 4ff77adc9d..f61ff354ac 100644 --- a/docs/users_guide/ghc_config.py.in +++ b/docs/users_guide/ghc_config.py.in @@ -4,6 +4,9 @@ extlinks = { } libs_base_uri = '../libraries' + +# N.B. If you add a package to this list be sure to also add a corresponding +# LIBRARY_VERSION macro call to configure.ac. lib_versions = { 'base': '@LIBRARY_base_VERSION@', 'ghc-prim': '@LIBRARY_ghc_prim_VERSION@', |