diff options
| author | Lennart Kolmodin <kolmodin@google.com> | 2011-07-20 15:14:03 +0200 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-08-02 21:25:54 +0100 |
| commit | 7dca6c2b5a32204903da0b77752f810ea01dc4c6 (patch) | |
| tree | 6be153784b71d39cadca3518b77d707b4d4fbebd /aclocal.m4 | |
| parent | bcfa64ac0d3167f765a632a721d6f6b741cd1c8a (diff) | |
| download | haskell-7dca6c2b5a32204903da0b77752f810ea01dc4c6.tar.gz | |
Fix path to Cabal library, corrects documentation.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index f8dafaca5f..680e0a8efe 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1570,12 +1570,14 @@ fi AC_SUBST($1) ]) -# LIBRARY_VERSION(lib) +# LIBRARY_VERSION(lib, [dir]) # -------------------------------- # Gets the version number of a library. # If $1 is ghc-prim, then we define LIBRARY_ghc_prim_VERSION as 1.2.3 +# $2 points to the directory under libraries/ AC_DEFUN([LIBRARY_VERSION],[ -LIBRARY_[]translit([$1], [-], [_])[]_VERSION=`grep -i "^version:" libraries/$1/$1.cabal | sed "s/.* //"` +dir=m4_default([$2],[$1]) +LIBRARY_[]translit([$1], [-], [_])[]_VERSION=`grep -i "^version:" libraries/${dir}/$1.cabal | sed "s/.* //"` AC_SUBST(LIBRARY_[]translit([$1], [-], [_])[]_VERSION) ]) |