[tor-commits] [tor/master] rename {,TOR_}RUST_DEPENDENCIES

[nickm at torproject.org]

commit acdd349dee9edf1b3af354f3c8decb91ee267ba0
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sat May 27 17:51:21 2017 +0200

    rename {,TOR_}RUST_DEPENDENCIES
---
 configure.ac              | 16 ++++++++--------
 src/rust/.cargo/config.in |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 50dfd5d96..998bb914b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,22 +418,22 @@ if test "x$enable_rust" = "xyes"; then
     dnl When we're not allowed to touch the network, we need crate dependencies
     dnl locally available.
     AC_MSG_CHECKING([rust crate dependencies])
-    AC_ARG_VAR([RUST_DEPENDENCIES], [path to directory with local crate mirror])
-    if test "x$RUST_DEPENDENCIES" = "x"; then
-      RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
+    AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror])
+    if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
+      TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
       NEED_MOD=1
     fi
-    if test ! -d "$RUST_DEPENDENCIES"; then
-      AC_MSG_ERROR([Rust dependency directory $RUST_DEPENDENCIES does not exist. Specify a dependency directory using the RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
+    if test ! -d "$TOR_RUST_DEPENDENCIES"; then
+      AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
     fi
     for dep in $rust_crates; do
-      if test ! -d "$RUST_DEPENDENCIES"/"$dep"; then
-        AC_MSG_ERROR([Failure to find rust dependency $RUST_DEPENDENCIES/$dep. Specify a dependency directory using the RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
+      if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
+        AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.])
       fi
     done
     if test "x$NEED_MOD" = "x1"; then
       dnl When looking for dependencies from cargo, pick right directory
-      RUST_DEPENDENCIES="../../src/ext/rust"
+      TOR_RUST_DEPENDENCIES="../../src/ext/rust"
     fi
   fi
 
diff --git a/src/rust/.cargo/config.in b/src/rust/.cargo/config.in
index 414b253a5..301e7fdbe 100644
--- a/src/rust/.cargo/config.in
+++ b/src/rust/.cargo/config.in
@@ -5,4 +5,4 @@
 @RUST_DL@ replace-with = 'vendored-sources'
 
 @RUST_DL@ [source.vendored-sources]
- at RUST_DL@ directory = '@RUST_DEPENDENCIES@'
+ at RUST_DL@ directory = '@TOR_RUST_DEPENDENCIES@'