gnulib: let it use its own PO domain

See
https://www.gnu.org/software/gnulib/manual/html_node/Localization.html.

* bootstrap.conf: Create gnulib-po.
* Makefile.am, configure.ac: Use it.
* po/POTFILES.in: Remove files now in gnulib.
* src/main.c: Open the bison-gnulib domain.
This commit is contained in:
Akim Demaille
2018-10-07 08:25:21 +02:00
parent a992a3cb9e
commit a4d33cdf48
7 changed files with 8 additions and 26 deletions

View File

@@ -18,7 +18,7 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = po runtime-po . SUBDIRS = po runtime-po gnulib-po .
# Files installed for use by Automake. # Files installed for use by Automake.
aclocaldir = @aclocaldir@ aclocaldir = @aclocaldir@

8
TODO
View File

@@ -1,13 +1,5 @@
* Bison 3.4 * Bison 3.4
** use gettext-h in gnulib instead of gettext ** use gettext-h in gnulib instead of gettext
** use gnulib-po
For some reason, according to syntax-check, we have to keep getopt.c in
POTIFILES.in, but not bitset/stats.c, although both come from gnulib. But
bitset/stats.c is a symlink, not getopt.c. This is fishy and should be
fixed.
Meanwhile, bitset/stats.c is removed from the set of translations, which is
not too much of a problem as users are not expected to see this.
** bad diagnostics ** bad diagnostics
%token <val> NUM %token <val> NUM

View File

@@ -85,7 +85,7 @@ excluded_files='
m4/visibility.m4 m4/visibility.m4
' '
gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk' gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk --po-base=gnulib-po --po-domain=bison'
bootstrap_post_import_hook() bootstrap_post_import_hook()
{ {

View File

@@ -251,6 +251,7 @@ AM_WITH_DMALLOC
AM_GNU_GETTEXT([external], [need-ngettext]) AM_GNU_GETTEXT([external], [need-ngettext])
AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT_VERSION([0.18])
BISON_I18N BISON_I18N
AC_CONFIG_FILES([gnulib-po/Makefile.in])
# Internationalized parsers. # Internationalized parsers.
AC_CONFIG_FILES([runtime-po/Makefile.in]) AC_CONFIG_FILES([runtime-po/Makefile.in])

2
gnulib

Submodule gnulib updated: d6af24178c...14a920195e

View File

@@ -17,15 +17,3 @@ src/scan-code.l
src/scan-gram.l src/scan-gram.l
src/scan-skel.l src/scan-skel.l
src/symtab.c src/symtab.c
lib/argmatch.c
lib/closeout.c
lib/error.c
lib/getopt.c
lib/obstack.c
lib/spawn-pipe.c
lib/quotearg.c
lib/timevar.c
lib/w32spawn.h
lib/wait-process.c
lib/xalloc-die.c

View File

@@ -66,11 +66,12 @@ main (int argc, char *argv[])
{ {
char *cp = NULL; char *cp = NULL;
char const *localedir = relocate2 (LOCALEDIR, &cp); char const *localedir = relocate2 (LOCALEDIR, &cp);
(void) bindtextdomain (PACKAGE, localedir); bindtextdomain ("bison", localedir);
(void) bindtextdomain ("bison-runtime", localedir); bindtextdomain ("bison-gnulib", localedir);
bindtextdomain ("bison-runtime", localedir);
free (cp); free (cp);
} }
(void) textdomain (PACKAGE); textdomain ("bison");
{ {
char const *cp = getenv ("LC_CTYPE"); char const *cp = getenv ("LC_CTYPE");