2 files changed, 43 insertions, 5 deletions

diff --git a/dht-client.cabal b/dht-client.cabal
index 7c3dcdc3..11ded614 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -58,7 +58,7 @@ library
                      , OverloadedStrings
                      , RecordWildCards
                      , NondecreasingIndentation
-  hs-source-dirs:      src, cryptonite-backport, .
+  hs-source-dirs:      src, cryptonite-backport, ., Presence
   exposed-modules:  Network.SocketLike
                     Data.Digest.CRC32C
                     Data.Bits.ByteString
@@ -98,6 +98,32 @@ library
                     Roster
                     Announcer
                     InterruptibleDelay
+                    ByteStringOperators
+                    ClientState
+                    ConfigFiles
+                    ConnectionKey
+                    ConsoleWriter
+                    Control.Concurrent.STM.StatusCache
+                    Control.Concurrent.STM.UpdateStream
+                    ControlMaybe
+                    Data.BitSyntax
+                    DNSCache
+                    EventUtil
+                    FGConsole
+                    GetHostByAddr
+                    LocalPeerCred
+                    LockedChan
+                    Logging
+                    Nesting
+                    Paths
+                    PeerResolve
+                    Server
+                    SockAddr
+                    TraversableT
+                    UTmp
+                    XMPPServer
+                    Util
+                    Presence
 
   build-depends:      base
                     , containers
@@ -116,6 +142,7 @@ library
                     , directory
                     , bencoding
                     , contravariant
+                    , xml-types
 
                     , cryptonite
                     , memory
@@ -141,6 +168,15 @@ library
                     , transformers-base
                     , mtl
                     , ghc-prim
+                    , transformers
+                    , conduit
+                    , conduit-extra
+                    , xml-conduit
+                    , unix
+                    , template-haskell
+                    , resourcet
+                    , blaze-builder
+                    , hinotify
 
   if impl(ghc < 8)
       Build-depends:  transformers
@@ -165,11 +201,12 @@ library
                        Crypto.Internal.Imports
                        Crypto.PubKey.Curve25519
 
-  C-sources:           cbits/cryptonite_xsalsa.c, cbits/cryptonite_salsa.c
+  C-sources:           cbits/cryptonite_xsalsa.c, cbits/cryptonite_salsa.c,
+                       Presence/monitortty.c
 
   -- if flag(aeson)
   build-depends: aeson, aeson-pretty, unordered-containers, vector
-  cpp-options:   -DBENCODE_AESON
+  cpp-options:   -DBENCODE_AESON -DRENDERFLUSH
   if flag(thread-debug)
     exposed-modules: Control.Concurrent.Lifted.Instrument
                      Control.Concurrent.Async.Lifted.Instrument
@@ -205,9 +242,10 @@ executable dhtd
                      , unordered-containers
                      , vector
                      , text
+                     , resourcet
 
   if flag(thread-debug)
     build-depends: time
-    cpp-options:   -DTHREAD_DEBUG
-  ghc-options:         -rtsopts  -fdefer-typed-holes
+    cpp-options:   -DTHREAD_DEBUG -DRENDERFLUSH
+  ghc-options:         -rtsopts  -fdefer-typed-holes -threaded
 
diff --git a/presence.cabal b/presence.cabal.bak
index 81ca59b2..81ca59b2 100644
--- a/presence.cabal
+++ b/presence.cabal.bak