--- /dev/null
+--- gettext/gettext-tools/src/msgmerge.c.orig 2007-10-21 03:25:52.000000000 +0200
++++ gettext/gettext-tools/src/msgmerge.c 2008-03-23 19:54:36.000000000 +0100
+@@ -96,7 +96,7 @@
+
+ /* Update mode. */
+ static bool update_mode = false;
+-static const char *version_control_string;
++static const char *version_control_string = "none";
+ static const char *backup_suffix_string;
+
+ /* Long options. */
--- /dev/null
+# gettext
+GETTEXT_VERSION=0.18.1.1
+GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
+
+ifeq ($(call need_pkg,"gettext"),)
+PKGS_FOUND += gettext
+endif
+
+$(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
+ $(call download,$(GETTEXT_URL))
+
+.sum-gettext: gettext-$(GETTEXT_VERSION).tar.gz
+
+gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
+ $(UNPACK)
+ifdef HAVE_MACOSX
+ $(APPLY) $(SRC)/gettext/gettext-macosx.patch
+endif
+ $(MOVE)
+
+DEPS_gettext = iconv $(DEPS_iconv)
+
+.gettext: gettext
+ #cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --without-emacs
+ #cd $< && $(MAKE) install
+ #cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install
+ #touch $@
+
+ifdef HAVE_WIN32
+ (cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java)
+else
+ (cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs)
+endif
+ifneq ($(HOST),$(BUILD))
+ ifndef HAVE_CYGWIN
+ # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
+ (cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install)
+ else
+ # We are compiling for MinGW on Cygwin -- build the full current gettext
+ (cd $< && make && make install)
+ endif
+else
+# Build and install the whole gettext
+ (cd $< && make && make install)
+endif
+# Work around another non-sense of autoconf.
+ifdef HAVE_WIN32
+ (cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)
+endif
+ touch $@
+