Merge branch 'feature/upstream' into develop

1 files changed, 9 insertions, 47 deletions

diff --git a/gnulib-m4/localename.m4 b/gnulib-m4/localename.m4
index d28dfe45..5cb26481 100644
--- a/gnulib-m4/localename.m4
+++ b/gnulib-m4/localename.m4
@@ -1,62 +1,24 @@
 # localename.m4
-# serial 12
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 15
+dnl Copyright (C) 2007, 2009-2025 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.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_LOCALENAME_UNSAFE],
 [
-  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-  AC_REQUIRE([gl_LOCALE_T])
   AC_REQUIRE([gt_LC_MESSAGES])
-  AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
   AC_REQUIRE([gt_INTL_MACOSX])
-  AC_CHECK_HEADERS_ONCE([langinfo.h])
-  if test $HAVE_LOCALE_T = 1; then
-    gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]])
-    gl_CHECK_FUNCS_ANDROID([duplocale], [[#include <locale.h>]])
-    gl_CHECK_FUNCS_ANDROID([freelocale], [[#include <locale.h>]])
-    gl_func_newlocale="$ac_cv_func_newlocale"
-    gl_func_duplocale="$ac_cv_func_duplocale"
-    gl_func_freelocale="$ac_cv_func_freelocale"
-  else
-    dnl In 2019, some versions of z/OS lack the locale_t type and have broken
-    dnl newlocale, duplocale, freelocale functions.
-    gl_cv_onwards_func_newlocale='future OS version'
-    gl_cv_onwards_func_duplocale='future OS version'
-    gl_cv_onwards_func_freelocale='future OS version'
-    gl_func_newlocale=no
-    gl_func_duplocale=no
-    gl_func_freelocale=no
-  fi
-  if test $gl_func_newlocale != yes; then
-    HAVE_NEWLOCALE=0
-    case "$gl_cv_onwards_func_newlocale" in
-      future*) REPLACE_NEWLOCALE=1 ;;
-    esac
-  fi
-  if test $gl_func_duplocale != yes; then
-    HAVE_DUPLOCALE=0
-    case "$gl_cv_onwards_func_duplocale" in
-      future*) REPLACE_DUPLOCALE=1 ;;
-    esac
-  fi
-  if test $gl_func_freelocale != yes; then
-    HAVE_FREELOCALE=0
-    case "$gl_cv_onwards_func_freelocale" in
-      future*) REPLACE_FREELOCALE=1 ;;
-    esac
-  fi
-  if test $gt_localename_enhances_locale_funcs = yes; then
-    REPLACE_NEWLOCALE=1
-    REPLACE_DUPLOCALE=1
-    REPLACE_FREELOCALE=1
-  fi
 ])
 
 AC_DEFUN([gl_LOCALENAME_UNSAFE_LIMITED],
 [
   AC_REQUIRE([gt_LC_MESSAGES])
-  AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
+  AC_REQUIRE([gt_INTL_MACOSX])
+])
+
+AC_DEFUN([gl_LOCALENAME_ENVIRON],
+[
+  AC_REQUIRE([gt_INTL_MACOSX])
 ])