[vlc-commits] vlc: allow forcing the tools to use when running bootstrap

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May  3 14:28:51 2019 +0200| [2b5387ecd072681b05bffb9957ee2e3e27e2d85a] | committer: Steve Lhomme

vlc: allow forcing the tools to use when running bootstrap

On Windows it's possible to build VLC in either msys2 or WSL. But the tools are
shared and incompatible. Only one at a time is currently possible. This will
allow switching back and forth without rebuilding tools all the time
(especially since they are detected as built).

(cherry picked from commit 85d465704dbff314884c9e13f3d7d90e85af4c9a)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2b5387ecd072681b05bffb9957ee2e3e27e2d85a
---

 bootstrap | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bootstrap b/bootstrap
index b1a200b462..31bd109e8e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -20,8 +20,12 @@ fi
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
 # Check for tools directory
-if test -d extras/tools/build/bin; then
-  PATH="`pwd`/extras/tools/build/bin:$PATH"
+if test -z ${VLC_TOOLS}; then
+  VLC_TOOLS=extras/tools/build
+fi
+if test -d ${VLC_TOOLS}/bin; then
+  VLC_TOOLS_PATH="$( cd "${VLC_TOOLS}/bin" ; pwd -P )"
+  PATH="$VLC_TOOLS_PATH:$PATH"
 fi
 
 ###