#
#
# patch "Makefile.am"
#  from [7c9525e222269c6d2954593056ef43c6135d8703]
#    to [32b1469cc39c888ad4975dc820b2d980e2a583d5]
# 
# patch "m4/mtn-gettext.m4"
#  from [499e1ab86a32d7fdc3b367e9219870b2b4d8ef8a]
#    to [2d6fd956a0b2062e81df1ee36df82b80efb8e564]
#
============================================================
--- Makefile.am	7c9525e222269c6d2954593056ef43c6135d8703
+++ Makefile.am	32b1469cc39c888ad4975dc820b2d980e2a583d5
@@ -404,10 +404,9 @@ $(PACKAGE).pot: $(POTFILES)
 
 $(PACKAGE).pot: $(POTFILES)
 	$(XGETTEXT) -o$@ -D$(top_srcdir) -cTRANSLATORS: \
-	  --package-name=$(PACKAGE) --package-version=$(VERSION) \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' \
-	  $(XGETTEXT_OPTS) \
+	  $(XGETTEXT_PKG_OPTS) $(XGETTEXT_OPTS) \
 	  $(POTFILES)
 
 dist-hook: $(ALL_GMOFILES)
============================================================
--- m4/mtn-gettext.m4	499e1ab86a32d7fdc3b367e9219870b2b4d8ef8a
+++ m4/mtn-gettext.m4	2d6fd956a0b2062e81df1ee36df82b80efb8e564
@@ -20,6 +20,7 @@
 #  - Does not support bundled libintl/libiconv.
 #  - Always checks for ngettext().
 #  - Always checks for the --flag option to xgettext.
+#  - Always checks for --package-version/--package-name support.
 #  - Never checks for support for <inttypes.h> format string macros.
 #  - If you give an explicit --enable-nls on the command line and the
 #    library functions are not available, configure will error out.
@@ -108,10 +109,28 @@ AC_DEFUN([MTN_PROG_GNU_GETTEXT], [
     else
       XGETTEXT_OPTS='$(XGETTEXT_OPTIONS_NO_FLAG)'
     fi
+
+    AC_CACHE_CHECK(
+      [whether $XGETTEXT supports --package-name and --package-version],
+      [ac_cv_prog_xgettext_package_options],
+      [echo 'int main(void) { return 0; }' >> conftest.c
+      if "$XGETTEXT" --package-name=test --package-version=1.0 \
+         -o conftest.po conftest.c >/dev/null 2>&1
+      then ac_cv_prog_xgettext_package_options=yes
+      else ac_cv_prog_xgettext_package_options=no
+      fi])
+
+    if test $ac_cv_prog_xgettext_package_options = yes; then
+      XGETTEXT_PKG_OPTS='--package-name=$(PACKAGE) --package-version=$(VERSION)'
+    else
+      XGETTEXT_PKG_OPTS=
+    fi
   else
     XGETTEXT_OPTS=
+    XGETTEXT_PKG_OPTS=
   fi
   AC_SUBST([XGETTEXT_OPTS])
+  AC_SUBST([XGETTEXT_PKG_OPTS])
 
   if test x"$MSGFMT" = x"not found" ||
      test x"$MSGMERGE" = x"not found" ||