Skip to content

Commit

Permalink
macosx: fixes pkg-config compilation issue
Browse files Browse the repository at this point in the history
Signed-off-by: Rafaël Carré <[email protected]>
  • Loading branch information
dilaroga authored and funman committed Sep 19, 2011
1 parent 7e2a9a2 commit 01946f2
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
###
Expand Down

0 comments on commit 01946f2

Please sign in to comment.