diff m4/localename.m4 @ 39947:9912dc28baf1

localename: Simplify support for per-thread locales on Solaris 11.4. * m4/intl-thread-locale.m4: Renamed from m4/intlsolaris.m4. (gt_INTL_THREAD_LOCALE_NAME): Renamed from gt_INTL_SOLARIS. Define HAVE_SOLARIS114_LOCALES instead of HAVE_NAMELESS_LOCALES. * lib/localename.c: Handle HAVE_SOLARIS114_LOCALES through Solaris specific code. * lib/localename-table.h: Update comments. * lib/localename-table.c: Update comments. * m4/localename.m4 (gl_LOCALENAME): Require gt_INTL_THREAD_LOCALE_NAME. Test for 'uselocale'. Don't invoke gt_INTL_SOLARIS. * m4/intl.m4 (AM_INTL_SUBDIR): Require gt_INTL_THREAD_LOCALE_NAME. Test for 'uselocale'. Set HAVE_NAMELESS_LOCALES. (gt_INTL_SUBDIR_CORE): Don't invoke gt_INTL_SOLARIS. Don't set HAVE_NAMELESS_LOCALES here. * modules/localename (Files): Add m4/intl-thread-locale.m4. Remove m4/intlsolaris.m4. * modules/gettext (Files): Likewise.
author Bruno Haible <bruno@clisp.org>
date Tue, 23 Oct 2018 22:18:24 +0200
parents 5f0e12c5ef27
children b06060465f09
line wrap: on
line diff
--- a/m4/localename.m4	Tue Oct 23 01:08:10 2018 +0200
+++ b/m4/localename.m4	Tue Oct 23 22:18:24 2018 +0200
@@ -1,4 +1,4 @@
-# localename.m4 serial 4
+# localename.m4 serial 5
 dnl Copyright (C) 2007, 2009-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,
@@ -8,10 +8,11 @@
 [
   AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
   AC_REQUIRE([gt_LC_MESSAGES])
+  AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
   AC_REQUIRE([gt_INTL_MACOSX])
   AC_CHECK_HEADERS_ONCE([langinfo.h])
   AC_CHECK_FUNCS([setlocale])
-  AC_CHECK_FUNCS_ONCE([uselocale newlocale duplocale freelocale])
+  AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale])
   if test $ac_cv_func_newlocale != yes; then
     HAVE_NEWLOCALE=0
   fi
@@ -21,7 +22,6 @@
   if test $ac_cv_func_freelocale != yes; then
     HAVE_FREELOCALE=0
   fi
-  gt_INTL_SOLARIS
   if test $gt_nameless_locales = yes; then
     REPLACE_NEWLOCALE=1
     REPLACE_DUPLOCALE=1