Commit 01946f23 authored by Sebastien Zwickert's avatar Sebastien Zwickert Committed by Rafaël Carré

macosx: fixes pkg-config compilation issue

Signed-off-by: Rafaël Carré's avatarRafaël Carré <funman@videolan.org>
parent 7e2a9a21
......@@ -25,6 +25,20 @@ 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
# Prepare m4/private.m4
rm -f m4/private.m4 && cat > m4/private.m4 << EOF
dnl Private VLC macros - generated by bootstrap
......@@ -60,20 +74,6 @@ Otherwise, you will not be able to build a source tarball.
EOF
fi
# 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
###
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment