[vlc-devel] [PATCH] contrib: don't build iconv on win32 if it's found on the system

[Steve Lhomme]

---
 contrib/src/iconv/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index c998fd81fc6..665eab04c12 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -7,6 +7,10 @@ PKGS += iconv
 # Hard-code based on the operating system.
 ifndef HAVE_WIN32
 PKGS_FOUND += iconv
+else
+ifeq ($(call $(shell iconv --version || echo 1)),)
+PKGS_FOUND += iconv
+endif
 endif
 
 $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
-- 
2.17.1