From 2878880f7b7de4ef78abf6c39434153a1a3647bc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Mar 2017 15:49:18 -0400 Subject: Revert "Drop support for building without network-uri." This reverts commit bfad6f5a7d156d5ddf0e5cf3840d8d22f82a2377. Need it in stable w/o backports for the ancient autobuilder. --- git-annex.cabal | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'git-annex.cabal') diff --git a/git-annex.cabal b/git-annex.cabal index d6428cadc..a2bf57b4e 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -291,6 +291,10 @@ Flag Benchmark Description: Enable benchmarking Default: False +Flag network-uri + Description: Get Network.URI from the network-uri package + Default: True + Flag Dbus Description: Enable dbus support @@ -314,8 +318,6 @@ Executable git-annex stm (>= 2.3), mtl (>= 2), uuid (>= 1.2.6), - network (>= 2.6), - network-uri (>= 2.6), process, data-default, case-insensitive, @@ -374,6 +376,11 @@ Executable git-annex if os(Linux) GHC-Options: -optl-Wl,--as-needed + if flag(network-uri) + Build-Depends: network-uri (>= 2.6), network (>= 2.6) + else + Build-Depends: network (< 2.6), network (>= 2.4) + if (os(windows)) Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv, process (>= 1.3.0.0) -- cgit v1.2.3