From: Bruno Haible <bruno@clisp.org>
Date: Sun, 16 Aug 2009 17:55:32 +0000 (+0200)
Subject: Don't pass --package-name option to xgettext older than 0.16.2.
X-Git-Tag: v0.18~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1f22d8a5e012506fbb90fea00660b030fe41cd2;p=thirdparty%2Fgettext.git

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 b8b6f0bf1..6103a2945 100644
--- 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 de25ff2f4..2d2c09e3d 100644
--- 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 && \