From: Simon Marlow <marlowsd@gmail.com>
Date: Mon, 10 Nov 2008 13:43:18 +0000 (+0000)
Subject: Fix bootstrap with 6.10.1 on Windows
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e580dd581da9e9549d6fc6e09a8ac164863a96d0;p=ghc-hetmet.git

Fix bootstrap with 6.10.1 on Windows
ghc-pkg doesn't understand the old syntax any more, so 'ghc-pkg -l' fails
---

diff --git a/aclocal.m4 b/aclocal.m4
index c49271d..18af870 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -927,6 +927,9 @@ AC_DEFUN([FP_PROG_GHC_PKG],
 [fp_ghc_pkg_guess=`echo $WithGhc | sed 's,ghc\(@<:@^/\\@:>@*\)$,ghc-pkg\1,'`
 if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1; then
   fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess
+elif "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then
+  # from 6.10, ghc-pkg doesn't support the old -l syntax any more
+  fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess
 else
   fp_cv_matching_ghc_pkg=no
 fi])