mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Allow building with gpg2.

Browse source
This commit is contained in:
Joey Hess 2013-05-19 17:59:58 -04:00
parent 8688f08804
commit d5ba9cb728
6 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Build/BundledPrograms.hs
View file

@ -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"

4
Build/Configure.hs
View file

@ -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