Commit 59c023ba authored by Adam Sandberg Eriksson's avatar Adam Sandberg Eriksson Committed by Marge Bot
Browse files

configure: correctly generate LIBRARY_template_haskell_VERSION

parent 74311e10
...@@ -2127,14 +2127,14 @@ fi ...@@ -2127,14 +2127,14 @@ fi
AC_SUBST($1) AC_SUBST($1)
]) ])
# LIBRARY_VERSION(lib, [dir]) # LIBRARY_VERSION(lib, [cabal_file])
# -------------------------------- # --------------------------------
# Gets the version number of a library. # Gets the version number of a library.
# If $1 is ghc-prim, then we define LIBRARY_ghc_prim_VERSION as 1.2.3 # If $1 is ghc-prim, then we define LIBRARY_ghc_prim_VERSION as 1.2.3
# $2 points to the directory under libraries/ # $2 points to the directory under libraries/
AC_DEFUN([LIBRARY_VERSION],[ AC_DEFUN([LIBRARY_VERSION],[
dir=m4_default([$2],[$1]) cabal_file=m4_default([$2],[$1/$1.cabal])
LIBRARY_[]translit([$1], [-], [_])[]_VERSION=`grep -i "^version:" libraries/${dir}/$1.cabal | sed "s/.* //"` LIBRARY_[]translit([$1], [-], [_])[]_VERSION=`grep -i "^version:" libraries/${cabal_file} | sed "s/.* //"`
AC_SUBST(LIBRARY_[]translit([$1], [-], [_])[]_VERSION) AC_SUBST(LIBRARY_[]translit([$1], [-], [_])[]_VERSION)
]) ])
......
...@@ -1370,8 +1370,10 @@ dnl ** Determine library versions ...@@ -1370,8 +1370,10 @@ dnl ** Determine library versions
dnl The packages below should include all packages needed by dnl The packages below should include all packages needed by
dnl doc/users_guide/ghc_config.py.in. dnl doc/users_guide/ghc_config.py.in.
LIBRARY_VERSION(base) LIBRARY_VERSION(base)
LIBRARY_VERSION(Cabal, Cabal/Cabal) LIBRARY_VERSION(Cabal, Cabal/Cabal/Cabal.cabal)
LIBRARY_VERSION(template-haskell) dnl template-haskell.cabal is generated later
dnl but the .in file already has the version
LIBRARY_VERSION(template-haskell, template-haskell/template-haskell.cabal.in)
LIBRARY_VERSION(array) LIBRARY_VERSION(array)
LIBRARY_VERSION(ghc-prim) LIBRARY_VERSION(ghc-prim)
LIBRARY_VERSION(ghc-compact) LIBRARY_VERSION(ghc-compact)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment