From fce5fdcbc54d310ab575e6f7fef37c008068db35 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 10 Jul 2015 10:55:31 +0900 Subject: [PATCH] intl: Check for getlocalename_l * intl.m4 (gt_INTL_SUBDIR_CORE): Check also for getlocalename_l. Bump serial to 29. --- gettext-runtime/m4/ChangeLog | 5 +++++ gettext-runtime/m4/intl.m4 | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 4a2cbe295..6b9d4df4b 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,8 @@ +2015-07-10 Daiki Ueno + + * intl.m4 (gt_INTL_SUBDIR_CORE): Check also for getlocalename_l. + Bump serial to 29. + 2014-12-24 Daiki Ueno * gettext 0.19.4 released. diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4 index 0c29ad0df..70d9a9e56 100644 --- a/gettext-runtime/m4/intl.m4 +++ b/gettext-runtime/m4/intl.m4 @@ -1,4 +1,4 @@ -# intl.m4 serial 28 (gettext-0.19) +# intl.m4 serial 29 (gettext-0.19) dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -232,6 +232,12 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \ argz_stringify argz_next __fsetlocking]) + dnl Solaris 12 provides getlocalename_l, while Illumos doesn't have + dnl it nor the equivalent. + if test $ac_cv_func_uselocale = yes; then + AC_CHECK_FUNCS([getlocalename_l]) + fi + dnl Use the *_unlocked functions only if they are declared. dnl (because some of them were defined without being declared in Solaris dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built -- 2.47.3