[vlc-commits] contrib: iconv is always needed by VLC, build it on Windows

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov  5 22:23:20 2011 +0200| [87659fe631f28a3f43ef21f2a810b32b1c6339b4] | committer: Rémi Denis-Courmont

contrib: iconv is always needed by VLC, build it on Windows

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

 contrib/src/iconv/rules.mak |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index a599384..5aad124 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -2,6 +2,13 @@
 LIBICONV_VERSION=1.13.1
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
 
+PKGS += iconv
+# iconv cannot be detect with pkg-config, but it is mandated by POSIX.
+# Hard-code based on the operating system.
+ifndef HAVE_WIN32
+PKGS_FOUND += iconv
+endif
+
 $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
 	$(call download,$(LIBICONV_URL))