[vlc-commits] We don't use extras/contrib anymore, no need to look there

Rafaël Carré git at videolan.org
Sat Dec 10 01:35:20 CET 2011


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Dec  9 19:34:49 2011 -0500| [668bd49f54b2dbdb7121e18d316fc071f9ca0ddf] | committer: Rafaël Carré

We don't use extras/contrib anymore, no need to look there

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=668bd49f54b2dbdb7121e18d316fc071f9ca0ddf
---

 bootstrap |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/bootstrap b/bootstrap
index 38f85ff..76d1fe8 100755
--- 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



More information about the vlc-commits mailing list