[commit: packages/Cabal] ghc-head: Merge pull request #1335 from 23Skidoo/with-program-cabal-config (97e029c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=97e029c4ac24e0d9b3ed10b1f7bbfadda9d71233

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

commit 97e029c4ac24e0d9b3ed10b1f7bbfadda9d71233
Merge: d33e4e9 1228527
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Thu May 30 09:06:09 2013 -0700

    Merge pull request #1335 from 23Skidoo/with-program-cabal-config
    
    Allow 'with-PROG' and 'PROG-options' in '~/.cabal/config'.



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

97e029c4ac24e0d9b3ed10b1f7bbfadda9d71233
 Cabal/Distribution/Simple/Setup.hs          |   62 +++++++++++++++++++++------
 cabal-install/Distribution/Client/Config.hs |   58 ++++++++++++++++++++++---
 2 files changed, 100 insertions(+), 20 deletions(-)