]> git.sesse.net Git - vlc/commitdiff
macosx: fixes pkg-config compilation issue
authorSebastien Zwickert <dilaroga@free.fr>
Mon, 19 Sep 2011 01:25:51 +0000 (03:25 +0200)
committerRafaël Carré <funman@videolan.org>
Mon, 19 Sep 2011 12:52:08 +0000 (08:52 -0400)
Signed-off-by: Rafaël Carré <funman@videolan.org>
bootstrap

index 2f5ce733315a76b21be10bce2150d4359b17c1e4..a17fb78e978def60bad70a5393fb73a855a2a736 100755 (executable)
--- 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
 ###