diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:32 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:32 +0100 |
| commit | 00893e79fc62966067af1a106567db96bd170338 (patch) | |
| tree | 52b35cd0b42ca28e62a2ffbecade2e13dd8332cf /gnulib-m4/setlocale.m4 | |
| parent | 26112352a774737e1ce5580c93654a26c1e82b39 (diff) | |
New upstream version 1.2upstream/1.2
Diffstat (limited to 'gnulib-m4/setlocale.m4')
| -rw-r--r-- | gnulib-m4/setlocale.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gnulib-m4/setlocale.m4 b/gnulib-m4/setlocale.m4 index c0023d9c..ef26def4 100644 --- a/gnulib-m4/setlocale.m4 +++ b/gnulib-m4/setlocale.m4 @@ -1,5 +1,5 @@ -# setlocale.m4 serial 7 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +# setlocale.m4 serial 10 +dnl Copyright (C) 2011-2024 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. @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE], case "$host_os" in dnl On native Windows systems, setlocale(category,NULL) does not look at dnl the environment variables LC_ALL, category, and LANG. - mingw*) NEED_SETLOCALE_IMPROVED=1 ;; + mingw* | windows*) NEED_SETLOCALE_IMPROVED=1 ;; dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL) dnl is then still "C". cygwin*) @@ -66,12 +66,15 @@ int main () fi if test $NEED_SETLOCALE_MTSAFE = 1; then - LIB_SETLOCALE="$LIB_SETLOCALE_NULL" + SETLOCALE_LIB="$SETLOCALE_NULL_LIB" else - LIB_SETLOCALE= + SETLOCALE_LIB= fi - dnl LIB_SETLOCALE is expected to be '-pthread' or '-lpthread' on AIX with gcc + dnl SETLOCALE_LIB is expected to be '-pthread' or '-lpthread' on AIX with gcc dnl or xlc, and empty otherwise. + AC_SUBST([SETLOCALE_LIB]) + dnl For backward compatibility. + LIB_SETLOCALE="$SETLOCALE_LIB" AC_SUBST([LIB_SETLOCALE]) ]) |