aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2023-05-12 18:12:00 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2023-05-12 18:24:53 +0300
commita29868ab3d04e584013e93389d7e9bb919e99b1d (patch)
tree6f09eca06e9cb0fd79b9c668f39db7e997bd84b7
parent4df6f3dc616343a935b9e97a7e9437b70be0e8c9 (diff)
downloadlibmicrohttpd-a29868ab3d04e584013e93389d7e9bb919e99b1d.tar.gz
libmicrohttpd-a29868ab3d04e584013e93389d7e9bb919e99b1d.zip
Updated autopoint files
-rwxr-xr-xpo/build-aux/config.rpath6
-rw-r--r--po/m4/gettext.m430
-rw-r--r--po/m4/host-cpu-c-abi.m411
-rw-r--r--po/m4/lib-ld.m46
-rw-r--r--po/m4/lib-link.m48
-rw-r--r--po/m4/lib-prefix.m46
-rw-r--r--po/m4/po.m412
7 files changed, 43 insertions, 36 deletions
diff --git a/po/build-aux/config.rpath b/po/build-aux/config.rpath
index 24be79cf..1e1ab679 100755
--- a/po/build-aux/config.rpath
+++ b/po/build-aux/config.rpath
@@ -2,7 +2,7 @@
2# Output a system dependent set of variables, describing how to set the 2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable. 3# run time search path of shared libraries in an executable.
4# 4#
5# Copyright 1996-2020 Free Software Foundation, Inc. 5# Copyright 1996-2022 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001 6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8# 8#
@@ -371,7 +371,7 @@ else
371 hardcode_direct=yes 371 hardcode_direct=yes
372 hardcode_minus_L=yes 372 hardcode_minus_L=yes
373 ;; 373 ;;
374 freebsd* | dragonfly*) 374 freebsd* | dragonfly* | midnightbsd*)
375 hardcode_libdir_flag_spec='-R$libdir' 375 hardcode_libdir_flag_spec='-R$libdir'
376 hardcode_direct=yes 376 hardcode_direct=yes
377 ;; 377 ;;
@@ -547,7 +547,7 @@ case "$host_os" in
547 freebsd[23].*) 547 freebsd[23].*)
548 library_names_spec='$libname$shrext$versuffix' 548 library_names_spec='$libname$shrext$versuffix'
549 ;; 549 ;;
550 freebsd* | dragonfly*) 550 freebsd* | dragonfly* | midnightbsd*)
551 library_names_spec='$libname$shrext' 551 library_names_spec='$libname$shrext'
552 ;; 552 ;;
553 gnu*) 553 gnu*)
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
diff --git a/po/m4/host-cpu-c-abi.m4 b/po/m4/host-cpu-c-abi.m4
index 7dc830ef..b9223241 100644
--- a/po/m4/host-cpu-c-abi.m4
+++ b/po/m4/host-cpu-c-abi.m4
@@ -1,5 +1,5 @@
1# host-cpu-c-abi.m4 serial 13 1# host-cpu-c-abi.m4 serial 15
2dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2022 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.
@@ -211,7 +211,7 @@ changequote([,])dnl
211 # be generating 64-bit code. 211 # be generating 64-bit code.
212 AC_COMPILE_IFELSE( 212 AC_COMPILE_IFELSE(
213 [AC_LANG_SOURCE( 213 [AC_LANG_SOURCE(
214 [[#if defined __powerpc64__ || defined _ARCH_PPC64 214 [[#if defined __powerpc64__ || defined __LP64__
215 int ok; 215 int ok;
216 #else 216 #else
217 error fail 217 error fail
@@ -382,6 +382,9 @@ EOF
382#ifndef __ia64__ 382#ifndef __ia64__
383#undef __ia64__ 383#undef __ia64__
384#endif 384#endif
385#ifndef __loongarch64__
386#undef __loongarch64__
387#endif
385#ifndef __m68k__ 388#ifndef __m68k__
386#undef __m68k__ 389#undef __m68k__
387#endif 390#endif
@@ -605,7 +608,7 @@ changequote([,])dnl
605 # be generating 64-bit code. 608 # be generating 64-bit code.
606 AC_COMPILE_IFELSE( 609 AC_COMPILE_IFELSE(
607 [AC_LANG_SOURCE( 610 [AC_LANG_SOURCE(
608 [[#if defined __powerpc64__ || defined _ARCH_PPC64 611 [[#if defined __powerpc64__ || defined __LP64__
609 int ok; 612 int ok;
610 #else 613 #else
611 error fail 614 error fail
diff --git a/po/m4/lib-ld.m4 b/po/m4/lib-ld.m4
index aa07cb4b..934207a7 100644
--- a/po/m4/lib-ld.m4
+++ b/po/m4/lib-ld.m4
@@ -1,5 +1,5 @@
1# lib-ld.m4 serial 9 1# lib-ld.m4 serial 10
2dnl Copyright (C) 1996-2003, 2009-2021 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2009-2022 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.
@@ -122,7 +122,7 @@ else
122 *-*-aix*) 122 *-*-aix*)
123 AC_COMPILE_IFELSE( 123 AC_COMPILE_IFELSE(
124 [AC_LANG_SOURCE( 124 [AC_LANG_SOURCE(
125 [[#if defined __powerpc64__ || defined _ARCH_PPC64 125 [[#if defined __powerpc64__ || defined __LP64__
126 int ok; 126 int ok;
127 #else 127 #else
128 error fail 128 error fail
diff --git a/po/m4/lib-link.m4 b/po/m4/lib-link.m4
index 787efab2..3b75bcd0 100644
--- a/po/m4/lib-link.m4
+++ b/po/m4/lib-link.m4
@@ -1,5 +1,5 @@
1# lib-link.m4 serial 32 1# lib-link.m4 serial 33
2dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2022 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.
@@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
196 eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" 196 eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
197 ]) 197 ])
198 AC_ARG_WITH(PACK[-prefix], 198 AC_ARG_WITH(PACK[-prefix],
199[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib 199[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib
200 --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], 200 --without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]],
201[ 201[
202 if test "X$withval" = "Xno"; then 202 if test "X$withval" = "Xno"; then
203 use_additional=no 203 use_additional=no
diff --git a/po/m4/lib-prefix.m4 b/po/m4/lib-prefix.m4
index 3c94db0a..999f712f 100644
--- a/po/m4/lib-prefix.m4
+++ b/po/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
1# lib-prefix.m4 serial 19 1# lib-prefix.m4 serial 20
2dnl Copyright (C) 2001-2005, 2008-2021 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2005, 2008-2022 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.
@@ -174,7 +174,7 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
174 174
175 AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf], 175 AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
176 [AC_EGREP_CPP([Extensible Linking Format], 176 [AC_EGREP_CPP([Extensible Linking Format],
177 [#ifdef __ELF__ 177 [#if defined __ELF__ || (defined __linux__ && defined __EDG__)
178 Extensible Linking Format 178 Extensible Linking Format
179 #endif 179 #endif
180 ], 180 ],
diff --git a/po/m4/po.m4 b/po/m4/po.m4
index 66bea3e6..2f14f8e2 100644
--- a/po/m4/po.m4
+++ b/po/m4/po.m4
@@ -1,5 +1,5 @@
1# po.m4 serial 31 (gettext-0.20.2) 1# po.m4 serial 32 (gettext-0.21.1)
2dnl Copyright (C) 1995-2014, 2016, 2018-2021 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014, 2016, 2018-2022 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.
@@ -179,7 +179,9 @@ changequote([,])dnl
179 # presentlang can be used as a fallback for messages 179 # presentlang can be used as a fallback for messages
180 # which are not translated in the desiredlang catalog). 180 # which are not translated in the desiredlang catalog).
181 case "$desiredlang" in 181 case "$desiredlang" in
182 "$presentlang"*) useit=yes;; 182 "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
183 useit=yes
184 ;;
183 esac 185 esac
184 done 186 done
185 if test $useit = yes; then 187 if test $useit = yes; then
@@ -379,7 +381,9 @@ changequote([,])dnl
379 # presentlang can be used as a fallback for messages 381 # presentlang can be used as a fallback for messages
380 # which are not translated in the desiredlang catalog). 382 # which are not translated in the desiredlang catalog).
381 case "$desiredlang" in 383 case "$desiredlang" in
382 "$presentlang"*) useit=yes;; 384 "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
385 useit=yes
386 ;;
383 esac 387 esac
384 done 388 done
385 if test $useit = yes; then 389 if test $useit = yes; then