]> git.sesse.net Git - vlc/commitdiff
We don't use extras/contrib anymore, no need to look there
authorRafaël Carré <funman@videolan.org>
Sat, 10 Dec 2011 00:34:49 +0000 (19:34 -0500)
committerRafaël Carré <funman@videolan.org>
Sat, 10 Dec 2011 00:34:49 +0000 (19:34 -0500)
bootstrap

index 38f85ff2891ec439d556ef4a5009d7bef09fb8d1..76d1fe854cb48305ffa3733efd3eb548bbf85d5b 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -25,20 +25,6 @@ ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 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