diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-03-08 23:24:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 14:22:18 -0400 |
| commit | beb52352f2aeefb69ae2ee67e4e456346e28e40e (patch) | |
| tree | 972604d7968871f45407fac96234d9490b100c7e /src/or | |
| parent | ffd5070b04b3db4409d8e3dc933ffc7d12b5219d (diff) | |
| download | tor-beb52352f2aeefb69ae2ee67e4e456346e28e40e.tar tor-beb52352f2aeefb69ae2ee67e4e456346e28e40e.tar.gz | |
Fix build with automake 1.6
automake 1.6 doesn't like using a conditional += to add stuff to foo_LDADD.
Instead you need to conditionally define a variable, then non-conditionally
put that variable in foo_LDADD.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index b1add7cb6..9d8fb663c 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -40,14 +40,17 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # This seems to matter nowhere but on windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. +if USE_BUFFEREVENTS +levent_openssl_lib = -levent_openssl +else +levent_openssl_lib = +endif + tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ 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 + @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib) noinst_HEADERS = buffers.h circuitbuild.h circuitlist.h circuituse.h \ command.h config.h connection_edge.h connection.h connection_or.h \ |