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/or/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/or/Makefile.am')
| -rw-r--r-- | src/or/Makefile.am | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 11923fbd35..c967a8846f 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -12,7 +12,13 @@ endif EXTRA_DIST=ntmain.c or_sha1.i -tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \ +if USE_EXTERNAL_EVDNS +evdns_source= +else +evdns_source=eventdns.c +endif + +COMMON_SRC = buffers.c circuitbuild.c circuitlist.c \ circuituse.c command.c config.c \ connection.c connection_edge.c connection_or.c control.c \ cpuworker.c directory.c dirserv.c dirvote.c \ @@ -20,8 +26,9 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \ networkstatus.c onion.c policies.c \ reasons.c relay.c rendcommon.c rendclient.c rendmid.c \ rendservice.c rephist.c router.c routerlist.c routerparse.c \ - eventdns.c config_codedigest.c \ - tor_main.c + $(evdns_source) config_codedigest.c + +tor_SOURCES = $(COMMON_SRC) tor_main.c AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ @@ -33,22 +40,15 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ tor_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ -test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ - circuituse.c command.c config.c \ - connection.c connection_edge.c connection_or.c control.c \ - cpuworker.c directory.c dirserv.c dirvote.c \ - dns.c dnsserv.c geoip.c hibernate.c main.c $(tor_platform_source) \ - networkstatus.c onion.c policies.c \ - reasons.c relay.c rendcommon.c rendclient.c rendmid.c \ - rendservice.c rephist.c router.c routerlist.c routerparse.c \ - eventdns.c config_codedigest.c \ - test_data.c test.c + ../common/libor-event.a \ + -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ +test_SOURCES = $(COMMON_SRC) test_data.c test.c test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + ../common/libor-event.a \ + -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i |