From: Bruno Haible <bruno@clisp.org>
Date: Mon, 18 Nov 2019 03:57:15 +0000 (+0100)
Subject: locale, localename: Improve z/OS support.
X-Git-Tag: v1.0~4600
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bd825f0776ffa28e3b59dfcb24b8cf387067ec7;p=thirdparty%2Fgnulib.git

locale, localename: Improve z/OS support.

* m4/localename.m4 (gl_LOCALENAME): Make last change more reliable.
---

diff --git a/m4/localename.m4 b/m4/localename.m4
index 8e8d249c1c..54bf343329 100644
--- a/m4/localename.m4
+++ b/m4/localename.m4
@@ -14,20 +14,23 @@ AC_DEFUN([gl_LOCALENAME],
   AC_CHECK_HEADERS_ONCE([langinfo.h])
   if test $HAVE_LOCALE_T = 1; then
     AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale])
+    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.
-    ac_cv_func_newlocale=no
-    ac_cv_func_duplocale=no
-    ac_cv_func_freelocale=no
+    gl_func_newlocale=no
+    gl_func_duplocale=no
+    gl_func_freelocale=no
   fi
-  if test $ac_cv_func_newlocale != yes; then
+  if test $gl_func_newlocale != yes; then
     HAVE_NEWLOCALE=0
   fi
-  if test $ac_cv_func_duplocale != yes; then
+  if test $gl_func_duplocale != yes; then
     HAVE_DUPLOCALE=0
   fi
-  if test $ac_cv_func_freelocale != yes; then
+  if test $gl_func_freelocale != yes; then
     HAVE_FREELOCALE=0
   fi
   if test $gt_nameless_locales = yes; then