summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-26 08:52:34 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-26 08:52:34 -0400
commite4cd36ba9b3af5fd877f75d04aaf428163cd8acd (patch)
tree0803232897be00ebc40b0e99b675f69ec37f45c6 /git-annex.cabal
parent24590d731eba893cf11ce5651af6c47cb6f8d93f (diff)
remove TDFA build flag
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal12
1 files changed, 2 insertions, 10 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 91dc21ee8..3309d10bd 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -60,9 +60,6 @@ Flag AndroidSplice
Flag TestSuite
Description: Embed the test suite into git-annex
-Flag TDFA
- Description: Use regex-tdfa for wildcards
-
Flag TorrentParser
Description: Use haskell torrent library to parse torrent files
@@ -104,7 +101,8 @@ Executable git-annex
time, old-locale,
esqueleto, persistent-sqlite, persistent, persistent-template,
aeson,
- feed
+ feed,
+ regex-tdfa
CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports
@@ -147,12 +145,6 @@ Executable git-annex
crypto-api
CPP-Options: -DWITH_TESTSUITE
- if flag(TDFA)
- Build-Depends: regex-tdfa
- CPP-Options: -DWITH_TDFA
- else
- Build-Depends: regex-compat
-
if flag(S3)
Build-Depends: conduit, conduit-extra, aws (>= 0.9.2)
CPP-Options: -DWITH_S3