Use a more recent version of gettext

This commit is contained in:
Olivier Teulière 2013-01-06 17:42:12 +01:00
parent c6f1f0dedb
commit 91c993073e
2 changed files with 20 additions and 13 deletions

View file

@ -187,7 +187,7 @@ AC_ARG_ENABLE([text],AS_HELP_STRING([--enable-text],[text interface support (def
AM_CONDITIONAL([BUILD_TEXT], [test "${enable_text}" != "no"])
dnl Internationalization macros
AM_GNU_GETTEXT_VERSION(0.16.1)
AM_GNU_GETTEXT_VERSION(0.18.1)
AM_GNU_GETTEXT
dnl Iconv

View file

@ -1,6 +1,6 @@
--- po/Makefile.in.in 2010-01-02 01:26:33.000000000 +0100
+++ po/Makefile.in.in.new 2010-01-02 01:28:52.000000000 +0100
@@ -127,6 +127,11 @@
--- po/Makefile.in.in 2013-01-06 17:32:47.328960440 +0100
+++ po/Makefile.in.in.new 2013-01-06 17:34:22.641893986 +0100
@@ -135,6 +135,11 @@
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
@ -12,13 +12,20 @@
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
@@ -135,7 +140,8 @@
else \
msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
@@ -150,14 +155,14 @@
fi; \
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_builddir) \
+ --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
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) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_builddir) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--msgid-bugs-address="$$msgid_bugs_address" \
;; \
*) \
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_builddir) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \