aboutsummaryrefslogtreecommitdiff
path: root/src/tools/include.am
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2017-04-29 08:51:51 +0200
committerSebastian Hahn <sebastian@torproject.org>2017-04-29 08:55:57 +0200
commit915fa39d0f927712f7a468c0a2f4497aef0a3b0f (patch)
tree9e8d805a4b9bcbd30138ff79560708099469412d /src/tools/include.am
parentb8f7488e94f2cb83bdf83228781a11233d9f0a46 (diff)
downloadtor-915fa39d0f927712f7a468c0a2f4497aef0a3b0f.tar.gz
tor-915fa39d0f927712f7a468c0a2f4497aef0a3b0f.zip
Add --enable-rust configure switch
Introduce a way to optionally enable Rust integration for our builds. No actual Rust code is added yet and specifying the flag has no effect other than failing the build if rustc and cargo are unavailable.
Diffstat (limited to 'src/tools/include.am')
-rw-r--r--src/tools/include.am14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/tools/include.am b/src/tools/include.am
index 5eadb03a05..717af9e2ae 100644
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -8,7 +8,8 @@ src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c
src_tools_tor_resolve_LDFLAGS =
src_tools_tor_resolve_LDADD = src/common/libor.a \
src/common/libor-ctime.a \
- @TOR_LIB_MATH@ @TOR_LIB_WS32@
+ @TOR_LIB_MATH@ @TOR_LIB_WS32@ \
+ $(rust_ldadd)
if COVERAGE_ENABLED
src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c
@@ -22,11 +23,12 @@ endif
src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c
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 \
- src/common/libor-ctime.a \
- $(LIBKECCAK_TINY) \
- $(LIBDONNA) \
- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
- @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+ src/common/libor-ctime.a \
+ $(LIBKECCAK_TINY) \
+ $(LIBDONNA) \
+ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
+ $(rust_ldadd)
if COVERAGE_ENABLED
src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c