Signed-off-by: Rafaël Carré <funman@videolan.org>
CYGWIN=binmode
export CYGWIN
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
+
# Prepare m4/private.m4
rm -f m4/private.m4 && cat > m4/private.m4 << EOF
dnl Private VLC macros - generated by bootstrap
# Prepare m4/private.m4
rm -f m4/private.m4 && cat > m4/private.m4 << EOF
dnl Private VLC macros - generated by bootstrap
-# 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
-
###
### Generate the modules makefile, by parsing modules/**/Modules.am
###
###
### Generate the modules makefile, by parsing modules/**/Modules.am
###