summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/BundledPrograms.hs2
-rw-r--r--Build/Configure.hs4
2 files changed, 4 insertions, 2 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index 570af4adf..ae4beedf7 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -30,7 +30,7 @@ bundledPrograms = catMaybes
#ifndef mingw32_HOST_OS
, Just "sh"
#endif
- , ifset SysConfig.gpg "gpg"
+ , SysConfig.gpg
, ifset SysConfig.curl "curl"
, ifset SysConfig.wget "wget"
, ifset SysConfig.bup "bup"
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