macosx: updated volume and dropzone icons

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 38f85ff2891ec439d556ef4a5009d7bef09fb8d1..1eaa5664030b6146cd08afce156ccfacac090e42 100755 (executable)
--- 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
@@ -73,7 +64,7 @@ echo "generating modules/**/Makefile.am"
 find modules/ -name Modules.am | \
 sed -ne 's,modules/\(.*\)/Modules.am,\1,p' | \
 while read d; do
-       sh modules/genmf "$d"
+       ${CONFIG_SHELL-sh} modules/genmf "$d"
        printf "."
 done
 printf "\n"