diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 16:48:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 16:48:25 -0400 |
| commit | 5c83c06c985d314f31c72d3fb5a29c1c2f396f66 (patch) | |
| tree | 443c2453c074d0309b5137b4b610af72a94ee0dd /src/test | |
| parent | 501399d14ac2e2566592946f8d73f26c34ae9150 (diff) | |
| parent | 6950749c0afae7b7c1b6f9a311275d0ae86bbeb5 (diff) | |
| download | tor-5c83c06c985d314f31c72d3fb5a29c1c2f396f66.tar.gz tor-5c83c06c985d314f31c72d3fb5a29c1c2f396f66.zip | |
Merge branch 'bufferevent5'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/Makefile.am | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 546fa2f4b7..cfe330c744 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -21,10 +21,19 @@ test_SOURCES = \ test_util.c \ tinytest.c +if USE_BUFFEREVENTS +levent_openssl_lib = -levent_openssl +else +levent_openssl_lib = +endif + test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/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@ + @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib) noinst_HEADERS = tinytest.h tinytest_macros.h test.h + + |