Don't pass --package-name option to xgettext older than 0.16.2.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index b8b6f0bf1d19f17a4bdb5286ff4f1cda0498c437..6103a2945733c79f5e58326276d4afb74da18c45 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-16  Bruno Haible  <bruno@clisp.org>
+
+       * hello-objc-gnustep/po/GNUmakefile: Apply 2007-10-18 changes to
+       hello-*/po/Makefile.am.
+
 2009-08-16  Bruno Haible  <bruno@clisp.org>
 
        * hello-objc-gnustep/po/GNUmakefile: Apply 2007-10-17 changes to

diff --git a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
index de25ff2f44798c6ed32f3707cf0f3a1edd90710f..2d2c09e3de37f9694889003624c30ea87824de1d 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+++ b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
@@ -97,13 +97,24 @@ $(DOMAIN).pot-update: $(POTFILES_DEPS) remove-potcdate.sed
          package_gnu=''; \
        fi; \
        msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-       $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-         --copyright-holder='$(COPYRIGHT_HOLDER)' \
-         --package-name="$${package_gnu}$(PACKAGE_NAME)" \
-         --package-version='$(VERSION)' \
-         --msgid-bugs-address="$$msgid_bugs_address" \
-         $(POTFILES)
+       case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+         '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+             $(POTFILES) \
+           ;; \
+         *) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --package-name="$${package_gnu}$(PACKAGE_NAME)" \
+             --package-version='$(VERSION)' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+             $(POTFILES) \
+           ;; \
+       esac
        test ! -f $(DOMAIN).po || { \
          if test -f $(DOMAIN).pot; then \
            sed -f remove-potcdate.sed < $(DOMAIN).pot > $(DOMAIN).1po && \