aboutsummaryrefslogtreecommitdiff
path: root/po/m4/gettext.m4
diff options
context:
space:
mode:
Diffstat (limited to 'po/m4/gettext.m4')
-rw-r--r--po/m4/gettext.m430
1 files changed, 15 insertions, 15 deletions
diff --git a/po/m4/gettext.m4 b/po/m4/gettext.m4
index c7f54609..f4492405 100644
--- a/po/m4/gettext.m4
+++ b/po/m4/gettext.m4
@@ -1,5 +1,5 @@
1# gettext.m4 serial 71 (gettext-0.20.2) 1# gettext.m4 serial 72 (gettext-0.21.1)
2dnl Copyright (C) 1995-2014, 2016, 2018-2021 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -55,22 +55,22 @@ dnl
55AC_DEFUN([AM_GNU_GETTEXT], 55AC_DEFUN([AM_GNU_GETTEXT],
56[ 56[
57 dnl Argument checking. 57 dnl Argument checking.
58 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], , 58 m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], ,
59 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT 59 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
60])])])]) 60])])])])
61 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], 61 m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old],
62 [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. 62 [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
63])]) 63])])
64 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , 64 m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], ,
65 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT 65 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
66])])])]) 66])])])])
67 define([gt_included_intl], 67 define([gt_included_intl],
68 ifelse([$1], [external], [no], [yes])) 68 m4_if([$1], [external], [no], [yes]))
69 gt_NEEDS_INIT 69 gt_NEEDS_INIT
70 AM_GNU_GETTEXT_NEED([$2]) 70 AM_GNU_GETTEXT_NEED([$2])
71 71
72 AC_REQUIRE([AM_PO_SUBDIRS])dnl 72 AC_REQUIRE([AM_PO_SUBDIRS])dnl
73 ifelse(gt_included_intl, yes, [ 73 m4_if(gt_included_intl, yes, [
74 AC_REQUIRE([AM_INTL_SUBDIR])dnl 74 AC_REQUIRE([AM_INTL_SUBDIR])dnl
75 ]) 75 ])
76 76
@@ -88,7 +88,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
88 dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. 88 dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
89 dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. 89 dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
90 dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. 90 dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
91 ifelse(gt_included_intl, yes, , [ 91 m4_if(gt_included_intl, yes, , [
92 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) 92 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
93 ]) 93 ])
94 94
@@ -98,7 +98,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
98 dnl Set USE_NLS. 98 dnl Set USE_NLS.
99 AC_REQUIRE([AM_NLS]) 99 AC_REQUIRE([AM_NLS])
100 100
101 ifelse(gt_included_intl, yes, [ 101 m4_if(gt_included_intl, yes, [
102 BUILD_INCLUDED_LIBINTL=no 102 BUILD_INCLUDED_LIBINTL=no
103 USE_INCLUDED_LIBINTL=no 103 USE_INCLUDED_LIBINTL=no
104 ]) 104 ])
@@ -118,7 +118,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
118 dnl If we use NLS figure out what method 118 dnl If we use NLS figure out what method
119 if test "$USE_NLS" = "yes"; then 119 if test "$USE_NLS" = "yes"; then
120 gt_use_preinstalled_gnugettext=no 120 gt_use_preinstalled_gnugettext=no
121 ifelse(gt_included_intl, yes, [ 121 m4_if(gt_included_intl, yes, [
122 AC_MSG_CHECKING([whether included gettext is requested]) 122 AC_MSG_CHECKING([whether included gettext is requested])
123 AC_ARG_WITH([included-gettext], 123 AC_ARG_WITH([included-gettext],
124 [ --with-included-gettext use the GNU gettext library included here], 124 [ --with-included-gettext use the GNU gettext library included here],
@@ -174,7 +174,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
174 174
175 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then 175 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
176 dnl Sometimes libintl requires libiconv, so first search for libiconv. 176 dnl Sometimes libintl requires libiconv, so first search for libiconv.
177 ifelse(gt_included_intl, yes, , [ 177 m4_if(gt_included_intl, yes, , [
178 AM_ICONV_LINK 178 AM_ICONV_LINK
179 ]) 179 ])
180 dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL 180 dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
@@ -261,7 +261,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
261 INCINTL= 261 INCINTL=
262 fi 262 fi
263 263
264 ifelse(gt_included_intl, yes, [ 264 m4_if(gt_included_intl, yes, [
265 if test "$gt_use_preinstalled_gnugettext" != "yes"; then 265 if test "$gt_use_preinstalled_gnugettext" != "yes"; then
266 dnl GNU gettext is not found in the C library. 266 dnl GNU gettext is not found in the C library.
267 dnl Fall back on included GNU gettext library. 267 dnl Fall back on included GNU gettext library.
@@ -273,8 +273,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
273 dnl Mark actions used to generate GNU NLS library. 273 dnl Mark actions used to generate GNU NLS library.
274 BUILD_INCLUDED_LIBINTL=yes 274 BUILD_INCLUDED_LIBINTL=yes
275 USE_INCLUDED_LIBINTL=yes 275 USE_INCLUDED_LIBINTL=yes
276 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" 276 LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
277 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" 277 LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
278 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` 278 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
279 fi 279 fi
280 280
@@ -341,7 +341,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
341 POSUB=po 341 POSUB=po
342 fi 342 fi
343 343
344 ifelse(gt_included_intl, yes, [ 344 m4_if(gt_included_intl, yes, [
345 dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' 345 dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
346 dnl because some of the testsuite requires it. 346 dnl because some of the testsuite requires it.
347 BUILD_INCLUDED_LIBINTL=yes 347 BUILD_INCLUDED_LIBINTL=yes