vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu Dec  2 
14:22:27 2010 +0100| [a511a54f897fa582e0fa4ed2fada41adfa8a797f] | committer: 
Felix Paul Kühne 

contribs: build the correct libiconv for OS X

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a511a54f897fa582e0fa4ed2fada41adfa8a797f
---

 extras/contrib/src/contrib-src.mak |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak 
b/extras/contrib/src/contrib-src.mak
index 3d84a73..139a591 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -460,7 +460,11 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
        patch -p0 < Patches/fribidi.patch
        ( cd $@; rm -f configure; ./bootstrap)
 
+ifdef HAVE_MACOSX
+.fribidi: fribidi .iconv-from-os
+else
 .fribidi: fribidi .iconv
+endif
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make 
&& make install)
        $(INSTALL_NAME)
        touch $@

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to