summaryrefslogtreecommitdiff
path: root/m4/setlocale.m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2018-09-16 19:12:44 +0200
committerBruno Haible <bruno@clisp.org>2018-09-16 19:12:44 +0200
commit6642aeb47aee3d82978a27497dc9ca57058c66b4 (patch)
treef714557b6b07f2948bae114b40d8b2b7c7d95805 /m4/setlocale.m4
parentb0af89dcdde2f4e966efd9d2c9c820557d57e381 (diff)
downloadgnulib-6642aeb47aee3d82978a27497dc9ca57058c66b4.tar.gz
setlocale: Improve locale handling on macOS 10.12 or newer.
* lib/setlocale.c: Include header files for CoreFoundation. Declare gl_locale_name_canonicalize. (libintl_setlocale): Try harder to set a locale for categories LC_CTYPE and LC_MESSAGES. * m4/setlocale.m4 (gl_PREREQ_SETLOCALE): Add comment.
Diffstat (limited to 'm4/setlocale.m4')
-rw-r--r--m4/setlocale.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index 802ee01fa9..e0fb74a92d 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-# setlocale.m4 serial 4
+# setlocale.m4 serial 5
dnl Copyright (C) 2011-2018 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -25,5 +25,8 @@ AC_DEFUN([gl_FUNC_SETLOCALE],
# Prerequisites of lib/setlocale.c.
AC_DEFUN([gl_PREREQ_SETLOCALE],
[
+ dnl No need to check for CFLocaleCopyPreferredLanguages and
+ dnl CFPreferencesCopyAppValue because lib/setlocale.c is not used on Mac OS X.
+ dnl (The Mac OS X specific code is only used in libintl.)
:
])