X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=6726871a881b092bf56f89332fd951e8fe67530a;hb=7cab5a8c5d67596a4d73a5e9194a52d3736725f0;hp=38f85ff2891ec439d556ef4a5009d7bef09fb8d1;hpb=3b851f4e9c531f2d90c305b3d632cddc082791fc;p=vlc

diff --git a/bootstrap b/bootstrap
index 38f85ff289..6726871a88 100755
--- a/bootstrap
+++ b/bootstrap
@@ -19,26 +19,17 @@ 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"
+fi
+
 ###
 ###  Get a sane environment, just in case
 ###
 CYGWIN=binmode
 export CYGWIN
 
-# Check for contrib directory
-if test -d extras/contrib/build/bin; then
-  PATH="`pwd`/extras/contrib/build/bin:$PATH"
-  if test -d extras/contrib/build/share/aclocal; then
-    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/build/share/aclocal"
-  fi
-  if test ".`uname -s`" = ".Darwin"; then
-    LD_LIBRARY_PATH=./extras/contrib/build/lib:$LD_LIBRARY_PATH
-    DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
-    export LD_LIBRARY_PATH
-    export DYLD_LIBRARY_PATH
-  fi
-fi
-
 # Check for pkg-config
 if ! "${PKG_CONFIG:-pkg-config}" --version >/dev/null 2>&1; then
 	echo 'Error: "pkg-config" is not installed.' >&2