mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update after gnulib changed.

Browse Source 
* gettext-runtime/intl/configure.ac: Update list of symbols to rename,
from modules 'localename-unsafe', 'localename', and 'setlocale-null-unlocked'.
This commit is contained in:
Bruno Haible 2024-02-21 11:52:41 +01:00
parent 0aad6618d3
commit c4043301b1
13 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -212,6 +212,7 @@
/gettext-tools/libgettextpo/safe-write.c
/gettext-tools/libgettextpo/safe-write.h
/gettext-tools/libgettextpo/setlocale-lock.c
/gettext-tools/libgettextpo/setlocale_null-unlocked.c
/gettext-tools/libgettextpo/setlocale_null.c
/gettext-tools/libgettextpo/setlocale_null.h
/gettext-tools/libgettextpo/signal.in.h

14
gettext-runtime/intl/configure.ac
View File

@ -1,5 +1,5 @@
dnl Configuration for the gettext-runtime directory of GNU gettext
dnl Copyright (C) 1995-2016, 2018-2023 Free Software Foundation, Inc.
dnl Copyright (C) 1995-2016, 2018-2024 Free Software Foundation, Inc.
dnl
dnl This program is free software: you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@ -243,15 +243,18 @@ AH_VERBATIM([znoexport], [
/* Symbols defined by gnulib module 'isnanl-nolibm'. */
#define rpl_isnanl _libintl_isnanl
/* Symbols defined by gnulib module 'localename'. */
#define gl_locale_name_thread _libintl_locale_name_thread
#define gl_locale_name_posix _libintl_locale_name_posix
#define gl_locale_name _libintl_locale_name
/* Symbols defined by gnulib module 'localename-unsafe'. */
#define gl_locale_name_canonicalize _libintl_locale_name_canonicalize
#define gl_locale_name_from_win32_LANGID _libintl_locale_name_from_win32_LANGID
#define gl_locale_name_from_win32_LCID _libintl_locale_name_from_win32_LCID
#define gl_locale_name_thread_unsafe _libintl_locale_name_thread_unsafe
#define gl_locale_name_thread _libintl_locale_name_thread
#define gl_locale_name_posix _libintl_locale_name_posix
#define gl_locale_name_posix_unsafe _libintl_locale_name_posix_unsafe
#define gl_locale_name_environ _libintl_locale_name_environ
#define gl_locale_name_default _libintl_locale_name_default
#define gl_locale_name _libintl_locale_name
#define gl_locale_name_unsafe _libintl_locale_name_unsafe
#define rpl_newlocale _libintl_newlocale
#define rpl_duplocale _libintl_duplocale
#define rpl_freelocale _libintl_freelocale
@ -295,6 +298,9 @@ AH_VERBATIM([znoexport], [
/* Symbols defined by gnulib module 'setlocale-null'. */
#define setlocale_null _libintl_setlocale_null
#define setlocale_null_r _libintl_setlocale_null_r
/* Symbols defined by gnulib module 'setlocale-null-unlocked'. */
#define setlocale_null_unlocked _libintl_setlocale_null_unlocked
#define setlocale_null_r_unlocked _libintl_setlocale_null_r_unlocked
/* Symbols defined by gnulib module 'signbit'. */
#define gl_signbitf _libintl_signbitf
#define gl_signbitd _libintl_signbitd

2
gettext-runtime/m4/fcntl-o.m4
View File

@ -1,5 +1,5 @@
# fcntl-o.m4 serial 8
dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc.
dnl Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

2
gettext-runtime/m4/flexmember.m4
View File

@ -1,7 +1,7 @@
# serial 5
# Check for flexible array member support.
# Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc.
# Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

16
gettext-runtime/m4/iconv.m4
View File

@ -1,5 +1,5 @@
# iconv.m4 serial 26
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation,
# iconv.m4 serial 27
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@ -38,7 +38,7 @@ AC_DEFUN([AM_ICONV_LINK],
dnl because if the user has installed libiconv and not disabled its use
dnl via --without-libiconv-prefix, he wants to use it. The first
dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
am_save_CPPFLAGS="$CPPFLAGS"
gl_saved_CPPFLAGS="$CPPFLAGS"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
@ -55,7 +55,7 @@ AC_DEFUN([AM_ICONV_LINK],
iconv_close(cd);]])],
[am_cv_func_iconv=yes])
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
gl_saved_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
@ -68,14 +68,14 @@ AC_DEFUN([AM_ICONV_LINK],
iconv_close(cd);]])],
[am_cv_lib_iconv=yes]
[am_cv_func_iconv=yes])
LIBS="$am_save_LIBS"
LIBS="$gl_saved_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
dnl Solaris 10.
am_save_LIBS="$LIBS"
gl_saved_LIBS="$LIBS"
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
@ -205,7 +205,7 @@ AC_DEFUN([AM_ICONV_LINK],
esac])
test "$am_cv_func_iconv_works" = no || break
done
LIBS="$am_save_LIBS"
LIBS="$gl_saved_LIBS"
])
case "$am_cv_func_iconv_works" in
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
@ -224,7 +224,7 @@ AC_DEFUN([AM_ICONV_LINK],
else
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
dnl either.
CPPFLAGS="$am_save_CPPFLAGS"
CPPFLAGS="$gl_saved_CPPFLAGS"
LIBICONV=
LTLIBICONV=
fi

12
gettext-runtime/m4/intlmacosx.m4
View File

@ -1,5 +1,5 @@
# intlmacosx.m4 serial 9 (gettext-0.22.3)
dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc.
# intlmacosx.m4 serial 10 (gettext-0.23)
dnl Copyright (C) 2004-2014, 2016, 2019-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@ -20,7 +20,7 @@ AC_DEFUN([gt_INTL_MACOSX],
dnl Check for API introduced in Mac OS X 10.4.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
[gt_saved_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
@ -28,7 +28,7 @@ AC_DEFUN([gt_INTL_MACOSX],
[[CFPreferencesCopyAppValue(NULL, NULL)]])],
[gt_cv_func_CFPreferencesCopyAppValue=yes],
[gt_cv_func_CFPreferencesCopyAppValue=no])
LIBS="$gt_save_LIBS"])
LIBS="$gt_saved_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
[Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
@ -43,7 +43,7 @@ AC_DEFUN([gt_INTL_MACOSX],
dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
dnl first among the preferred languages and CC is the territory.
AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
[gt_save_LIBS="$LIBS"
[gt_saved_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
@ -51,7 +51,7 @@ AC_DEFUN([gt_INTL_MACOSX],
[[CFLocaleCopyPreferredLanguages();]])],
[gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
[gt_cv_func_CFLocaleCopyPreferredLanguages=no])
LIBS="$gt_save_LIBS"])
LIBS="$gt_saved_LIBS"])
if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
[Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])

2
gettext-runtime/m4/inttypes_h.m4
View File

@ -1,5 +1,5 @@
# inttypes_h.m4 serial 10
dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc.
dnl Copyright (C) 1997-2004, 2006, 2008-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

2
gettext-runtime/m4/nls.m4
View File

@ -1,5 +1,5 @@
# nls.m4 serial 6 (gettext-0.20.2)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2023 Free
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2024 Free
dnl Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,

3
gettext-runtime/m4/po.m4
View File

@ -1,5 +1,6 @@
# po.m4 serial 32 (gettext-0.21.1)
dnl Copyright (C) 1995-2014, 2016, 2018-2022 Free Software Foundation, Inc.
dnl Copyright (C) 1995-2014, 2016, 2018-2022, 2024 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

10
gettext-runtime/m4/progtest.m4
View File

@ -1,5 +1,5 @@
# progtest.m4 serial 9 (gettext-0.21.1)
dnl Copyright (C) 1996-2003, 2005, 2008-2023 Free Software Foundation, Inc.
# progtest.m4 serial 10 (gettext-0.23)
dnl Copyright (C) 1996-2003, 2005, 2008-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@ -60,9 +60,9 @@ AC_CACHE_VAL([ac_cv_path_$1],
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
;;
*)
ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in m4_if([$5], , $PATH, [$5]); do
IFS="$ac_save_IFS"
IFS="$gt_saved_IFS"
test -z "$ac_dir" && ac_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@ -74,7 +74,7 @@ AC_CACHE_VAL([ac_cv_path_$1],
fi
done
done
IFS="$ac_save_IFS"
IFS="$gt_saved_IFS"
dnl If no 4th arg is given, leave the cache variable unset,
dnl so AC_PATH_PROGS will keep looking.
m4_if([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"

2
gettext-runtime/m4/size_max.m4
View File

@ -1,5 +1,5 @@
# size_max.m4 serial 12
dnl Copyright (C) 2003, 2005-2006, 2008-2023 Free Software Foundation, Inc.
dnl Copyright (C) 2003, 2005-2006, 2008-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

2
gettext-runtime/m4/stdint_h.m4
View File

@ -1,5 +1,5 @@
# stdint_h.m4 serial 9
dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc.
dnl Copyright (C) 1997-2004, 2006, 2008-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

2
gettext-runtime/m4/xsize.m4
View File

@ -1,5 +1,5 @@
# xsize.m4 serial 5
dnl Copyright (C) 2003-2004, 2008-2023 Free Software Foundation, Inc.
dnl Copyright (C) 2003-2004, 2008-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.