]> git.ipfire.org Git - thirdparty/gettext.git/log
thirdparty/gettext.git
6 years agoxgettext: New test of concatenation of strings with escape sequences.
Bruno Haible [Sun, 4 Nov 2018 18:41:53 +0000 (19:41 +0100)] 
xgettext: New test of concatenation of strings with escape sequences.

Reported by Morten Welinder <mwelinder@gmail.com>
in <https://lists.gnu.org/archive/html/bug-gettext/2015-12/msg00017.html>
and <https://savannah.gnu.org/bugs/?46756>.

* gettext-tools/tests/xgettext-c-23: New file.
* gettext-tools/tests/Makefile.am (TESTS): Add it.

6 years agoxgettext: JavaScript: Fix a memory leak.
Bruno Haible [Sun, 4 Nov 2018 18:31:19 +0000 (19:31 +0100)] 
xgettext: JavaScript: Fix a memory leak.

* gettext-tools/src/x-javascript.c (free_token): Free tp->string also for
token_type_keyword.

6 years agoWhitespace changes.
Bruno Haible [Sun, 4 Nov 2018 18:29:29 +0000 (19:29 +0100)] 
Whitespace changes.

* gettext-tools/src/cldr-plural-exp.h: Add a blank line.
* gettext-tools/src/locating-rule.h: Correct indentation.

6 years agoFix test failure with valgrind.
Bruno Haible [Sun, 4 Nov 2018 18:29:21 +0000 (19:29 +0100)] 
Fix test failure with valgrind.

* gettext-tools/tests/msgcmp-4: Filter out valgrind's messages from the output.

6 years agoMake test files executable.
Bruno Haible [Sun, 28 Oct 2018 13:50:39 +0000 (14:50 +0100)] 
Make test files executable.

* gettext-tools/tests/xgettext-c-22: Make executable.
* gettext-tools/tests/xgettext-properties-[234]: Likewise.
* gettext-tools/tests/xgettext-rst-[12]: Likewise.

6 years agoMake it easier to build the code when the documentation tools don't work.
Bruno Haible [Sun, 28 Oct 2018 13:38:27 +0000 (14:38 +0100)] 
Make it easier to build the code when the documentation tools don't work.

* gettext-tools/Makefile.am (SUBDIRS): Move 'doc' to the end. Move 'its' to the
middle.

6 years agotests: Improve reliability.
Bruno Haible [Sun, 28 Oct 2018 10:52:43 +0000 (11:52 +0100)] 
tests: Improve reliability.

* xgettext-3: Verify the exit code of the xgettext invocation.
* xgettext-4: Likewise.
* xgettext-appdata-1: Likewise.
* xgettext-c-19: Likewise.
* xgettext-c-20: Likewise.
* xgettext-c-21: Likewise.
* xgettext-csharp-2: Likewise.
* xgettext-csharp-3: Likewise.
* xgettext-csharp-8: Likewise.
* xgettext-desktop-1: Likewise.
* xgettext-glade-1: Likewise.
* xgettext-glade-6: Likewise.
* xgettext-glade-7: Likewise.
* xgettext-gsettings-1: Likewise.
* xgettext-perl-2: Likewise.
* xgettext-perl-3: Likewise.

6 years agopo, examples: Change .po -> .gmo rules to consider the newest changes to the POT...
Bruno Haible [Wed, 24 Oct 2018 23:41:42 +0000 (01:41 +0200)] 
po, examples: Change .po -> .gmo rules to consider the newest changes to the POT file.

Reported by Claude Paroz <claude@2xlibre.net>
in <https://savannah.gnu.org/bugs/?50910>.

* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Set MSGMERGE_FOR_MSGFMT_OPTION.
* gettext-runtime/po/Makefile.in.in (MSGMERGE): Use GNU msgmerge, even if not
first in $PATH.
(MSGMERGE_FOR_MSGFMT_OPTION): New variable.
(.po.gmo): Depend on the POT file. Use msgmerge on the fly, to take into
account the most recent POT file changes.
* gettext-tools/examples/hello-*/po/Makefile.am: Likewise, also for the .po.qm,
update-properties, update-classes targets.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
(MSGMERGE_FOR_MSGFMT_OPTION): New variable.
($(STRINGSFILES)): Depend on the POT file. Use msgmerge on the fly, to take
into account the most recent POT file changes.

6 years agomsgmerge: New option --for-msgfmt.
Bruno Haible [Wed, 24 Oct 2018 23:09:38 +0000 (01:09 +0200)] 
msgmerge: New option --for-msgfmt.

* gettext-tools/src/msgmerge.c (for_msgfmt): New variable.
(long_options): Add option --for-msgfmt.
(main): Handle option --for-msgfmt.
(usage): Document option --for-msgfmt.
(match_domain): When --for-msgfmt is given, omit untranslated and fuzzy messages
from the result.
(merge): When --for-msgfmt is given, don't add obsolete messages to the result.
* gettext-tools/tests/msgmerge-26: New file.
* gettext-tools/tests/Makefile.am (TESTS): Add it.
* gettext-tools/doc/msgmerge.texi: Mention the option --for-msgfmt.
* NEWS: Mention the change.

6 years agoAdd ability to write PO files without translator comment lines.
Bruno Haible [Wed, 24 Oct 2018 23:03:32 +0000 (01:03 +0200)] 
Add ability to write PO files without translator comment lines.

* gettext-tools/src/write-po.h (message_print_style_comment): New declaration.
* gettext-tools/src/write-po.c (print_comment): New variable.
(message_print_style_comment): New function.
(message_print_comment): Output nothing if print_comment is false.

6 years agoImprove reliability of 'make dist'.
Bruno Haible [Wed, 24 Oct 2018 21:14:41 +0000 (23:14 +0200)] 
Improve reliability of 'make dist'.

* gettext-tools/examples/po/Makefile.am (distdir1): Depend on the .pot file.

6 years agopo, examples: Put stamp-po in the source directory.
Bruno Haible [Wed, 24 Oct 2018 21:13:36 +0000 (23:13 +0200)] 
po, examples: Put stamp-po in the source directory.

Rationale: <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>.

* gettext-runtime/po/Makefile.in.in: Use $(srcdir)/stamp-po instead of stamp-po.
Talk about "version control system", not CVS.
* gettext-tools/examples/hello-*/po/Makefile.am: Likewise.
* gettext-tools/examples/po/Makefile.am: Likewise.
* gettext-tools/examples/check-examples (func_check_dist_vpath): Verify the
stamp-po file does not exist in the build dir, except when using the older
Makefile.in.in infrastructure.

6 years agopo: Make "make maintainer-clean" erase the .pot file.
Bruno Haible [Wed, 24 Oct 2018 20:08:10 +0000 (22:08 +0200)] 
po: Make "make maintainer-clean" erase the .pot file.

Rationale:
<https://www.gnu.org/prep/standards/html_node/Standard-Targets.html>
<https://www.gnu.org/software/automake/manual/html_node/Clean.html>

* NEWS: Mention the change.
* gettext-runtime/po/Makefile.in.in (maintainer-clean): Remove the .pot file.
* gettext-tools/examples/hello-*/po/Makefile.am (MAINTAINERCLEANFILES): Add
the .pot file.
* gettext-tools/examples/po/Makefile.am (MAINTAINERCLEANFILES): Likewise.
* gettext-tools/examples/check-examples (func_check_maintainerclean,
func_check_maintainerclean_vpath): Verify the .pot file is removed after
'make maintainer-clean', except when using the older Makefile.in.in
infrastructure.

6 years agopo, examples: Use case-insensitive search for "GNU <PACKAGE_NAME>".
Bruno Haible [Wed, 24 Oct 2018 16:45:36 +0000 (18:45 +0200)] 
po, examples: Use case-insensitive search for "GNU <PACKAGE_NAME>".

Reported by Akim Demaille <akim@lrde.epita.fr> in
<https://lists.gnu.org/archive/html/bug-gettext/2018-10/msg00020.html>.

* gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): Use a
case-insensitive search for "GNU <PACKAGE_NAME>".
* gettext-tools/examples/hello-*/po/Makefile.am ($(DOMAIN).pot-update):
Likewise.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
($(DOMAIN).pot-update): Likewise.

6 years agopo: Remove obsolete Makefile rules for .mo files.
Bruno Haible [Wed, 24 Oct 2018 16:33:23 +0000 (18:33 +0200)] 
po: Remove obsolete Makefile rules for .mo files.

* gettext-runtime/po/Makefile.in.in (MSGFMT*): Remove variables.
(.SUFFIXES): Remove .mo.
(.po.mo): Remove rule.
(distclean): Don't remove *.mo files.
* gettext-tools/examples/hello-*/po/Makefile.am (.SUFFIXES): Remove .mo.
(.po.mo): Remove rule.
(DISTCLEANFILES): Remove *.mo.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile (.SUFFIXES):
Remove .mo.
* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Don't set MSGFMT_015.

6 years agoRemove outdated DJGPP build infrastructure.
Bruno Haible [Wed, 24 Oct 2018 02:41:02 +0000 (04:41 +0200)] 
Remove outdated DJGPP build infrastructure.

Approved by Juan Manuel Guerrero <juan.guerrero@gmx.de>.

* djgpp: Remove directory.
* Makefile.am (EXTRA_DIST): Remove the djgpp files.

6 years agoexamples: Add support for msgmerge --previous.
Bruno Haible [Tue, 23 Oct 2018 22:46:52 +0000 (00:46 +0200)] 
examples: Add support for msgmerge --previous.

This mirrors the Makefile.in.in change from 2016-07-01.

* gettext-tools/examples/hello-*/po/Makefile.am ($(POFILES), update-po): Use
option --previous when the msgmerge program supports it.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile: Likewise.

6 years agoexamples: Support reading header comments from file.
Bruno Haible [Tue, 23 Oct 2018 22:45:52 +0000 (00:45 +0200)] 
examples: Support reading header comments from file.

This mirrors the Makefile.in.in change from 2015-09-01 with the amendment
from today.

* gettext-tools/examples/hello-*/po/Makefile.am ($(DOMAIN).pot-update):
Replace header entry with the content of $(DOMAIN).pot-header, if exists.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile: Likewise.

6 years agoexamples: Make it possible to pass custom options to msginit.
Bruno Haible [Tue, 23 Oct 2018 22:43:32 +0000 (00:43 +0200)] 
examples: Make it possible to pass custom options to msginit.

This mirrors the Makevars change from 2014-10-08.

* gettext-tools/examples/hello-*/po/Makefile.am (MSGINIT_OPTIONS): New variable.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile: Likewise.

6 years agoexamples: Add an option to claim the package as GNU/non-GNU.
Bruno Haible [Tue, 23 Oct 2018 22:42:20 +0000 (00:42 +0200)] 
examples: Add an option to claim the package as GNU/non-GNU.

This mirrors the Makefile.in.in and Makevars change from 2014-05-01.

Reported by David Shea at <https://savannah.gnu.org/bugs/?40520>.

* gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): Tweak whitespace.
* gettext-tools/examples/hello-*/po/Makefile.am (PACKAGE_GNU): New variable.
($(DOMAIN).pot-update): Don't search for "GNU packagename" if $(PACKAGE_GNU) is
set.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile: Likewise.

6 years agoexamples: Upgrade to newest Makevars.
Bruno Haible [Tue, 23 Oct 2018 22:41:09 +0000 (00:41 +0200)] 
examples: Upgrade to newest Makevars.

* gettext-tools/examples/hello-*/po/Makevars (PACKAGE_GNU, MSGINIT_OPTIONS,
PO_DEPENDS_ON_POT, DIST_DEPENDS_ON_UPDATE_PO): New variables.
* gettext-tools/examples/hello-*/configure.* (AM_GNU_GETTEXT_VERSION): Require
version 0.19.8.
* gettext-tools/examples/po/xsmallpot.sh (hello-c++-kde): Likewise.
* gettext-tools/examples/hello-*/m4/Makefile.am (EXTRA_DIST): Update list of .m4
files.
* gettext-tools/examples/hello-*/autoclean.sh: Likewise.
* gettext-tools/examples/check-examples (func_check_maintainerclean,
func_check_maintainerclean_vpath): Allow left-over .po~ files.

6 years agoexamples: Avoid grepping through monster files.
Bruno Haible [Tue, 23 Oct 2018 22:31:23 +0000 (00:31 +0200)] 
examples: Avoid grepping through monster files.

This mirrors the Makefile.in.in change from 2010-06-12.

Reported by Jim Meyering <jim@meyering.net>.

* gettext-tools/examples/hello-*/po/Makefile.am (($(DOMAIN).pot-update): When
GNU find is available, avoid grepping through monster files.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile: Likewise.

6 years agoexamples: Don't create unnecessary installation directories.
Bruno Haible [Tue, 23 Oct 2018 22:28:21 +0000 (00:28 +0200)] 
examples: Don't create unnecessary installation directories.

This mirrors the Makefile.in.in change from 2009-06-09.

Reported by Serge Pavlovsky <pal666@gmail.com>.

* gettext-tools/examples/hello-*/po/Makefile.am (install-data-local-yes,
installdirs-local-yes): Remove unnecessary MKDIR_P invocations.

6 years agopo: Make the insertion of the .pot-header file more robust.
Bruno Haible [Tue, 23 Oct 2018 22:22:37 +0000 (00:22 +0200)] 
po: Make the insertion of the .pot-header file more robust.

This improves on the 2015-09-01 patch.

* gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): Fail if the 'cat'
command fails.

6 years agopo: When doing msgmerge --version, use the correct msgmerge program.
Bruno Haible [Tue, 23 Oct 2018 22:21:31 +0000 (00:21 +0200)] 
po: When doing msgmerge --version, use the correct msgmerge program.

This reverts the patch from
<https://lists.gnu.org/archive/html/bug-gettext/2015-06/msg00000.html>.
Rationale:
<https://lists.gnu.org/archive/html/bug-gettext/2018-10/msg00000.html>.

* gettext-runtime/po/Makefile.in.in ($(POFILES)): Use $(MSGMERGE_UPDATE),
not $(MSGMERGE).

6 years agopo: Make $(POFILES) target more robust.
Bruno Haible [Tue, 23 Oct 2018 22:19:53 +0000 (00:19 +0200)] 
po: Make $(POFILES) target more robust.

It was introduced on 2014-05-01.

* gettext-runtime/po/Makefile.in.in ($(POFILES)): Create POT file also when the
PO file does not yet exist. Fail if creation of the POT file fails.

6 years agoUpdate list of files to check with gnulib.
Bruno Haible [Tue, 23 Oct 2018 20:52:36 +0000 (22:52 +0200)] 
Update list of files to check with gnulib.

* Makefile.am (distcheck): Check also localename-table.h and localename-table.c.

6 years agointl: Improve support for per-thread locales on Solaris 11.4.
Bruno Haible [Tue, 23 Oct 2018 20:48:46 +0000 (22:48 +0200)] 
intl: Improve support for per-thread locales on Solaris 11.4.

* gettext-runtime/intl/localename.c: Update from gnulib:
Handle HAVE_SOLARIS114_LOCALES through Solaris specific code.
* gettext-runtime/intl/localename-table.in.h: Update from gnulib's
localename-table.h.
* gettext-runtime/intl/localename-table.c: Update from gnulib.
* gettext-runtime/m4/intl-thread-locale.m4: Renamed from
gettext-runtime/m4/intlsolaris.m4.
(gt_INTL_THREAD_LOCALE_NAME): Renamed from gt_INTL_SOLARIS. Define
HAVE_SOLARIS114_LOCALES instead of HAVE_NAMELESS_LOCALES.
* gettext-runtime/m4/intl.m4: Update from gnulib:
(AM_INTL_SUBDIR): Require gt_INTL_THREAD_LOCALE_NAME. Test for 'uselocale'. Set
HAVE_NAMELESS_LOCALES.
(gt_INTL_SUBDIR_CORE): Don't invoke gt_INTL_SOLARIS. Don't set
HAVE_NAMELESS_LOCALES here.
* gettext-runtime/m4/Makefile.am (EXTRA_DIST): List intl-thread-locale.m4, not
intlsolaris.m4.
* gettext-tools/m4/Makefile.am (aclocal_DATA): List intl-thread-locale.m4, not
intlsolaris.m4.
* gettext-tools/misc/gettextize.in (m4filelist): List intl-thread-locale.m4, not
intlsolaris.m4.
* Makefile.am (distcheck-hook): Check intl-thread-locale.m4, not intlsolaris.m4.
* gettext-tools/doc/gettext.texi (aclocal): List intl-thread-locale.m4, not
intlsolaris.m4.
* PACKAGING: List intl-thread-locale.m4, not intlsolaris.m4.

6 years agoUpdate to newest gnulib.
Bruno Haible [Tue, 23 Oct 2018 20:34:42 +0000 (22:34 +0200)] 
Update to newest gnulib.

6 years agointl: Fix support for per-thread locales on Solaris 11.4.
Bruno Haible [Tue, 23 Oct 2018 18:29:48 +0000 (20:29 +0200)] 
intl: Fix support for per-thread locales on Solaris 11.4.

* gettext-runtime/intl/localename-table.in.h: Renamed from
gettext-runtime/intl/localename-table.h.
* gettext-runtime/intl/Makefile.in (HEADERS): Add localename-table.in.h. Remove
localename-table.h.
(localename-table.h): New target.
(localename.$lo, localename-table.$lo): Update dependencies.
(mostlyclean): Remove localename-table.h.

6 years agoxgettext: Fix compiler warning
Daiki Ueno [Sun, 21 Oct 2018 06:35:32 +0000 (08:35 +0200)] 
xgettext: Fix compiler warning

* gettext-tools/src/x-javascript.c (phase5_scan_regexp): Remove
implicit argument.  Reported in:
<https://savannah.gnu.org/bugs/?48404>.

6 years agoUpdate after gnulib changed.
Bruno Haible [Tue, 23 Oct 2018 01:07:36 +0000 (03:07 +0200)] 
Update after gnulib changed.

* configure.ac: Require Autoconf >= 2.63.
* gettext-runtime/configure.ac: Likewise.
* gettext-runtime/libasprintf/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.

6 years agoUpdate from gnulib: Assume Autoconf >= 2.63.
Bruno Haible [Tue, 23 Oct 2018 01:07:31 +0000 (03:07 +0200)] 
Update from gnulib: Assume Autoconf >= 2.63.

* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Don't set localedir.
* gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT): Update comment.
* gettext-runtime/m4/fcntl-o.m4 (gl_FCNTL_O_FLAGS): Assume
AC_USE_SYSTEM_EXTENSIONS exists.
* gettext-runtime/m4/threadlib.m4 (gl_THREADLIB_EARLY_BODY): Likewise,
* gettext-runtime/m4/longlong.m4: Require Autoconf >= 2.62. Update comments.
* gettext-runtime/m4/size_max.m4 (AC_COMPUTE_INT): Remove fallback for
Autoconf < 2.61.

6 years agoUpdate from gnulib: Assume Automake >= 1.11.
Bruno Haible [Tue, 23 Oct 2018 01:07:25 +0000 (03:07 +0200)] 
Update from gnulib: Assume Automake >= 1.11.

* gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS, AM_POSTPROCESS_PO_MAKEFILE):
Eliminate uses of 'eval'.

6 years agoUpdate from gnulib: Make better use of Autoconf.
Bruno Haible [Tue, 23 Oct 2018 01:07:20 +0000 (03:07 +0200)] 
Update from gnulib: Make better use of Autoconf.

* gettext-runtime/m4/visibility.m4: Use AC_CACHE_CHECK where possible.

6 years agointl: Add support for per-thread locales on Solaris 11.4.
Bruno Haible [Mon, 22 Oct 2018 23:02:02 +0000 (01:02 +0200)] 
intl: Add support for per-thread locales on Solaris 11.4.

Relies on the recent changes to the 'localename' module in gnulib.

* gettext-runtime/intl/localename.c: Apply changes from gnulib.
* gettext-runtime/intl/localename-table.h: New file, from gnulib.
* gettext-runtime/intl/localename-table.c: New file, from gnulib.
* gettext-runtime/intl/libgnuintl.in.h (newlocale, duplocale, freelocale): New
overriding declarations.
* gettext-runtime/intl/Makefile.in (HEADERS): Add localename-table.h.
(SOURCES): Add localename-table.c.
(OBJECTS): Add localename-table.$lo.
(localename-table.lo): New target.
(libgnuintl.h, libintl.h): Substitute also HAVE_NAMELESS_LOCALES.
* gettext-runtime/m4/intl.m4: Apply changes from gnulib:
(gt_INTL_SUBDIR_CORE): Don't test for 'uselocale' and 'getlocalename_l'.
Instead, invoke gt_INTL_SOLARIS. Set HAVE_NAMELESS_LOCALES.
* gettext-runtime/m4/intlsolaris.m4: New file, from gnulib.
* gettext-runtime/m4/Makefile.am (EXTRA_DIST): Add it.
* gettext-tools/m4/Makefile.am (aclocal_DATA): Add intlsolaris.m4.
* gettext-tools/misc/gettextize.in (m4filelist): Add intlsolaris.m4.
* Makefile.am (distcheck-hook): Verify that intlsolaris.m4 is consistent with
gnulib.
* gettext-tools/doc/gettext.texi (aclocal): Add intlsolaris.m4 to the file list.
* PACKAGING: Add intlsolaris.m4 to the list of installed files.
* NEWS: Mention the change.

6 years agoUpdate to newest gnulib.
Bruno Haible [Mon, 22 Oct 2018 22:27:22 +0000 (00:27 +0200)] 
Update to newest gnulib.

6 years agoexamples: Fix another build failure.
Bruno Haible [Mon, 22 Oct 2018 22:35:58 +0000 (00:35 +0200)] 
examples: Fix another build failure.

* gettext-tools/examples/po/xsmallpot.sh: In hello-pascal, make sure to build
hello.rsj.

6 years agoNew subdirectory system-tests.
Bruno Haible [Sun, 21 Oct 2018 08:35:25 +0000 (10:35 +0200)] 
New subdirectory system-tests.

* gettext-tools/system-tests/Makefile.am: New file.
* gettext-tools/system-tests/README: New file.
* gettext-tools/system-tests/run-test: New file.
* gettext-tools/system-tests/testlocale.c: New file.
* gettext-tools/system-tests/intl-1-prg.c: New file.
* gettext-tools/system-tests/intl-3-prg.c: New file.
* gettext-tools/system-tests/intl-4-prg.c: New file.
* gettext-tools/system-tests/intl-5-prg.c: New file.
* gettext-tools/system-tests/intl-setlocale-1-prg.c: New file.
* gettext-tools/system-tests/intl-setlocale-2-prg.c: New file.
* gettext-tools/system-tests/intl-thread-1-prg.c: New file.
* gettext-tools/system-tests/intl-thread-2-prg.c: New file.
* gettext-tools/system-tests/intl-thread-3-prg.c: New file.
* gettext-tools/system-tests/format-c-3-prg.c: New file.
* gettext-tools/system-tests/format-c-4-prg.c: New file.
* gettext-tools/system-tests/format-c-5-prg.c: New file.
* gettext-tools/system-tests/plural-1-prg.c: New file.
* gettext-tools/Makefile.am (SUBDIRS): Add system-tests.
* gettext-tools/configure.ac (TEST_SYSTEM_LIBINTL): New conditional.
(AC_CONFIG_FILES): Add system-tests/Makefile.
* gettext-tools/tests/init.cfg: Include init-env from the tests/ directory.
* gettext-tools/tests/intl-5-prg.c: When USE_SYSTEM_LIBINTL is defined, use the
system's <libintl.h>.
* gettext-tools/tests/intl-setlocale-1-prg.c: Likewise.
* gettext-tools/tests/intl-setlocale-2-prg.c: Likewise.
* gettext-tools/tests/intl-thread-1-prg.c: Likewise.
* gettext-tools/tests/intl-thread-2-prg.c: Likewise.
* gettext-tools/tests/intl-thread-3-prg.c: Likewise.
* gettext-tools/tests/intl-1-prg.c: When USE_SYSTEM_LIBINTL is defined, use the
system's <libintl.h>.
* gettext-tools/tests/intl-3-prg.c: Likewise.
* gettext-tools/tests/intl-4-prg.c: Likewise.
* gettext-tools/tests/format-c-3-prg.c: Likewise.
* gettext-tools/tests/format-c-4-prg.c: Likewise.
* gettext-tools/tests/plural-1-prg.c: Likewise.
* gettext-tools/tests/format-c-5-prg.c: When USE_SYSTEM_LIBINTL is defined, use
the system's <libintl.h> and setenv instead of xsetenv, and no fake setlocale.
* gettext-tools/tests/format-c-3: When USE_SYSTEM_LIBINTL is defined, try
$LOCALE_FR and $LOCALE_FR_UTF8.
* gettext-tools/tests/format-c-4: Likewise.
* gettext-tools/tests/plural-1: Likewise.
* gettext-tools/tests/format-c-5: When USE_SYSTEM_LIBINTL is defined, try fa_IR
and fa_IR.UTF-8.

6 years agoUpdate comments.
Bruno Haible [Sat, 20 Oct 2018 22:01:22 +0000 (00:01 +0200)] 
Update comments.

* gettext-tools/tests/Makefile.am: Update comments.

6 years agoRename test gettext-8 to intl-5.
Bruno Haible [Sat, 20 Oct 2018 16:01:27 +0000 (18:01 +0200)] 
Rename test gettext-8 to intl-5.

* gettext-tools/tests/intl-5: Renamed from gettext-tools/tests/gettext-8.
* gettext-tools/tests/intl-5-prg.c: Renamed from
gettext-tools/tests/gettext-8-prg.c.
* gettext-tools/tests/Makefile.am: Update.

6 years agoRename test gettext-7 to intl-thread-3 and support more platforms.
Bruno Haible [Sat, 20 Oct 2018 15:54:03 +0000 (17:54 +0200)] 
Rename test gettext-7 to intl-thread-3 and support more platforms.

* gettext-tools/tests/intl-thread-3: Renamed from gettext-tools/tests/gettext-7.
Don't limit to fixed set of platforms.
* gettext-tools/tests/intl-thread-3-prg.c: Renamed from
gettext-tools/tests/gettext-7-prg.c. Expect locale names as arguments.
* gettext-tools/tests/intl-thread-3.po: Renamed from
gettext-tools/tests/gettext-7.po.
* gettext-tools/tests/Makefile.am: Update.

6 years agoMake the intl-thread-2 test effective on Solaris 11.
Bruno Haible [Sun, 21 Oct 2018 17:59:28 +0000 (19:59 +0200)] 
Make the intl-thread-2 test effective on Solaris 11.

* gettext-tools/m4/locale-de.m4: New file, based on locale-fr.m4 from gnulib.
* gettext-tools/m4/Makefile.am (EXTRA_DIST): Add it.
* gettext-tools/configure.ac: Invoke gt_LOCALE_DE_UTF8.
* gettext-tools/tests/init-env.in: Set LOCALE_DE_UTF8.
* gettext-tools/tests/intl-thread-2: Use a German instead of a Turkish locale.

6 years agoRename test gettext-6 to intl-thread-2 and support more platforms.
Bruno Haible [Sat, 20 Oct 2018 15:34:23 +0000 (17:34 +0200)] 
Rename test gettext-6 to intl-thread-2 and support more platforms.

* gettext-tools/tests/intl-thread-2: Renamed from gettext-tools/tests/gettext-6.
Don't limit to fixed set of platforms.
* gettext-tools/tests/intl-thread-2-prg.c: Renamed from
gettext-tools/tests/gettext-6-prg.c. Expect locale names as arguments.
* gettext-tools/tests/intl-thread-2-1.po: Renamed from
gettext-tools/tests/gettext-6-2.po. Convert to UTF-8.
* gettext-tools/tests/intl-thread-2-2.po: Renamed from
gettext-tools/tests/gettext-6-1.po. Convert to UTF-8.
* gettext-tools/tests/Makefile.am: Update.

6 years agoNew test intl-thread-1.
Bruno Haible [Sat, 20 Oct 2018 14:58:33 +0000 (16:58 +0200)] 
New test intl-thread-1.

* gettext-tools/tests/intl-thread-1: New file.
* gettext-tools/tests/intl-thread-1-prg.c: New file.
* gettext-tools/tests/intl-thread-1.po: New file.
* gettext-tools/tests/Makefile.am: Update.

6 years agoRename test gettext-5 to intl-setlocale-2.
Bruno Haible [Sat, 20 Oct 2018 13:16:54 +0000 (15:16 +0200)] 
Rename test gettext-5 to intl-setlocale-2.

* gettext-tools/tests/intl-setlocale-2: Renamed from
gettext-tools/tests/gettext-5.
* gettext-tools/tests/intl-setlocale-2-prg.c: Renamed from
gettext-tools/tests/gettext-5-prg.c.
* gettext-tools/tests/intl-setlocale-2.po: Renamed from
gettext-tools/tests/gettext-5.po.
* gettext-tools/tests/Makefile.am: Update.

6 years agoRename test gettext-4 to intl-4.
Bruno Haible [Sat, 20 Oct 2018 12:52:24 +0000 (14:52 +0200)] 
Rename test gettext-4 to intl-4.

* gettext-tools/tests/intl-4: Renamed from gettext-tools/tests/gettext-4.
* gettext-tools/tests/intl-4-prg.c: Renamed from
gettext-tools/tests/gettext-4-prg.c.
* gettext-tools/tests/intl-4.po: Renamed from gettext-tools/tests/gettext-4.po.
* gettext-tools/tests/Makefile.am: Update.

6 years agoNew test intl-3.
Bruno Haible [Sat, 20 Oct 2018 12:29:29 +0000 (14:29 +0200)] 
New test intl-3.

* gettext-tools/tests/intl-3: New file.
* gettext-tools/tests/intl-3-prg.c: New file.
* gettext-tools/tests/Makefile.amL Update.

6 years agoNew test intl-2.
Bruno Haible [Sat, 20 Oct 2018 12:21:39 +0000 (14:21 +0200)] 
New test intl-2.

* gettext-tools/tests/intl-2: New file.
* gettext-tools/tests/intl-2-1.po: New file.
* gettext-tools/tests/intl-2-2.po: New file.
* gettext-tools/tests/Makefile.am: Update.

6 years agoNew test intl-1.
Bruno Haible [Sat, 20 Oct 2018 11:53:09 +0000 (13:53 +0200)] 
New test intl-1.

* gettext-tools/tests/intl-1: New file.
* gettext-tools/tests/intl-1-prg.c: New file.
* gettext-tools/tests/intl-1.po: New file.
* gettext-tools/tests/Makefile.am: Update.

6 years agoRename gettext-3 test to intl-setlocale-1.
Bruno Haible [Sat, 20 Oct 2018 11:28:40 +0000 (13:28 +0200)] 
Rename gettext-3 test to intl-setlocale-1.

* gettext-tools/tests/intl-setlocale-1: Renamed from
gettext-tools/tests/gettext-3.
* gettext-tools/tests/intl-setlocale-1-prg.c: Renamed from
gettext-tools/tests/gettext-3-prg.c.
* gettext-tools/tests/intl-setlocale-1-1.po: Renamed from
gettext-tools/tests/gettext-3-1.po.
* gettext-tools/tests/intl-setlocale-1-2.po: Renamed from
gettext-tools/tests/gettext-3-2.po.
* gettext-tools/tests/Makefile.am: Update.

6 years agoUpdate PACKAGING documentation.
Bruno Haible [Sun, 21 Oct 2018 17:55:44 +0000 (19:55 +0200)] 
Update PACKAGING documentation.

* PACKAGING: Remove mention of charset.alias (dropped on 2018-05-19).
Mention that libintl does not get installed on Solaris 11.

6 years agoTests: Update comments.
Bruno Haible [Fri, 19 Oct 2018 23:01:56 +0000 (01:01 +0200)] 
Tests: Update comments.

* gettext-tools/tests/lang-python-1: Update comment about Python versions.
* gettext-tools/tests/lang-python-2: Likewise.
* gettext-tools/tests/lang-pascal: Update comment about fpk versions.

6 years agoFix lang-bash test failure in VPATH builds.
Bruno Haible [Sun, 21 Oct 2018 11:20:34 +0000 (13:20 +0200)] 
Fix lang-bash test failure in VPATH builds.

* gettext-tools/tests/lang-bash: Prepend the gettext-runtime/src build dir,
not the gettext-runtime/src source dir, to PATH.

6 years agoFix 'make dist' (recent regression).
Bruno Haible [Fri, 19 Oct 2018 22:23:43 +0000 (00:23 +0200)] 
Fix 'make dist' (recent regression).

* gettext-tools/examples/Makefile.am (EXAMPLESFILES): Remove
hello-pascal/hello.rst.

6 years agoexamples: Modernize configure.ac.
Bruno Haible [Fri, 19 Oct 2018 12:14:28 +0000 (14:14 +0200)] 
examples: Modernize configure.ac.

* gettext-tools/examples/hello-*/configure.ac: Use the recommended AC_INIT and
AM_INIT_AUTOMAKE syntax. Require automake >= 1.11.

6 years agoexamples: Add a script for checking against mistakes.
Bruno Haible [Thu, 18 Oct 2018 01:31:50 +0000 (03:31 +0200)] 
examples: Add a script for checking against mistakes.

* gettext-tools/examples/check-examples: New file.
* gettext-tools/examples/HACKING: New file.
* gettext-tools/examples/Makefile.am (EXTRA_DIST): Add them.
* Admin/release-steps: Mention check-examples.

6 years agoexamples: hello-pascal: Fix 'make distcheck'.
Bruno Haible [Thu, 18 Oct 2018 18:46:29 +0000 (20:46 +0200)] 
examples: hello-pascal: Fix 'make distcheck'.

* gettext-tools/examples/hello-pascal/Makefile.am (hello$(EXEEXT)): Move
hello.rsj into $(srcdir) only if the new contents differs from the old contents.

6 years agoexamples: hello-java*: Fix 'make distcheck'.
Bruno Haible [Thu, 18 Oct 2018 19:35:12 +0000 (21:35 +0200)] 
examples: hello-java*: Fix 'make distcheck'.

* gettext-tools/examples/hello-java*/po/Makefile.am (update-properties): Create
the new .properties files in the build dir and move them to $(srcdir) only if
the new contents differs from the old contents.
(update-classes): Likewise, also for .class files.

6 years agoexamples: hello-csharp*: Improve 'make maintainer-clean'.
Bruno Haible [Thu, 18 Oct 2018 18:19:47 +0000 (20:19 +0200)] 
examples: hello-csharp*: Improve 'make maintainer-clean'.

* gettext-tools/examples/hello-csharp*/po/Makefile.am (MAINTAINERCLEANFILES):
Don't list the $(RESOURCESDLLFILES) here.
(maintainer-clean-local): Instead, remove them and their parent directories
here.

6 years agoexamples: hello-php: Fix runtime error.
Bruno Haible [Thu, 18 Oct 2018 01:04:47 +0000 (03:04 +0200)] 
examples: hello-php: Fix runtime error.

* gettext-tools/examples/hello-php/hello.php: Fix the PHP markup. Don't print
the return value of the printf function.

6 years agoexamples: hello-tcl*: Fix runtime error.
Bruno Haible [Thu, 18 Oct 2018 01:03:59 +0000 (03:03 +0200)] 
examples: hello-tcl*: Fix runtime error.

* gettext-tools/examples/hello-tcl*/configure.ac: Ensure pkgdatadir is an
absolute file name without variable references.

6 years agoexamples: hello-clisp: Fix runtime error with clisp versions >= 2.34.
Bruno Haible [Thu, 18 Oct 2018 01:02:49 +0000 (03:02 +0200)] 
examples: hello-clisp: Fix runtime error with clisp versions >= 2.34.

* gettext-tools/examples/hello-clisp/hello.lisp.in: Use the function
PROCESS-ID, not PROGRAM-ID.

6 years agoexamples: Fix 'make dist' failures in VPATH builds.
Bruno Haible [Thu, 18 Oct 2018 00:33:46 +0000 (02:33 +0200)] 
examples: Fix 'make dist' failures in VPATH builds.

* gettext-tools/examples/hello-*/po/Makefile.am (distdir1): Invoke target
'stamp-po' after having done target 'update-po'.

6 years agoexamples: hello-pascal: Fix 'make dist' failure in VPATH builds.
Bruno Haible [Wed, 17 Oct 2018 23:35:11 +0000 (01:35 +0200)] 
examples: hello-pascal: Fix 'make dist' failure in VPATH builds.

* gettext-tools/examples/hello-pascal/Makefile.am: Generate hello.rsj
in $(srcdir), not in the build dir.

6 years agoexamples: hello-pascal: Fix 'make dist'.
Bruno Haible [Wed, 17 Oct 2018 22:58:04 +0000 (00:58 +0200)] 
examples: hello-pascal: Fix 'make dist'.

* gettext-tools/examples/hello-pascal/Makefile.am (EXTRA_DIST): Add the source
file.

6 years agoexamples: hello-java*: Fix "make dist".
Bruno Haible [Wed, 17 Oct 2018 20:03:55 +0000 (22:03 +0200)] 
examples: hello-java*: Fix "make dist".

* gettext-runtime/m4/po.m4 (AM_POSTPROCESS_PO_MAKEFILE): Change PROPERTIESFILES
and CLASSFILES to contain files in $(srcdir), not in $(top_srcdir).
* gettext-tools/examples/hello-java*/Makefile.am (hello.jar): Fetch the catalogs
from the po/ directory.
* gettext-tools/examples/hello-java*/po/Makefile.am (MAINTAINERCLEANFILES):
Add the .properties and the .class files.
(EXTRA_DIST): Add the .properties files.
(update-properties, update-classes): Generate the .properties and .class files
in the po/ directory, not in the top-level directory.
* gettext-tools/examples/hello-java*/autoclean.sh: Remove the catalogs in
the po/ directory, not in the top-level directory.

6 years agoexamples: Fix 'make dist'.
Bruno Haible [Wed, 17 Oct 2018 20:00:04 +0000 (22:00 +0200)] 
examples: Fix 'make dist'.

* gettext-tools/examples/hello-c/m4/Makefile.am (EXTRA_DIST): Add all files
that are brought in by 'autopoint'.
* gettext-tools/examples/hello-c-gnome/m4/Makefile.am (EXTRA_DIST): Likewise.
* gettext-tools/examples/hello-c-gnome3/m4/Makefile.am (EXTRA_DIST): Likewise.
* gettext-tools/examples/hello-c++/m4/Makefile.am (EXTRA_DIST): Likewise.
* gettext-tools/examples/hello-c++-kde/m4/Makefile.am (EXTRA_DIST): Likewise.
* gettext-tools/examples/hello-c++-gnome/m4/Makefile.am (EXTRA_DIST): Likewise.
* gettext-tools/examples/hello-objc/m4/Makefile.am (EXTRA_DIST): Likewise.
* gettext-tools/examples/hello-objc-gnome/m4/Makefile.am (EXTRA_DIST): Likewise.

6 years agoexamples: Fix 'make' failures in VPATH builds.
Bruno Haible [Wed, 17 Oct 2018 12:55:58 +0000 (14:55 +0200)] 
examples: Fix 'make' failures in VPATH builds.

* gettext-tools/examples/hello-java*/Makefile.am (hello_RESOURCES,
MAINTAINERCLEANFILES): Remove variables.
(hello.jar): Use two jar commands, to combine .class files from the build dir
with .properties files from the source dir.
* gettext-tools/examples/hello-java*/po/Makefile.am (update-properties,
update-classes): Reference the .pot file in the source dir, not in the build
dir.
(echo-catalogs): Include the fallback catalog.
* gettext-tools/examples/hello-pascal/Makefile.am (hello_SOURCES): Add $(srcdir)
prefix.
(hello$(EXEEXT)): Use -o option to specify where the object file and the
executable file shall be created.

6 years agoexamples: hello-csharp-forms: Fix 'make clean'.
Bruno Haible [Wed, 17 Oct 2018 07:31:28 +0000 (09:31 +0200)] 
examples: hello-csharp-forms: Fix 'make clean'.

* gettext-tools/examples/hello-csharp-forms/Makefile.am (CLEANFILES): Add
hello.net.exe.mdb.

6 years agoexamples: hello-csharp: Fix 'make clean'.
Bruno Haible [Wed, 17 Oct 2018 07:30:49 +0000 (09:30 +0200)] 
examples: hello-csharp: Fix 'make clean'.

* gettext-tools/examples/hello-csharp/Makefile.am (CLEANFILES): Add
hello.net.exe.mdb.

6 years agoexamples: hello-objc-gnustep: Fix 'make distclean'.
Bruno Haible [Wed, 17 Oct 2018 07:28:11 +0000 (09:28 +0200)] 
examples: hello-objc-gnustep: Fix 'make distclean'.

* gettext-tools/examples/hello-objc-gnustep/GNUmakefile (internal-distclean):
Remove the *.lproj directories.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile (internal-clean):
Remove remove-potcdate.sed.

6 years agoexamples: hello-pascal: Fix 'make maintainer-clean'.
Bruno Haible [Wed, 17 Oct 2018 00:09:06 +0000 (02:09 +0200)] 
examples: hello-pascal: Fix 'make maintainer-clean'.

* gettext-tools/examples/hello-pascal/Makefile.am (MAINTAINERCLEANFILES): New
variable.

6 years agoexamples: hello-java: Fix 'make' failure.
Bruno Haible [Tue, 16 Oct 2018 11:03:35 +0000 (13:03 +0200)] 
examples: hello-java: Fix 'make' failure.

* gettext-tools/examples/hello-java/po/Makefile.am (stamp-po): Fix syntax error.

6 years agoexamples: hello-pascal: Update.
Bruno Haible [Tue, 16 Oct 2018 01:14:41 +0000 (03:14 +0200)] 
examples: hello-pascal: Update.

* gettext-tools/examples/hello-pascal/configure.ac (PPC): Test for ppcx64 if
ppc386 is not found.
* gettext-tools/examples/hello-pascal/hello.rst: Remove file.
* gettext-tools/examples/hello-pascal/Makefile.am: hello.rsj replaces hello.rst.
(SUBDIRS): Proceed in current directory before recursing into po/.
* gettext-tools/examples/hello-pascal/po/Makefile.am (POTFILES): hello.rsj
replaces hello.rst.
* gettext-tools/examples/hello-pascal/autoclean.sh: Remove hello.rsj.

6 years agoexamples: Correctly clean up left-over files.
Bruno Haible [Wed, 17 Oct 2018 17:01:20 +0000 (19:01 +0200)] 
examples: Correctly clean up left-over files.

* gettext-tools/examples/hello-csharp/autoclean.sh: Handle shell wildcard
correctly.
* gettext-tools/examples/hello-csharp-forms/autoclean.sh: Likewise.

6 years agoexamples: Remove left-over files.
Bruno Haible [Mon, 15 Oct 2018 21:54:16 +0000 (23:54 +0200)] 
examples: Remove left-over files.

* gettext-tools/examples/hello-*/autoclean.sh: Remove left-over files.

6 years agoexamples: Clean up autoconf left-over.
Bruno Haible [Mon, 15 Oct 2018 20:50:21 +0000 (22:50 +0200)] 
examples: Clean up autoconf left-over.

* gettext-tools/examples/hello-*/autoclean.sh: Remove the 'autom4te.cache'
directory.

6 years agoexamples: hello-c++-widgets: Update build infrastructure.
Bruno Haible [Mon, 15 Oct 2018 21:03:00 +0000 (23:03 +0200)] 
examples: hello-c++-widgets: Update build infrastructure.

* gettext-tools/examples/hello-c++-widgets/autogen.sh: Pull in some more .m4
files.
* gettext-tools/examples/hello-c++-widgets/autoclean.sh: Remove them.

6 years agoUpdate test after gnulib module 'localcharset' changed.
Bruno Haible [Mon, 15 Oct 2018 08:05:13 +0000 (10:05 +0200)] 
Update test after gnulib module 'localcharset' changed.

* gettext-tools/tests/gettext-4-prg.c: Treat Haiku like BeOS.

6 years agoexamples: Fix "make dist" error.
Bruno Haible [Sun, 14 Oct 2018 21:36:24 +0000 (23:36 +0200)] 
examples: Fix "make dist" error.

* gettext-tools/examples/po/xsmallpot.sh (hello-c++-kde): Invoke 'autopoint'
before, not after, 'aclocal'.

6 years agoexamples: Update developer documentation.
Bruno Haible [Sun, 14 Oct 2018 21:34:22 +0000 (23:34 +0200)] 
examples: Update developer documentation.

* gettext-tools/examples/hello-csharp*/po/Makefile.am: Add comment.
* gettext-tools/examples/hello-tcl*/po/Makefile.am: Likewise.

6 years agoexamples: Improve developer documentation.
Bruno Haible [Sun, 14 Oct 2018 21:33:35 +0000 (23:33 +0200)] 
examples: Improve developer documentation.

* gettext-tools/examples/README: Add note about po/ directories.

6 years agoexamples: Improve developer documentation.
Bruno Haible [Sun, 14 Oct 2018 21:31:07 +0000 (23:31 +0200)] 
examples: Improve developer documentation.

* HACKING: Mention dependency needed for examples.
* gettext-tools/examples/hello-objc-gnustep/INSTALL: Small clarifications.

6 years agoFix list of dependencies.
Bruno Haible [Sun, 14 Oct 2018 21:25:18 +0000 (23:25 +0200)] 
Fix list of dependencies.

* DEPENDENCIES: Add libacl.

6 years agoC# doc: Fix typo in Makefile.
Bruno Haible [Sun, 14 Oct 2018 21:24:19 +0000 (23:24 +0200)] 
C# doc: Fix typo in Makefile.

* gettext-runtime/intl-csharp/Makefile.am (doc): Fix typo.

6 years agogettextize: Don't redirect stderr.
Bruno Haible [Sat, 13 Oct 2018 10:15:09 +0000 (12:15 +0200)] 
gettextize: Don't redirect stderr.

Reported by ShellCheck via Pavel Raiskup <praiskup@redhat.com>.

* gettext-tools/misc/gettextize.in: Don't redirect stderr.

6 years agoautopoint: Don't redirect stderr.
Bruno Haible [Sat, 13 Oct 2018 09:56:36 +0000 (11:56 +0200)] 
autopoint: Don't redirect stderr.

Reported by ShellCheck via Pavel Raiskup <praiskup@redhat.com>.

* gettext-tools/misc/autopoint.in (func_version_prereq): Don't redirect stderr.

6 years agoFix "make dist" error (regression from 2018-10-09).
Bruno Haible [Sun, 14 Oct 2018 22:51:02 +0000 (00:51 +0200)] 
Fix "make dist" error (regression from 2018-10-09).

* gettext-tools/examples/Makefile.am (EXAMPLESFILES): Remove
hello-csharp-forms/BUGS.

6 years agoC# support: Remove pnet choice.
Bruno Haible [Tue, 9 Oct 2018 00:44:00 +0000 (02:44 +0200)] 
C# support: Remove pnet choice.

* DEPENDENCIES: Don't mention pnet.
* PACKAGING: Likewise.
* gettext-tools/src/format-csharp.c: Simplify comment.
* gettext-tools/src/msgfmt.cs: Remove workarounds for cscc.
* gettext-tools/src/write-csharp.c (write_csharp_code): Update comment.
* gettext-tools/doc/gettext.texi (C#): Don't mention resgen.
* gettext-tools/tests/lang-csharp: Rely on mono, not pnet.
* gettext-tools/examples/hello-csharp/INSTALL: Likewise.
* gettext-tools/examples/hello-csharp-forms/INSTALL: Likewise.
* gettext-tools/examples/hello-csharp-forms/BUGS: Remove file.

6 years agoUpdate to newest gnulib.
Bruno Haible [Tue, 9 Oct 2018 00:43:13 +0000 (02:43 +0200)] 
Update to newest gnulib.

6 years agoFix a build failure on mingw with -O0.
Bruno Haible [Sat, 6 Oct 2018 08:18:06 +0000 (10:18 +0200)] 
Fix a build failure on mingw with -O0.

Reported at <https://savannah.gnu.org/bugs/?36443>.
Fix suggested by Evgeny Grin <k2k@narod.ru>
in <https://savannah.gnu.org/bugs/?36443#comment4>.

* gnulib-local/build-aux/moopp (func_emit_source_h): Wrap the function
declarations in extern "C" {}.

6 years agomsgfmt: Remove outdated warning.
Bruno Haible [Wed, 3 Oct 2018 22:58:24 +0000 (00:58 +0200)] 
msgfmt: Remove outdated warning.

* gettext-tools/src/msgfmt.c (msgfmt_parse_debrief): Remove outdated warning.
(struct msgfmt_catalog_reader_ty): Remove field 'has_nonfuzzy_header_entry'.
(msgfmt_constructor, msgfmt_frob_new_message): Update.

6 years agoFix conflict between different uses of GETTEXTLIBDIR.
Bruno Haible [Tue, 2 Oct 2018 13:25:53 +0000 (15:25 +0200)] 
Fix conflict between different uses of GETTEXTLIBDIR.

Rationale: The programs installed in $(prefix)/lib/gettext/ are at different
locations before installation: some are in the source tree, some are in the
build tree.

* gettext-tools/src/msginit.c (project_id, project_id_version): Test
GETTEXTLIBDIR_SRCDIR, not GETTEXTLIBDIR.
(plural_forms): Test GETTEXTLIBDIR_BUILDDIR, not GETTEXTLIBDIR.
* gettext-tools/tests/msginit-3: Set GETTEXTLIBDIR_SRCDIR, not GETTEXTLIBDIR.
* gettext-tools/tests/msginit-4: Set both GETTEXTLIBDIR_SRCDIR and
GETTEXTLIBDIR_BUILDDIR.

6 years agoFix conflict between different uses of GETTEXTDATADIR.
Bruno Haible [Tue, 2 Oct 2018 12:57:22 +0000 (14:57 +0200)] 
Fix conflict between different uses of GETTEXTDATADIR.

* gettext-tools/src/read-tcl.c (msgdomain_read_tcl): Test GETTEXTTCLDIR, not
GETTEXTDATADIR.
* gettext-tools/tests/msgunfmt-tcl-1: Set GETTEXTTCLDIR, not GETTEXTDATADIR.

6 years agoFix msginit-4 test failure when run step-by-step.
Bruno Haible [Tue, 2 Oct 2018 12:43:43 +0000 (14:43 +0200)] 
Fix msginit-4 test failure when run step-by-step.

* gettext-tools/tests/msginit-4: Don't assume that the test is run in a
directory with just one POT file.

6 years agocldr-plurals: Improve error handling.
Bruno Haible [Tue, 2 Oct 2018 11:39:13 +0000 (13:39 +0200)] 
cldr-plurals: Improve error handling.

* gettext-tools/src/cldr-plurals.c (extract_rules): Let libxml2 show errors.
Don't assume that the error was an out-of-memory.

6 years agoRemove unnecessary trailing comma in struct initializers.
Bruno Haible [Mon, 1 Oct 2018 13:47:14 +0000 (15:47 +0200)] 
Remove unnecessary trailing comma in struct initializers.

* gettext-tools/src/msgattrib.c (long_options): Remove trailing comma in
initializer.
* gettext-tools/src/msgcat.c (long_options): Likewise.
* gettext-tools/src/msgcomm.c (long_options): Likewise.
* gettext-tools/src/msgconv.c (long_options): Likewise.
* gettext-tools/src/msgen.c (long_options): Likewise.
* gettext-tools/src/msgfilter.c (long_options): Likewise.
* gettext-tools/src/msgmerge.c (long_options): Likewise.
* gettext-tools/src/msgunfmt.c (long_options): Likewise.
* gettext-tools/src/msguniq.c (long_options): Likewise.
* gettext-tools/src/xgettext.c (long_options): Likewise.

6 years agoExplain how to concatenate POT files.
Bruno Haible [Mon, 1 Oct 2018 09:09:29 +0000 (11:09 +0200)] 
Explain how to concatenate POT files.

Reported by Hadi Farah in
<https://lists.gnu.org/archive/html/bug-gettext/2018-09/msg00026.html>.

* gettext-tools/doc/msgcat.texi: Explain how to concatenate POT files.

6 years agoInclude gnulib module 'mkdir', needed for older mingw versions.
Bruno Haible [Fri, 5 Oct 2018 20:12:05 +0000 (22:12 +0200)] 
Include gnulib module 'mkdir', needed for older mingw versions.

Reported by Maarten Bosmans at <https://savannah.gnu.org/bugs/?33379>.

* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add 'mkdir'.