diff options
Diffstat (limited to 'gl/m4/po.m4')
-rw-r--r-- | gl/m4/po.m4 | 67 |
1 files changed, 32 insertions, 35 deletions
diff --git a/gl/m4/po.m4 b/gl/m4/po.m4 index 1c70b6c1..26a5a6f5 100644 --- a/gl/m4/po.m4 +++ b/gl/m4/po.m4 | |||
@@ -1,16 +1,16 @@ | |||
1 | # po.m4 serial 21 (gettext-0.18.3) | 1 | # po.m4 serial 31 (gettext-0.20.2) |
2 | dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
6 | dnl | 6 | dnl |
7 | dnl This file can can be used in projects which are not available under | 7 | dnl This file can be used in projects which are not available under |
8 | dnl the GNU General Public License or the GNU Library General Public | 8 | dnl the GNU General Public License or the GNU Lesser General Public |
9 | dnl License but which still want to provide support for the GNU gettext | 9 | dnl License but which still want to provide support for the GNU gettext |
10 | dnl functionality. | 10 | dnl functionality. |
11 | dnl Please note that the actual code of the GNU gettext library is covered | 11 | dnl Please note that the actual code of the GNU gettext library is covered |
12 | dnl by the GNU Library General Public License, and the rest of the GNU | 12 | dnl by the GNU Lesser General Public License, and the rest of the GNU |
13 | dnl gettext package package is covered by the GNU General Public License. | 13 | dnl gettext package is covered by the GNU General Public License. |
14 | dnl They are *not* in the public domain. | 14 | dnl They are *not* in the public domain. |
15 | 15 | ||
16 | dnl Authors: | 16 | dnl Authors: |
@@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS], | |||
30 | 30 | ||
31 | dnl Release version of the gettext macros. This is used to ensure that | 31 | dnl Release version of the gettext macros. This is used to ensure that |
32 | dnl the gettext macros and po/Makefile.in.in are in sync. | 32 | dnl the gettext macros and po/Makefile.in.in are in sync. |
33 | AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) | 33 | AC_SUBST([GETTEXT_MACRO_VERSION], [0.20]) |
34 | 34 | ||
35 | dnl Perform the following tests also if --disable-nls has been given, | 35 | dnl Perform the following tests also if --disable-nls has been given, |
36 | dnl because they are needed for "make dist" to work. | 36 | dnl because they are needed for "make dist" to work. |
@@ -46,13 +46,6 @@ AC_DEFUN([AM_PO_SUBDIRS], | |||
46 | 46 | ||
47 | dnl Test whether it is GNU msgfmt >= 0.15. | 47 | dnl Test whether it is GNU msgfmt >= 0.15. |
48 | changequote(,)dnl | 48 | changequote(,)dnl |
49 | case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | ||
50 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; | ||
51 | *) MSGFMT_015=$MSGFMT ;; | ||
52 | esac | ||
53 | changequote([,])dnl | ||
54 | AC_SUBST([MSGFMT_015]) | ||
55 | changequote(,)dnl | ||
56 | case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | 49 | case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
57 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; | 50 | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; |
58 | *) GMSGFMT_015=$GMSGFMT ;; | 51 | *) GMSGFMT_015=$GMSGFMT ;; |
@@ -83,11 +76,21 @@ changequote([,])dnl | |||
83 | AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, | 76 | AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, |
84 | [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) | 77 | [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) |
85 | 78 | ||
86 | dnl Installation directories. | 79 | dnl Test whether it is GNU msgmerge >= 0.20. |
87 | dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we | 80 | if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then |
88 | dnl have to define it here, so that it can be used in po/Makefile. | 81 | MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt' |
89 | test -n "$localedir" || localedir='${datadir}/locale' | 82 | else |
90 | AC_SUBST([localedir]) | 83 | dnl Test whether it is GNU msgmerge >= 0.12. |
84 | if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then | ||
85 | MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet' | ||
86 | else | ||
87 | dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is | ||
88 | dnl slow. But this is not a big problem, as such old gettext versions are | ||
89 | dnl hardly in use any more. | ||
90 | MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet' | ||
91 | fi | ||
92 | fi | ||
93 | AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION]) | ||
91 | 94 | ||
92 | dnl Support for AM_XGETTEXT_OPTION. | 95 | dnl Support for AM_XGETTEXT_OPTION. |
93 | test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= | 96 | test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= |
@@ -130,14 +133,11 @@ changequote([,])dnl | |||
130 | if test -n "$OBSOLETE_ALL_LINGUAS"; then | 133 | if test -n "$OBSOLETE_ALL_LINGUAS"; then |
131 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" | 134 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
132 | fi | 135 | fi |
133 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | 136 | ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
134 | # Hide the ALL_LINGUAS assignment from automake < 1.5. | ||
135 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | ||
136 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | 137 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
137 | else | 138 | else |
138 | # The set of available languages was given in configure.in. | 139 | # The set of available languages was given in configure.in. |
139 | # Hide the ALL_LINGUAS assignment from automake < 1.5. | 140 | ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS |
140 | eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' | ||
141 | fi | 141 | fi |
142 | # Compute POFILES | 142 | # Compute POFILES |
143 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | 143 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
@@ -208,9 +208,8 @@ changequote([,])dnl | |||
208 | esac | 208 | esac |
209 | done]], | 209 | done]], |
210 | [# Capture the value of obsolete ALL_LINGUAS because we need it to compute | 210 | [# Capture the value of obsolete ALL_LINGUAS because we need it to compute |
211 | # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it | 211 | # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. |
212 | # from automake < 1.5. | 212 | OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS" |
213 | eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' | ||
214 | # Capture the value of LINGUAS because we need it to compute CATALOGS. | 213 | # Capture the value of LINGUAS because we need it to compute CATALOGS. |
215 | LINGUAS="${LINGUAS-%UNSET%}" | 214 | LINGUAS="${LINGUAS-%UNSET%}" |
216 | ]) | 215 | ]) |
@@ -311,15 +310,13 @@ changequote([,])dnl | |||
311 | fi | 310 | fi |
312 | if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then | 311 | if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then |
313 | # The LINGUAS file contains the set of available languages. | 312 | # The LINGUAS file contains the set of available languages. |
314 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | 313 | ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
315 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | 314 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
316 | else | 315 | else |
317 | # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. | 316 | # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. |
318 | sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` | 317 | sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` |
319 | ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` | 318 | ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` |
320 | fi | 319 | fi |
321 | # Hide the ALL_LINGUAS assignment from automake < 1.5. | ||
322 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | ||
323 | # Compute POFILES | 320 | # Compute POFILES |
324 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | 321 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
325 | # Compute UPDATEPOFILES | 322 | # Compute UPDATEPOFILES |
@@ -329,9 +326,9 @@ changequote([,])dnl | |||
329 | # Compute GMOFILES | 326 | # Compute GMOFILES |
330 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) | 327 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) |
331 | # Compute PROPERTIESFILES | 328 | # Compute PROPERTIESFILES |
332 | # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) | 329 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties) |
333 | # Compute CLASSFILES | 330 | # Compute CLASSFILES |
334 | # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) | 331 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class) |
335 | # Compute QMFILES | 332 | # Compute QMFILES |
336 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) | 333 | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) |
337 | # Compute MSGFILES | 334 | # Compute MSGFILES |
@@ -356,8 +353,8 @@ changequote([,])dnl | |||
356 | UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" | 353 | UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" |
357 | DUMMYPOFILES="$DUMMYPOFILES $lang.nop" | 354 | DUMMYPOFILES="$DUMMYPOFILES $lang.nop" |
358 | GMOFILES="$GMOFILES $srcdirpre$lang.gmo" | 355 | GMOFILES="$GMOFILES $srcdirpre$lang.gmo" |
359 | PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" | 356 | PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties" |
360 | CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" | 357 | CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class" |
361 | QMFILES="$QMFILES $srcdirpre$lang.qm" | 358 | QMFILES="$QMFILES $srcdirpre$lang.qm" |
362 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | 359 | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
363 | MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" | 360 | MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" |