diff options
author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:39 +0100 |
---|---|---|
committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:39 +0100 |
commit | 8dfc46115527afe3706e9e4225e9ad019c97d695 (patch) | |
tree | 372d5192b218455834781a0037c57e919a06b488 /gnulib-m4/localename.m4 | |
parent | 2291cf138eb72ad38d8c59b8b6f762875c8c4ff2 (diff) | |
parent | 5f2b09982312c98863eb9a8dfe2c608b81f58259 (diff) |
Merge tag 'upstream/0.9.6'
Upstream version 0.9.6
Diffstat (limited to 'gnulib-m4/localename.m4')
-rw-r--r-- | gnulib-m4/localename.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnulib-m4/localename.m4 b/gnulib-m4/localename.m4 index 9ff5eea..2bdf31e 100644 --- a/gnulib-m4/localename.m4 +++ b/gnulib-m4/localename.m4 @@ -1,5 +1,5 @@ # localename.m4 serial 2 -dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 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. @@ -9,4 +9,9 @@ AC_DEFUN([gl_LOCALENAME], AC_REQUIRE([gt_LC_MESSAGES]) AC_REQUIRE([gt_INTL_MACOSX]) AC_CHECK_FUNCS([setlocale uselocale]) + 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 ]) |