[vlc-commits] commit: Win32: libintl (gettext-runtime) should not need libiconv ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct 27 22:55:01 2010 +0300| [3d7c4dc4eddb72f52a561ab7ceb3c4baa88e4542] | committer: Rémi Denis-Courmont 

Win32: libintl (gettext-runtime) should not need libiconv

Our PO files are all encoded in UTF-8, and VLC always binds its text
domain as UTF-8. There is no need to convert localized strings. So
libintl does not need to use iconv.

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

 extras/contrib/src/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f03d1c9..9fb98c9 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -380,9 +380,9 @@ ifdef HAVE_DARWIN_OS
 	patch -p0 < Patches/gettext-macosx.patch
 endif
 
-.intl: gettext .iconv
+.intl: gettext
 ifdef HAVE_WIN32
-	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java)
+	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --disable-java --disable-native-java)
 else
 	( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java --without-emacs)
 endif