X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=48e51e928998da0b73a8b796945ddc25a790858f;hb=d24d65d8bf279f9e19438a1584676ddbf41d0abb;hp=76a2afd5e0c794a7ea68719439a0a05aec8e6435;hpb=96e75a5fabd0e7ebc036fbee6ffbfc7e69aa6d07;p=vlc

diff --git a/bootstrap b/bootstrap
index 76a2afd5e0..48e51e9289 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.82 2003/11/06 10:09:16 sam Exp $
+##  $Id$
 ##
 ##  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
@@ -156,7 +163,7 @@ for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 do
   printf "."
   mf="modules/${dir}/Modules.am"
-  basedir="${dir%%\/*}"
+  basedir="`echo "${dir}" | cut -f1 -d/`"
   # automake will not recurse for make dist if we don't define SUBDIRS = .
   subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
   rm -f modules/${dir}/Makefile.am && cat > modules/${dir}/Makefile.am << EOF