[vlc-commits] Contribs: compile more tools from gettext

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Dec 10 21:15:21 2011 +0100| [e1060438bea858ca569a9623a706c15ab478221f] | committer: Jean-Baptiste Kempf

Contribs: compile more tools from gettext

Except on Win32, where it doesn't compile
(cherry picked from commit f3b9b8a2ecce2a0acf0bd46dd2c417c638ff863f)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/gettext/rules.mak |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 015abe8..67a59cc 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -29,11 +29,12 @@ DEPS_gettext = iconv $(DEPS_iconv)
 	#touch $@
 
 ifdef HAVE_WIN32
-	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java)
+	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --disable-threads)
+	(cd $< && make -C gettext-runtime install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
 else
 	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs)
+	(cd $< && make -C gettext-runtime install && make -C gettext-tools/intl && make -C gettext-tools/libgrep && make -C gettext-tools/gnulib-lib && make -C gettext-tools/src install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
 endif
-	(cd $< && make -C gettext-runtime install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
 	(cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)