From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Jan 2018 18:36:48 +0000 (-0500)
Subject: Merge branch 'maint-0.3.2'
X-Git-Tag: tor-0.3.3.1-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2'
---

f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7
diff --cc Makefile.am
index 2c6de35743,a126986f3a..04ca88a236
--- a/Makefile.am
+++ b/Makefile.am
@@@ -26,7 -26,8 +26,8 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/
  endif
  
  if USE_RUST
- rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@
 -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \
++rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \
+ 	@TOR_RUST_EXTRA_LIBS@
  else
  rust_ldadd=
  endif
diff --cc configure.ac
index e471f8f914,0fdb84c131..9bb09b2dfa
--- a/configure.ac
+++ b/configure.ac
@@@ -479,9 -467,10 +488,11 @@@ if test "x$enable_rust" = "xyes"; the
    if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 14; then
      AC_MSG_ERROR([rustc must be at least version 1.14])
    fi
 +  AC_MSG_RESULT([$RUSTC_VERSION])
  fi
  
+ AC_SUBST(TOR_RUST_EXTRA_LIBS)
+ 
  AC_SEARCH_LIBS(socket, [socket network])
  AC_SEARCH_LIBS(gethostbyname, [nsl])
  AC_SEARCH_LIBS(dlopen, [dl])