summaryrefslogtreecommitdiff
path: root/Build/Configure.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-19 17:59:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-19 17:59:58 -0400
commitb1e0c707bcf4e281d0bfefa06effc9b3fcb3f92e (patch)
tree6402758cfcea96e53203cd4ef4be9a45735aad6b /Build/Configure.hs
parent1b028411570973f4a18ce155c080161084952e87 (diff)
Allow building with gpg2.
Diffstat (limited to 'Build/Configure.hs')
-rw-r--r--Build/Configure.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs
index 65ba375bf..399af9da8 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -31,7 +31,9 @@ tests =
, TestCase "curl" $ testCmd "curl" "curl --version >/dev/null"
, TestCase "wget" $ testCmd "wget" "wget --version >/dev/null"
, TestCase "bup" $ testCmd "bup" "bup --version >/dev/null"
- , TestCase "gpg" $ testCmd "gpg" "gpg --version >/dev/null"
+ , TestCase "gpg" $ maybeSelectCmd "gpg"
+ [ ("gpg", "--version >/dev/null")
+ , ("gpg2", "--version >/dev/null") ]
, TestCase "lsof" $ findCmdPath "lsof" "lsof"
, TestCase "ssh connection caching" getSshConnectionCaching
] ++ shaTestCases