X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=18af870f0b7f6326463c8fd31194dd76e2c3b12d;hp=c49271d5531962d177b0eca2149d04bf676374f9;hb=54e6de853bd5260389006e75d661877ef1ea951d;hpb=8efc5f209899b6e055c5957cd5efbb820ad596ee

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])