Actually link against nacl when we want to use it

Fixes more of bug 7972

diff --git a/changes/bug7972 b/changes/bug7972
index b751ced18fcc87ea31bc1b0aaec8a9d0d2ccdf68..6e1fce69c8d56bf1277e796b466d4298dc57ec86 100644 (file)
--- 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 08a27e17b2059cad1a77c901ab608b30a475ca16..241015488ad765608c7fb933010fb152c9db5c35 100644 (file)
--- 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 f625ab7f7d73be322074e3b27f1448d01380807d..112d1a79d85148184bca53d5e264eea5eef5a135 100644 (file)
--- 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 610864f68f6b190fc64ffa3f886a915bdc86de75..54b150a80c78768c1860116ae092967dfc2539e9 100644 (file)
--- 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