summaryrefslogtreecommitdiff
path: root/src/or/Makefile.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-08-14 14:34:16 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-27 12:31:14 -0400
commitbd3612cd2b4c49fd9f9aec68b6268973e43f2b63 (patch)
treeec5e092ec63d687a326618e805066731abac637b /src/or/Makefile.am
parentfc4ddafab81d5ca229436eeb0c460634e03cb2ca (diff)
downloadtor-bd3612cd2b4c49fd9f9aec68b6268973e43f2b63.tar.gz
tor-bd3612cd2b4c49fd9f9aec68b6268973e43f2b63.zip
Get SSL connections and linked connections working with bufferevents.
Clients are now verified to work and build circuits correctly. There are still a few warnings given here and there that I need to look into.
Diffstat (limited to 'src/or/Makefile.am')
-rw-r--r--src/or/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index a9ac3cdee1..b1add7cb64 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -45,6 +45,10 @@ tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \
../common/libor-event.a \
@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
+if USE_BUFFEREVENTS
+tor_LDADD += -levent_openssl
+endif
+
noinst_HEADERS = buffers.h circuitbuild.h circuitlist.h circuituse.h \
command.h config.h connection_edge.h connection.h connection_or.h \
control.h cpuworker.h directory.h dirserv.h dirvote.h dns.h \