From: Bruno Haible <bruno@clisp.org>
Date: Thu, 22 Feb 2024 01:29:52 +0000 (+0100)
Subject: Update after gnulib changed.
X-Git-Tag: v0.23~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d20c5d7d9e6984f1baacbe0b704f3a70688180fc;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* gettext-runtime/intl/configure.ac: Update list of symbols to rename,
from modules 'localename-unsafe', 'localename', and 'setlocale-null-unlocked'.
---

diff --git a/.gitignore b/.gitignore
index 5f7d391ff..ca2df658a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -211,6 +211,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
diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac
index 640af52b4..749a70096 100644
--- a/gettext-runtime/intl/configure.ac
+++ b/gettext-runtime/intl/configure.ac
@@ -293,15 +293,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
@@ -342,6 +345,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
diff --git a/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4
index 657244810..4d37d37d4 100644
--- a/gettext-runtime/m4/nls.m4
+++ b/gettext-runtime/m4/nls.m4
@@ -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,
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index 2f14f8e2b..bc6df9918 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -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.
diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4
index 906567bbf..8dd4d606d 100644
--- a/gettext-runtime/m4/progtest.m4
+++ b/gettext-runtime/m4/progtest.m4
@@ -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"