diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-06-04 01:05:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-06-12 14:27:52 -0400 |
commit | e5b88dc83fb44622f2b0f9c0c242907d1c02311f (patch) | |
tree | 4a3932831da9df966b74ddf59b16aaa2445edb12 /src/tools/Makefile.am | |
parent | cfce7d5deab7839c0ac67c3777e70a2264176ca0 (diff) | |
download | tor-e5b88dc83fb44622f2b0f9c0c242907d1c02311f.tar.gz tor-e5b88dc83fb44622f2b0f9c0c242907d1c02311f.zip |
Update Tor to use Libevent 2.0 APIs when available.
This patch adds a new compat_libevent.[ch] set of files, and moves our
Libevent compatibility and utilitity functions there. We build them
into a separate .a so that nothing else in src/commmon depends on
Libevent (partially fixing bug 507).
Also, do not use our own built-in evdns copy when we have Libevent
2.0, whose evdns is finally good enough (thus fixing Bug 920).
Diffstat (limited to 'src/tools/Makefile.am')
-rw-r--r-- | src/tools/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 79393d6854..b1e8bafb26 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -3,16 +3,16 @@ noinst_PROGRAMS = tor-checkkey tor_resolve_SOURCES = tor-resolve.c tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ -tor_resolve_LDADD = ../common/libor.a -levent @TOR_LIB_WS32@ +tor_resolve_LDADD = ../common/libor.a @TOR_LIB_WS32@ tor_gencert_SOURCES = tor-gencert.c tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lz -lcrypto -levent @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lz -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ tor_checkkey_SOURCES = tor-checkkey.c tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lz -lcrypto -levent @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lz -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ |