diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 13:07:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 13:07:52 -0500 |
| commit | 50f527a2c9202105a84e5f6c7d2844c494a46b7d (patch) | |
| tree | 217b15609b2a2e2dd83816819d3e154a056f3613 | |
| parent | b987081941bda22e5e37a09c75ffc790c270624b (diff) | |
| download | tor-50f527a2c9202105a84e5f6c7d2844c494a46b7d.tar tor-50f527a2c9202105a84e5f6c7d2844c494a46b7d.tar.gz | |
Actually link against nacl when we want to use it
Fixes more of bug 7972
| -rw-r--r-- | changes/bug7972 | 2 | ||||
| -rw-r--r-- | src/or/include.am | 2 | ||||
| -rw-r--r-- | src/test/include.am | 6 | ||||
| -rw-r--r-- | src/tools/include.am | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/changes/bug7972 b/changes/bug7972 index b751ced18..6e1fce69c 100644 --- a/changes/bug7972 +++ b/changes/bug7972 @@ -1,3 +1,5 @@ o Minor bugfixes: - Detect nacl when its headers are in a nacl/ subdirectory. Fixes bug 7972; bugfix on 0.2.4.8-alpha. + - Actually link against nacl when we're configured to use it. Fixes bug + 7972; bugfix on 0.2.4.8-alpha. diff --git a/src/or/include.am b/src/or/include.am index 08a27e17b..241015488 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -99,7 +99,7 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ src/common/libor-event.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ ORHEADERS = \ src/or/addressmap.h \ diff --git a/src/test/include.am b/src/test/include.am index f625ab7f7..112d1a79d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -40,7 +40,7 @@ src_test_test_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ src/common/libor-event.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ @@ -48,7 +48,7 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ src/common/libor-event.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ noinst_HEADERS+= \ src/test/test.h @@ -60,7 +60,7 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ -I"$(top_srcdir)/src/or" diff --git a/src/tools/include.am b/src/tools/include.am index 610864f68..54b150a80 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -10,14 +10,14 @@ src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \ $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ include src/tools/tor-fw-helper/include.am |