From 0b66987266f5fa43a43339e468a11a5268366c4e Mon Sep 17 00:00:00 2001
From: Lennart Kolmodin <kolmodin@google.com>
Date: Wed, 20 Jul 2011 15:14:03 +0200
Subject: [PATCH] Fix path to Cabal library, corrects documentation.

---
 aclocal.m4   | 6 ++++--
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index f8dafaca5f3f..680e0a8efe59 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)
 ])
 
diff --git a/configure.ac b/configure.ac
index 32a425e917cf..832bab01143c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -916,7 +916,7 @@ AC_SUBST(BUILD_DOCBOOK_PS)
 AC_SUBST(BUILD_DOCBOOK_PDF)
 
 LIBRARY_VERSION(base)
-LIBRARY_VERSION(Cabal)
+LIBRARY_VERSION(Cabal, Cabal/cabal)
 LIBRARY_VERSION(ghc-prim)
 LIBRARY_ghc_VERSION="$ProjectVersion"
 AC_SUBST(LIBRARY_ghc_VERSION)
-- 
GitLab