[vlc-commits] contribs: gettext: Fix win32 build

Hugo Beauzée-Luyssen git at videolan.org
Mon Sep 12 15:41:20 CEST 2016


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Sep 12 15:39:47 2016 +0200| [e6c98b1071ed4ce628705e8ea531f567c4cc9253] | committer: Hugo Beauzée-Luyssen

contribs: gettext: Fix win32 build

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

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

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 412d1d6..fe9a4a4 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -19,6 +19,7 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 
 DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2)
 
+GETTEXT_CFLAGS := $(CFLAGS)
 GETTEXT_CONF = \
 	--disable-relocatable \
 	--disable-java \
@@ -26,10 +27,11 @@ GETTEXT_CONF = \
 	--without-emacs
 ifdef HAVE_WIN32
 GETTEXT_CONF += --disable-threads
+GETTEXT_CFLAGS += -DLIBXML_STATIC
 endif
 
 .gettext: gettext
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GETTEXT_CONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(GETTEXT_CFLAGS)" $(GETTEXT_CONF)
 ifndef HAVE_ANDROID
 	cd $< && $(MAKE) install
 else



More information about the vlc-commits mailing list