rename {,TOR_}RUST_DEPENDENCIES

diff --git a/configure.ac b/configure.ac
index 50dfd5d96c9e7f10681f3d5fd94ad0a2caf79e63..998bb914b327e0f3e6cd1fb952a6077c36ea19d0 100644 (file)
--- 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 414b253a57b7f2efe310de1ab4a9d378c631fd47..301e7fdbe74c3ebda9c9aac6cb106cc3f4dc50bf 100644 (file)
--- 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]
-@RUST_DL@ directory = '@RUST_DEPENDENCIES@'
+@RUST_DL@ directory = '@TOR_RUST_DEPENDENCIES@'