X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=52845507189fbe7f18df84c1819b86f813bed16e;hb=d675fdfc51f12be3883ee613464e41df13b2c1e2;hp=3e850f337cf5ae7668d75f91ef3d85559d896410;hpb=05d53d9041be184be774ebf5ba6b887e52f93931;p=vlc

diff --git a/bootstrap b/bootstrap
index 3e850f337c..5284550718 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.81 2003/11/04 15:31:44 sam Exp $
+##  $Id: bootstrap,v 1.83 2003/11/15 01:21:48 massiot Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -29,6 +29,13 @@ set -x
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
+# Check for contrib directory
+if test -d extras/contrib/bin; then
+  export PATH=./extras/contrib/bin:$PATH
+  export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
+  export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+fi
+
 # Check for automake
 amvers="none"
 if automake-1.7 --version >/dev/null 2>&1; then
@@ -328,6 +335,7 @@ set -x
 
 # remove autotools cruft
 rm -f aclocal.m4 configure config.log config.h config.h.in
+rm -Rf autom4te.cache
 # remove old autotools extra cruft
 rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
 # remove new autotools extra cruft