[commit: Cabal] master: Include testsuites and benchmarks in external deps when enabled (596d0cf)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/596d0cf3337863f9f49088250f17cd2a4cb84ac7

>---------------------------------------------------------------

commit 596d0cf3337863f9f49088250f17cd2a4cb84ac7
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Wed Nov 16 19:14:55 2011 +0000

    Include testsuites and benchmarks in external deps when enabled
    In particular this should fix ticket #871 where the cabal_macros.h
    is missing info for testsuite components.

>---------------------------------------------------------------

 Cabal/Distribution/Simple/LocalBuildInfo.hs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Cabal/Distribution/Simple/LocalBuildInfo.hs b/Cabal/Distribution/Simple/LocalBuildInfo.hs
index b59f6ef..b8bb868 100644
--- a/Cabal/Distribution/Simple/LocalBuildInfo.hs
+++ b/Cabal/Distribution/Simple/LocalBuildInfo.hs
@@ -148,6 +148,8 @@ externalPackageDeps lbi = filter (not . internal . snd) $ nub $
   -- TODO:  what about non-buildable components?
        maybe [] componentPackageDeps (libraryConfig lbi)
     ++ concatMap (componentPackageDeps . snd) (executableConfigs lbi)
+    ++ concatMap (componentPackageDeps . snd) (testSuiteConfigs lbi)
+    ++ concatMap (componentPackageDeps . snd) (benchmarkConfigs lbi)
   where
     -- True if this dependency is an internal one (depends on the library
     -- defined in the same package).