vlc | branch: master | Sebastien Zwickert <[email protected]> | Mon Sep 19 03:25:51 2011 +0200| [01946f2369d3744ce7db0785a7bb53f3e8de262d] | committer: Rafaël Carré
macosx: fixes pkg-config compilation issue Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01946f2369d3744ce7db0785a7bb53f3e8de262d --- bootstrap | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bootstrap b/bootstrap index 2f5ce73..a17fb78 100755 --- a/bootstrap +++ b/bootstrap @@ -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 ### _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
