* More systematic naming of LIB variables
@ 2023-01-05 10:14 Bruno Haible
2023-01-07 1:26 ` Paul Eggert
2023-01-07 17:05 ` Bruno Haible
0 siblings, 2 replies; 4+ messages in thread
From: Bruno Haible @ 2023-01-05 10:14 UTC (permalink / raw)
To: bug-gnulib
In <https://lists.gnu.org/archive/html/bug-gnulib/2023-01/msg00025.html> I wrote:
Our convention for these variables is generally
- $(LIBFOO) or $(LIB_FOO) for the library -lfoo (or empty if nonexistent
or not needed),
- $(MODULE_LIB) for the libraries needed by a given module. For example,
we have
$(GETADDRINFO_LIB)
$(GETHOSTNAME_LIB)
$(GETLOADAVG_LIBS)
$(INET_NTOP_LIB)
$(PTY_LIB)
$(YIELD_LIB)
The variable of the 'file-has-acl' module should follow the same naming
convention. This patch does it.
2023-01-05 Bruno Haible <bruno@clisp.org>
More systematic naming of LIB variables.
* m4/acl.m4 (gl_FUNC_ACL, gl_FILE_HAS_ACL): Set FILE_HAS_ACL_LIB to the
same value as LIB_HAS_ACL.
* modules/file-has-acl (Link): Use FILE_HAS_ACL_LIB instead of
LIB_HAS_ACL.
* modules/file-has-acl-tests (Makefile.am): Likewise.
diff --git a/m4/acl.m4 b/m4/acl.m4
index 98362858ce..6c2db7d320 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
# acl.m4 - check for access control list (ACL) primitives
-# serial 24
+# serial 25
# Copyright (C) 2002, 2004-2023 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -139,7 +139,10 @@ int type = ACL_TYPE_EXTENDED;]])],
AC_MSG_WARN([AC_PACKAGE_NAME will be built without ACL support.])
fi
fi
- test -n "$gl_need_lib_has_acl" && LIB_HAS_ACL=$LIB_ACL
+ if test -n "$gl_need_lib_has_acl"; then
+ FILE_HAS_ACL_LIB=$LIB_ACL
+ LIB_HAS_ACL="$FILE_HAS_ACL_LIB"
+ fi
AC_SUBST([LIB_ACL])
AC_DEFINE_UNQUOTED([USE_ACL], [$use_acl],
[Define to nonzero if you want access control list support.])
@@ -197,15 +200,18 @@ AC_DEFUN([gl_FILE_HAS_ACL],
[gl_cv_getxattr_with_posix_acls=yes])])
fi
if test "$gl_cv_getxattr_with_posix_acls" = yes; then
- LIB_HAS_ACL=
+ FILE_HAS_ACL_LIB=
AC_DEFINE([GETXATTR_WITH_POSIX_ACLS], 1,
[Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS
and XATTR_NAME_POSIX_ACL_DEFAULT.])
else
dnl Set gl_need_lib_has_acl to a nonempty value, so that any
- dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL.
+ dnl later gl_FUNC_ACL call will set FILE_HAS_ACL_LIB=$LIB_ACL.
gl_need_lib_has_acl=1
- LIB_HAS_ACL=$LIB_ACL
+ FILE_HAS_ACL_LIB=$LIB_ACL
fi
+ AC_SUBST([FILE_HAS_ACL_LIB])
+ dnl For backward compatibility (e.g. coreutils still uses LIB_HAS_ACL).
+ LIB_HAS_ACL="$FILE_HAS_ACL_LIB"
AC_SUBST([LIB_HAS_ACL])
])
diff --git a/modules/file-has-acl b/modules/file-has-acl
index c5f7b27364..fa2ea4ca22 100644
--- a/modules/file-has-acl
+++ b/modules/file-has-acl
@@ -22,7 +22,7 @@ Include:
"acl.h"
Link:
-$(LIB_HAS_ACL)
+$(FILE_HAS_ACL_LIB)
License:
GPL
diff --git a/modules/file-has-acl-tests b/modules/file-has-acl-tests
index ff069ec52d..843d55b515 100644
--- a/modules/file-has-acl-tests
+++ b/modules/file-has-acl-tests
@@ -17,4 +17,4 @@ TESTS += \
test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh
TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-file-has-acl
-test_file_has_acl_LDADD = $(LDADD) $(LIB_HAS_ACL)
+test_file_has_acl_LDADD = $(LDADD) $(FILE_HAS_ACL_LIB)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: More systematic naming of LIB variables
2023-01-05 10:14 More systematic naming of LIB variables Bruno Haible
@ 2023-01-07 1:26 ` Paul Eggert
2023-01-07 7:01 ` Bruno Haible
2023-01-07 17:05 ` Bruno Haible
1 sibling, 1 reply; 4+ messages in thread
From: Paul Eggert @ 2023-01-07 1:26 UTC (permalink / raw)
To: Bruno Haible; +Cc: bug-gnulib
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
Thanks for cleaning up the naming. I think only coreutils and tar used
the confusingly-named old $(LIB_HAS_ACL) macro. I now updated updated
them, so we can remove the old name from Gnulib, which I did by
installing the attached.
[-- Attachment #2: 0001-file-has-acl-don-t-bother-setting-LIB_HAS_ACL.patch --]
[-- Type: text/x-patch, Size: 2435 bytes --]
From c551997131a8f1f8f648d39c2d7d5e8db026a139 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 6 Jan 2023 17:25:02 -0800
Subject: [PATCH] =?UTF-8?q?file-has-acl:=20don=E2=80=99t=20bother=20settin?=
=?UTF-8?q?g=20LIB=5FHAS=5FACL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* m4/acl.m4 (gl_FUNC_ACL, gl_FILE_HAS_ACL): Don’t set LIB_HAS_ACL.
I think only Coreutils and Tar used it, and I’ve updated them.
---
ChangeLog | 4 ++++
NEWS | 2 ++
m4/acl.m4 | 6 +-----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b85b8ec5bb..f531198fbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2023-01-06 Paul Eggert <eggert@cs.ucla.edu>
+ file-has-acl: don’t bother setting LIB_HAS_ACL
+ * m4/acl.m4 (gl_FUNC_ACL, gl_FILE_HAS_ACL): Don’t set LIB_HAS_ACL.
+ I think only Coreutils and Tar used it, and I’ve updated them.
+
bootstrap: suppress stray message from --pull
* build-aux/bootstrap: Regenerate.
* top/bootstrap-funclib.sh (autopull): Suggest running autogen.sh
diff --git a/NEWS b/NEWS
index 16eac4c7df..65dcce7590 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
Date Modules Changes
+2023-01-06 file-has-acl Link with $(FILE_HAS_ACL_LIB), not $(LIB_HAS_ACL).
+
2022-12-25 largefile configure no longer enables year-2038 support,
unless you configure with --enable-year2038
or use the year2038 module. This temporary
diff --git a/m4/acl.m4 b/m4/acl.m4
index 6c2db7d320..e612f1ae34 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
# acl.m4 - check for access control list (ACL) primitives
-# serial 25
+# serial 26
# Copyright (C) 2002, 2004-2023 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -141,7 +141,6 @@ int type = ACL_TYPE_EXTENDED;]])],
fi
if test -n "$gl_need_lib_has_acl"; then
FILE_HAS_ACL_LIB=$LIB_ACL
- LIB_HAS_ACL="$FILE_HAS_ACL_LIB"
fi
AC_SUBST([LIB_ACL])
AC_DEFINE_UNQUOTED([USE_ACL], [$use_acl],
@@ -211,7 +210,4 @@ AC_DEFUN([gl_FILE_HAS_ACL],
FILE_HAS_ACL_LIB=$LIB_ACL
fi
AC_SUBST([FILE_HAS_ACL_LIB])
- dnl For backward compatibility (e.g. coreutils still uses LIB_HAS_ACL).
- LIB_HAS_ACL="$FILE_HAS_ACL_LIB"
- AC_SUBST([LIB_HAS_ACL])
])
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: More systematic naming of LIB variables
2023-01-07 1:26 ` Paul Eggert
@ 2023-01-07 7:01 ` Bruno Haible
0 siblings, 0 replies; 4+ messages in thread
From: Bruno Haible @ 2023-01-07 7:01 UTC (permalink / raw)
To: Paul Eggert; +Cc: bug-gnulib
Paul Eggert wrote:
> Thanks for cleaning up the naming. I think only coreutils and tar used
> the confusingly-named old $(LIB_HAS_ACL) macro.
According to Debian codesearch
https://codesearch.debian.net/search?q=LIB_HAS_ACL&literal=1&perpkg=1
also 'recutils' and 'rrep' use acl.m4. But they don't use LIB_HAS_ACL
in their build system committed into git (I checked this); so we're good.
> I now updated updated
> them, so we can remove the old name from Gnulib, which I did by
> installing the attached.
Thanks. I expected the packages to be updated within a year, not within
a week :-)
Bruno
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: More systematic naming of LIB variables
2023-01-05 10:14 More systematic naming of LIB variables Bruno Haible
2023-01-07 1:26 ` Paul Eggert
@ 2023-01-07 17:05 ` Bruno Haible
1 sibling, 0 replies; 4+ messages in thread
From: Bruno Haible @ 2023-01-07 17:05 UTC (permalink / raw)
To: bug-gnulib
[-- Attachment #1: Type: text/plain, Size: 6033 bytes --]
There are more variables to rename for this convention:
$(ACOS_LIBM) etc.
$(FILE_HAS_ACL_LIB)
$(GETADDRINFO_LIB)
$(GETHOSTNAME_LIB)
$(GETLOADAVG_LIBS)
$(HOSTENT_LIB)
$(INET_NTOP_LIB)
$(INET_PTON_LIB)
$(LIB_CLOCK_GETTIME) -> $(CLOCK_TIME_LIB)
$(LIB_CRYPTO)
$(LIB_DUPLOCALE) -> $(DUPLOCALE_LIB)
$(LIB_EACCESS) -> $(EUIDACCESS_LIBGEN)
$(LIB_EXECINFO)
$(LIB_FDATASYNC) -> $(FDATASYNC_LIB)
$(LIB_GETHRXTIME) -> $(GETHRXTIME_LIB)
$(LIB_GETLOGIN) -> $(GETLOGIN_LIB)
$(LIB_GETRANDOM) -> $(GETRANDOM_LIB)
$(LIB_HARD_LOCALE) -> $(HARD_LOCALE_LIB)
$(LIB_MBRTOWC) -> $(MBRTOWC_LIB)
$(LIB_NANOSLEEP) -> $(NANOSLEEP_LIB)
$(LIB_POLL) -> $(POLL_LIB)
$(LIB_POSIX_SPAWN) -> $(POSIX_SPAWN_LIB)
$(LIB_PTHREAD_SIGMASK) -> $(PTHREAD_SIGMASK_LIB)
$(LIB_SCHED_YIELD) -> $(SCHED_YIELD_LIB)
$(LIB_SELECT) -> $(SELECT_LIB)
$(LIB_SELINUX)
$(LIB_SETLOCALE) -> $(SETLOCALE_LIB)
$(LIB_SETLOCALE_NULL) -> $(SETLOCALE_NULL_LIB)
$(LIBSOCKET)
$(LIB_TIMER_TIME) -> $(TIMER_TIME_LIB)
$(PTY_LIB)
$(SERVENT_LIB)
$(YIELD_LIB)
Still, I think this convention is good to follow, because
- for $(ACOS_LIBM) etc. and $(EUIDACCESS_LIBGEN) it allows
to include both the module and the library name,
- given the variable name, e.g. LIB_POLL, you don't need to
guess whether it will link to libpoll,
- for the ACL module, it allows to distinguish between $(ACL_LIB)
and $(LIB_ACL). We can very well have $(LIB_ACL) = -lacl together
with $(ACL_LIB) = -lattr
or $(ACL_LIB) = -lacl -lattr.
On the other hand, sometimes (for libraries that are likely to be
installed by the user, not part of the system) we need to distinguish
between
$(LIBFOO) - used when linking without libtool,
$(LTLIBFOO) - used when linking with libtool.
But this applies to few variables only. So far, only LIBCSTACK / LTLIBCSTACK
is in this category and stands out against the the convention.
I think in the past, I wanted all LIB variables to start with LIB, so that
they could have a LTLIB counterpart. But now that we use only system-provided
libraries for multithreading (GNU pth support was removed a long time ago),
this theoretical advantage is not important any more.
2023-01-07 Bruno Haible <bruno@clisp.org>
timer_time: Rename LIB_TIMER_TIME to TIMER_TIME_LIB.
* m4/timer_time.m4: Rename LIB_TIMER_TIME to TIMER_TIME_LIB.
All uses changed.
* NEWS: Mention the change
2023-01-07 Bruno Haible <bruno@clisp.org>
setlocale-null: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
* m4/setlocale_null.m4: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
All uses changed.
* NEWS: Mention the change
2023-01-07 Bruno Haible <bruno@clisp.org>
setlocale: Rename LIB_SETLOCALE to SETLOCALE_LIB.
* m4/setlocale.m4: Rename LIB_SETLOCALE to SETLOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
select: Rename LIB_SELECT to SELECT_LIB.
* m4/select.m4: Rename LIB_SELECT to SELECT_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
sched_yield: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
* m4/threadlib.m4: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
pthread_sigmask: Rename LIB_PTHREAD_SIGMASK to PTHREAD_SIGMASK_LIB.
* m4/pthread_sigmask.m4: Rename LIB_PTHREAD_SIGMASK to
PTHREAD_SIGMASK_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
posix_spawn: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
* m4/spawn_h.m4: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
poll: Rename LIB_POLL to POLL_LIB.
* m4/poll.m4: Rename LIB_POLL to POLL_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
nanosleep: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
* m4/nanosleep.m4: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
mbrtowc: Rename LIB_MBRTOWC to MBRTOWC_LIB.
* m4/mbrtowc.m4: Rename LIB_MBRTOWC to MBRTOWC_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB.
* modules/hard-locale (configure.ac): Rename LIB_HARD_LOCALE to
HARD_LOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB.
* m4/getrandom.m4: Rename LIB_GETRANDOM to GETRANDOM_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
getlogin, getlogin_r: Rename LIB_GETLOGIN to GETLOGIN_LIB.
* m4/getlogin.m4: Rename LIB_GETLOGIN to GETLOGIN_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
gethrxtime: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
* m4/gethrxtime.m4: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
fdatasync: Rename LIB_FDATASYNC to FDATASYNC_LIB.
* m4/fdatasync.m4: Rename LIB_FDATASYNC to FDATASYNC_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
euidaccess: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
* m4/euidaccess.m4: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
duplocale: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
* m4/duplocale.m4: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
2023-01-07 Bruno Haible <bruno@clisp.org>
clock_time: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
* m4/clock_time.m4: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
All uses changed.
* NEWS: Mention the change.
[-- Attachment #2: 0001-clock_time-Rename-LIB_CLOCK_GETTIME-to-CLOCK_TIME_LI.patch --]
[-- Type: text/x-patch, Size: 19466 bytes --]
From 419cf94406fc62731a147bf18d39eea2a75ac41c Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:10:34 +0100
Subject: [PATCH 01/18] clock_time: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
* m4/clock_time.m4: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/clock_time.m4 | 15 +++++++++------
m4/gethrxtime.m4 | 4 ++--
modules/clock-time | 2 +-
modules/copy-file-tests | 2 +-
modules/fcntl-h-c++-tests | 2 +-
modules/fdutimensat-tests | 2 +-
modules/futimens | 2 +-
modules/futimens-tests | 2 +-
modules/gettime | 2 +-
modules/gettime-res | 2 +-
modules/gettime-res-tests | 2 +-
modules/getumask | 2 +-
modules/getumask-tests | 2 +-
modules/glob-h-c++-tests | 2 +-
modules/mkdtemp | 2 +-
modules/mkostemp | 2 +-
modules/mkostemps | 2 +-
modules/mkstemp | 2 +-
modules/mkstemps | 2 +-
modules/parse-datetime-tests | 2 +-
modules/settime | 2 +-
modules/stdlib-c++-tests | 2 +-
modules/supersede | 2 +-
modules/supersede-tests | 2 +-
modules/sys_ioctl-c++-tests | 2 +-
modules/sys_stat-c++-tests | 2 +-
modules/tempname | 2 +-
modules/tempname-tests | 2 +-
modules/time-c++-tests | 2 +-
modules/timespec_get | 2 +-
modules/timespec_get-tests | 2 +-
modules/timespec_getres | 2 +-
modules/timespec_getres-tests | 2 +-
modules/tmpfile | 2 +-
modules/tmpfile-safer | 2 +-
modules/unistd-c++-tests | 2 +-
modules/utime-tests | 2 +-
modules/utimens | 2 +-
modules/utimens-tests | 2 +-
modules/utimensat-tests | 2 +-
42 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f531198fbb..9da31ee4e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ clock_time: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
+ * m4/clock_time.m4: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-06 Paul Eggert <eggert@cs.ucla.edu>
file-has-acl: don’t bother setting LIB_HAS_ACL
diff --git a/NEWS b/NEWS
index 65dcce7590..64f83a622a 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 clock_time Link with $(CLOCK_TIME_LIB) instead of
+ $(LIB_CLOCK_GETTIME).
+
2023-01-06 file-has-acl Link with $(FILE_HAS_ACL_LIB), not $(LIB_HAS_ACL).
2022-12-25 largefile configure no longer enables year-2038 support,
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index 411e0710e7..d624a73d35 100644
--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -1,14 +1,14 @@
-# clock_time.m4 serial 11
+# clock_time.m4 serial 12
dnl Copyright (C) 2002-2006, 2009-2023 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.
# Check for clock_getres, clock_gettime and clock_settime,
-# and set LIB_CLOCK_GETTIME.
+# and set CLOCK_TIME_LIB.
# For a program named, say foo, you should add a line like the following
# in the corresponding Makefile.am file:
-# foo_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+# foo_LDADD = $(LDADD) $(CLOCK_TIME_LIB)
AC_DEFUN([gl_CLOCK_TIME],
[
@@ -21,12 +21,15 @@ AC_DEFUN([gl_CLOCK_TIME],
# Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all*
# programs in the package would end up linked with that potentially-shared
# library, inducing unnecessary run-time overhead.
- LIB_CLOCK_GETTIME=
- AC_SUBST([LIB_CLOCK_GETTIME])
+ CLOCK_TIME_LIB=
+ AC_SUBST([CLOCK_TIME_LIB])
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([clock_gettime], [rt posix4],
[test "$ac_cv_search_clock_gettime" = "none required" ||
- LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+ CLOCK_TIME_LIB=$ac_cv_search_clock_gettime])
AC_CHECK_FUNCS([clock_getres clock_gettime clock_settime])
LIBS=$gl_saved_libs
+ # For backward compatibility.
+ LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB"
+ AC_SUBST([LIB_CLOCK_GETTIME])
])
diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index 67b9c8c699..8c0cccf625 100644
--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -1,4 +1,4 @@
-# gethrxtime.m4 serial 13
+# gethrxtime.m4 serial 14
dnl Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@ AC_DEFUN([gl_GETHRXTIME],
[gl_cv_have_clock_gettime_macro=yes],
[gl_cv_have_clock_gettime_macro=no])])
if test $gl_cv_have_clock_gettime_macro = yes; then
- LIB_GETHRXTIME=$LIB_CLOCK_GETTIME
+ LIB_GETHRXTIME=$CLOCK_TIME_LIB
fi
fi
fi
diff --git a/modules/clock-time b/modules/clock-time
index fc867ae0fc..0ec3e641b5 100644
--- a/modules/clock-time
+++ b/modules/clock-time
@@ -15,7 +15,7 @@ Makefile.am:
Include:
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index a0788755f1..e20191ad24 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -18,4 +18,4 @@ Makefile.am:
TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh
TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-copy-file
-test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(LIB_CLOCK_GETTIME) @LIBINTL@ $(LIB_MBRTOWC)
+test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(LIB_MBRTOWC)
diff --git a/modules/fcntl-h-c++-tests b/modules/fcntl-h-c++-tests
index a3182a5367..44e9e285ce 100644
--- a/modules/fcntl-h-c++-tests
+++ b/modules/fcntl-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-fcntl-h-c++
check_PROGRAMS += test-fcntl-h-c++
test_fcntl_h_c___SOURCES = test-fcntl-h-c++.cc
-test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIBSOCKET)
+test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_EACCESS) $(LIBSOCKET)
endif
diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index 1f492a6989..e34ef6233b 100644
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -22,5 +22,5 @@ configure.ac:
Makefile.am:
TESTS += test-fdutimensat
check_PROGRAMS += test-fdutimensat
-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
+test_fdutimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) \
$(LIB_NANOSLEEP) @LIBINTL@
diff --git a/modules/futimens b/modules/futimens
index c081b6fe02..e63ff78b78 100644
--- a/modules/futimens
+++ b/modules/futimens
@@ -25,7 +25,7 @@ Include:
<sys/stat.h>
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/futimens-tests b/modules/futimens-tests
index 636f8426b6..9b82da1450 100644
--- a/modules/futimens-tests
+++ b/modules/futimens-tests
@@ -21,4 +21,4 @@ configure.ac:
Makefile.am:
TESTS += test-futimens
check_PROGRAMS += test-futimens
-test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+test_futimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
diff --git a/modules/gettime b/modules/gettime
index fcbb644efe..78a49f1f7f 100644
--- a/modules/gettime
+++ b/modules/gettime
@@ -22,7 +22,7 @@ Include:
"timespec.h"
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/gettime-res b/modules/gettime-res
index 90f3e81d5a..261d74adc2 100644
--- a/modules/gettime-res
+++ b/modules/gettime-res
@@ -21,7 +21,7 @@ Include:
"timespec.h"
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/gettime-res-tests b/modules/gettime-res-tests
index b169f1c187..158518e8d6 100644
--- a/modules/gettime-res-tests
+++ b/modules/gettime-res-tests
@@ -9,4 +9,4 @@ configure.ac:
Makefile.am:
TESTS += test-gettime-res
check_PROGRAMS += test-gettime-res
-test_gettime_res_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+test_gettime_res_LDADD = $(LDADD) $(CLOCK_TIME_LIB)
diff --git a/modules/getumask b/modules/getumask
index 5f70901a6d..4e8b843ed2 100644
--- a/modules/getumask
+++ b/modules/getumask
@@ -31,7 +31,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/getumask-tests b/modules/getumask-tests
index 0f617dab5b..455ef0ff6b 100644
--- a/modules/getumask-tests
+++ b/modules/getumask-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-getumask
check_PROGRAMS += test-getumask
-test_getumask_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD)
+test_getumask_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD)
diff --git a/modules/glob-h-c++-tests b/modules/glob-h-c++-tests
index 4ae96408e2..ed8a008199 100644
--- a/modules/glob-h-c++-tests
+++ b/modules/glob-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-glob-h-c++
check_PROGRAMS += test-glob-h-c++
test_glob_h_c___SOURCES = test-glob-h-c++.cc
-test_glob_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_MBRTOWC)
+test_glob_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC)
endif
diff --git a/modules/mkdtemp b/modules/mkdtemp
index bf531dddcf..63a62c3f54 100644
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -28,7 +28,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/mkostemp b/modules/mkostemp
index 120b5d5d92..a77f5b7538 100644
--- a/modules/mkostemp
+++ b/modules/mkostemp
@@ -31,7 +31,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/mkostemps b/modules/mkostemps
index 5d6fe672f7..051ca8368f 100644
--- a/modules/mkostemps
+++ b/modules/mkostemps
@@ -28,7 +28,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/mkstemp b/modules/mkstemp
index 1b83548197..22de2c4e99 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -30,7 +30,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/mkstemps b/modules/mkstemps
index bcd44f5202..6ae3beeecf 100644
--- a/modules/mkstemps
+++ b/modules/mkstemps
@@ -27,7 +27,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/parse-datetime-tests b/modules/parse-datetime-tests
index 7c62b8024a..6e0cdcc8d7 100644
--- a/modules/parse-datetime-tests
+++ b/modules/parse-datetime-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-parse-datetime
check_PROGRAMS += test-parse-datetime
-test_parse_datetime_LDADD = $(LDADD) @LIBINTL@ $(LIB_CLOCK_GETTIME)
+test_parse_datetime_LDADD = $(LDADD) @LIBINTL@ $(CLOCK_TIME_LIB)
diff --git a/modules/settime b/modules/settime
index 8f097f7860..a778febe11 100644
--- a/modules/settime
+++ b/modules/settime
@@ -22,7 +22,7 @@ Include:
"timespec.h"
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
GPL
diff --git a/modules/stdlib-c++-tests b/modules/stdlib-c++-tests
index 465ebfedab..3ae34cb388 100644
--- a/modules/stdlib-c++-tests
+++ b/modules/stdlib-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-stdlib-c++
check_PROGRAMS += test-stdlib-c++
test_stdlib_c___SOURCES = test-stdlib-c++.cc test-stdlib-c++2.cc
-test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_GETRANDOM)
+test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(LIB_EACCESS) $(LIB_GETRANDOM)
endif
diff --git a/modules/supersede b/modules/supersede
index 5e458536a2..64a25e53ad 100644
--- a/modules/supersede
+++ b/modules/supersede
@@ -37,7 +37,7 @@ Include:
Link:
$(LIB_ACL)
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/supersede-tests b/modules/supersede-tests
index 7224d2e31e..5166736fce 100644
--- a/modules/supersede-tests
+++ b/modules/supersede-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-supersede
check_PROGRAMS += test-supersede
-test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD)
+test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD)
diff --git a/modules/sys_ioctl-c++-tests b/modules/sys_ioctl-c++-tests
index 557b33d621..3f524df025 100644
--- a/modules/sys_ioctl-c++-tests
+++ b/modules/sys_ioctl-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_ioctl-c++
check_PROGRAMS += test-sys_ioctl-c++
test_sys_ioctl_c___SOURCES = test-sys_ioctl-c++.cc
-test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)
+test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(LIB_EACCESS)
endif
diff --git a/modules/sys_stat-c++-tests b/modules/sys_stat-c++-tests
index 3a612151b4..c12ad60819 100644
--- a/modules/sys_stat-c++-tests
+++ b/modules/sys_stat-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_stat-c++
check_PROGRAMS += test-sys_stat-c++
test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
-test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_MBRTOWC) $(LIB_GETRANDOM)
+test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) $(LIB_GETRANDOM)
endif
diff --git a/modules/tempname b/modules/tempname
index f1fb78e8ff..27699a8fe3 100644
--- a/modules/tempname
+++ b/modules/tempname
@@ -33,7 +33,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPLv2+
diff --git a/modules/tempname-tests b/modules/tempname-tests
index adccd0d8e9..2ff355281e 100644
--- a/modules/tempname-tests
+++ b/modules/tempname-tests
@@ -13,4 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-tempname
check_PROGRAMS += test-tempname
-test_tempname_LDADD = $(LDADD) $(LIB_GETRANDOM) $(LIB_CLOCK_GETTIME)
+test_tempname_LDADD = $(LDADD) $(LIB_GETRANDOM) $(CLOCK_TIME_LIB)
diff --git a/modules/time-c++-tests b/modules/time-c++-tests
index f8dd779965..520e86e5c1 100644
--- a/modules/time-c++-tests
+++ b/modules/time-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-time-c++
check_PROGRAMS += test-time-c++
test_time_c___SOURCES = test-time-c++.cc test-time-c++2.cc
-test_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_CLOCK_GETTIME)
+test_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(CLOCK_TIME_LIB)
endif
diff --git a/modules/timespec_get b/modules/timespec_get
index 99ef6e8afc..b1b33b494d 100644
--- a/modules/timespec_get
+++ b/modules/timespec_get
@@ -24,7 +24,7 @@ Include:
<time.h>
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/timespec_get-tests b/modules/timespec_get-tests
index f13e199ad7..7784792196 100644
--- a/modules/timespec_get-tests
+++ b/modules/timespec_get-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-timespec_get
check_PROGRAMS += test-timespec_get
-test_timespec_get_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+test_timespec_get_LDADD = $(LDADD) @CLOCK_TIME_LIB@
diff --git a/modules/timespec_getres b/modules/timespec_getres
index 026eb0772d..7dc67bab78 100644
--- a/modules/timespec_getres
+++ b/modules/timespec_getres
@@ -24,7 +24,7 @@ Include:
<time.h>
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/timespec_getres-tests b/modules/timespec_getres-tests
index 9bb83cc795..317d85182e 100644
--- a/modules/timespec_getres-tests
+++ b/modules/timespec_getres-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-timespec_getres
check_PROGRAMS += test-timespec_getres
-test_timespec_getres_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+test_timespec_getres_LDADD = $(LDADD) @CLOCK_TIME_LIB@
diff --git a/modules/tmpfile b/modules/tmpfile
index fc65fa581e..6a13f830f5 100644
--- a/modules/tmpfile
+++ b/modules/tmpfile
@@ -31,7 +31,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/tmpfile-safer b/modules/tmpfile-safer
index d385cdb5ad..fc9db9ef7f 100644
--- a/modules/tmpfile-safer
+++ b/modules/tmpfile-safer
@@ -22,7 +22,7 @@ Include:
Link:
$(LIB_GETRANDOM)
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
GPL
diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests
index 3aaf52bbe7..0e35d0f909 100644
--- a/modules/unistd-c++-tests
+++ b/modules/unistd-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-unistd-c++
check_PROGRAMS += test-unistd-c++
test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIBSOCKET) $(LIB_GETLOGIN) $(LIB_GETRANDOM)
+test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_EACCESS) $(LIBSOCKET) $(LIB_GETLOGIN) $(LIB_GETRANDOM)
endif
diff --git a/modules/utime-tests b/modules/utime-tests
index 3f30f92925..b7464cdb1f 100644
--- a/modules/utime-tests
+++ b/modules/utime-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-utime
check_PROGRAMS += test-utime
-test_utime_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+test_utime_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
diff --git a/modules/utimens b/modules/utimens
index c124cb5cbe..73f757021e 100644
--- a/modules/utimens
+++ b/modules/utimens
@@ -34,7 +34,7 @@ Include:
"utimens.h"
Link:
-$(LIB_CLOCK_GETTIME)
+$(CLOCK_TIME_LIB)
License:
LGPL
diff --git a/modules/utimens-tests b/modules/utimens-tests
index b3e066f95f..9aee72e517 100644
--- a/modules/utimens-tests
+++ b/modules/utimens-tests
@@ -22,4 +22,4 @@ configure.ac:
Makefile.am:
TESTS += test-utimens
check_PROGRAMS += test-utimens
-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+test_utimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
diff --git a/modules/utimensat-tests b/modules/utimensat-tests
index d713b7052c..85d64d640d 100644
--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-utimensat
check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
--
2.34.1
[-- Attachment #3: 0002-duplocale-Rename-LIB_DUPLOCALE-to-DUPLOCALE_LIB.patch --]
[-- Type: text/x-patch, Size: 2996 bytes --]
From 4d458b63d7b27660fcd20669cc7c04e626930345 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:13:35 +0100
Subject: [PATCH 02/18] duplocale: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
* m4/duplocale.m4: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/duplocale.m4 | 11 +++++++----
modules/duplocale | 2 +-
modules/duplocale-tests | 2 +-
5 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9da31ee4e5..f13184ba8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ duplocale: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
+ * m4/duplocale.m4: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
clock_time: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB.
diff --git a/NEWS b/NEWS
index 64f83a622a..faf0633464 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 duplocale Link with $(DUPLOCALE_LIB) instead of
+ $(LIB_DUPLOCALE).
+
2023-01-07 clock_time Link with $(CLOCK_TIME_LIB) instead of
$(LIB_CLOCK_GETTIME).
diff --git a/m4/duplocale.m4 b/m4/duplocale.m4
index 488094b398..2e4686f078 100644
--- a/m4/duplocale.m4
+++ b/m4/duplocale.m4
@@ -1,4 +1,4 @@
-# duplocale.m4 serial 12
+# duplocale.m4 serial 13
dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -111,12 +111,15 @@ int main ()
HAVE_DUPLOCALE=0
fi
if test $REPLACE_DUPLOCALE = 1; then
- LIB_DUPLOCALE="$LIB_SETLOCALE_NULL"
+ DUPLOCALE_LIB="$LIB_SETLOCALE_NULL"
else
- LIB_DUPLOCALE=
+ DUPLOCALE_LIB=
fi
- dnl LIB_DUPLOCALE is expected to be '-pthread' or '-lpthread' on AIX
+ dnl DUPLOCALE_LIB is expected to be '-pthread' or '-lpthread' on AIX
dnl with gcc or xlc, and empty otherwise.
+ AC_SUBST([DUPLOCALE_LIB])
+ dnl For backward compatibility.
+ LIB_DUPLOCALE="$DUPLOCALE_LIB"
AC_SUBST([LIB_DUPLOCALE])
])
diff --git a/modules/duplocale b/modules/duplocale
index 0c6dc22757..80d4aaaf54 100644
--- a/modules/duplocale
+++ b/modules/duplocale
@@ -26,7 +26,7 @@ Include:
<locale.h>
Link:
-$(LIB_DUPLOCALE)
+$(DUPLOCALE_LIB)
License:
LGPL
diff --git a/modules/duplocale-tests b/modules/duplocale-tests
index e30810982a..55ec1f279e 100644
--- a/modules/duplocale-tests
+++ b/modules/duplocale-tests
@@ -15,4 +15,4 @@ gt_FUNC_USELOCALE
Makefile.am:
TESTS += test-duplocale
check_PROGRAMS += test-duplocale
-test_duplocale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_DUPLOCALE@
+test_duplocale_LDADD = $(LDADD) $(LIB_SETLOCALE) @DUPLOCALE_LIB@
--
2.34.1
[-- Attachment #4: 0003-euidaccess-Rename-LIB_EACCESS-to-EUIDACCESS_LIBGEN.patch --]
[-- Type: text/x-patch, Size: 7477 bytes --]
From 914113b18cba30b9071dd91c688b90c705250684 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:19:17 +0100
Subject: [PATCH 03/18] euidaccess: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
* m4/euidaccess.m4: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/euidaccess.m4 | 11 +++++++----
modules/euidaccess | 2 +-
modules/faccessat | 2 +-
modules/faccessat-tests | 2 +-
modules/fcntl-h-c++-tests | 2 +-
modules/stdio-c++-tests | 2 +-
modules/stdlib-c++-tests | 2 +-
modules/sys_ioctl-c++-tests | 2 +-
modules/unistd-c++-tests | 2 +-
modules/wchar-c++-tests | 2 +-
modules/wctype-h-c++-tests | 2 +-
13 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f13184ba8f..c3bfd87e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ euidaccess: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
+ * m4/euidaccess.m4: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
duplocale: Rename LIB_DUPLOCALE to DUPLOCALE_LIB.
diff --git a/NEWS b/NEWS
index faf0633464..3c20b45aec 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 euidaccess Link with $(EUIDACCESS_LIBGEN) instead of
+ $(LIB_EACCESS).
+
2023-01-07 duplocale Link with $(DUPLOCALE_LIB) instead of
$(LIB_DUPLOCALE).
diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index 0dc757820e..f0eb5bde84 100644
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -1,4 +1,4 @@
-# euidaccess.m4 serial 15
+# euidaccess.m4 serial 16
dnl Copyright (C) 2002-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -41,12 +41,15 @@ AC_DEFUN([gl_PREREQ_EUIDACCESS], [
# Save and restore LIBS so -lgen isn't added to it. Otherwise, *all*
# programs in the package would end up linked with that potentially-shared
# library, inducing unnecessary run-time overhead.
- LIB_EACCESS=
- AC_SUBST([LIB_EACCESS])
+ EUIDACCESS_LIBGEN=
+ AC_SUBST([EUIDACCESS_LIBGEN])
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([eaccess], [gen],
[test "$ac_cv_search_eaccess" = "none required" ||
- LIB_EACCESS=$ac_cv_search_eaccess])
+ EUIDACCESS_LIBGEN=$ac_cv_search_eaccess])
AC_CHECK_FUNCS([eaccess])
LIBS=$gl_saved_libs
+ # For backward compatibility.
+ LIB_EACCESS="$EUIDACCESS_LIBGEN"
+ AC_SUBST([LIB_EACCESS])
])
diff --git a/modules/euidaccess b/modules/euidaccess
index 43b0945199..b45cf358d1 100644
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -31,7 +31,7 @@ Include:
<unistd.h>
Link:
-$(LIB_EACCESS)
+$(EUIDACCESS_LIBGEN)
License:
LGPLv2+
diff --git a/modules/faccessat b/modules/faccessat
index a86c099271..f560dd66e5 100644
--- a/modules/faccessat
+++ b/modules/faccessat
@@ -40,7 +40,7 @@ Include:
<unistd.h>
Link:
-$(LIB_EACCESS)
+$(EUIDACCESS_LIBGEN)
License:
GPL
diff --git a/modules/faccessat-tests b/modules/faccessat-tests
index 3beffcd23b..b11c9f0756 100644
--- a/modules/faccessat-tests
+++ b/modules/faccessat-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-faccessat
check_PROGRAMS += test-faccessat
-test_faccessat_LDADD = $(LDADD) $(LIB_EACCESS) @LIBINTL@
+test_faccessat_LDADD = $(LDADD) $(EUIDACCESS_LIBGEN) @LIBINTL@
diff --git a/modules/fcntl-h-c++-tests b/modules/fcntl-h-c++-tests
index 44e9e285ce..7db39685aa 100644
--- a/modules/fcntl-h-c++-tests
+++ b/modules/fcntl-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-fcntl-h-c++
check_PROGRAMS += test-fcntl-h-c++
test_fcntl_h_c___SOURCES = test-fcntl-h-c++.cc
-test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_EACCESS) $(LIBSOCKET)
+test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET)
endif
diff --git a/modules/stdio-c++-tests b/modules/stdio-c++-tests
index df8ba4e365..a4e7dd9a11 100644
--- a/modules/stdio-c++-tests
+++ b/modules/stdio-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-stdio-c++
check_PROGRAMS += test-stdio-c++
test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc
-test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS) $(LIB_GETRANDOM)
+test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(LIB_GETRANDOM)
endif
diff --git a/modules/stdlib-c++-tests b/modules/stdlib-c++-tests
index 3ae34cb388..b9de379d08 100644
--- a/modules/stdlib-c++-tests
+++ b/modules/stdlib-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-stdlib-c++
check_PROGRAMS += test-stdlib-c++
test_stdlib_c___SOURCES = test-stdlib-c++.cc test-stdlib-c++2.cc
-test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(LIB_EACCESS) $(LIB_GETRANDOM)
+test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIB_GETRANDOM)
endif
diff --git a/modules/sys_ioctl-c++-tests b/modules/sys_ioctl-c++-tests
index 3f524df025..710c36051d 100644
--- a/modules/sys_ioctl-c++-tests
+++ b/modules/sys_ioctl-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_ioctl-c++
check_PROGRAMS += test-sys_ioctl-c++
test_sys_ioctl_c___SOURCES = test-sys_ioctl-c++.cc
-test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(LIB_EACCESS)
+test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)
endif
diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests
index 0e35d0f909..b4fb9f80a4 100644
--- a/modules/unistd-c++-tests
+++ b/modules/unistd-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-unistd-c++
check_PROGRAMS += test-unistd-c++
test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_EACCESS) $(LIBSOCKET) $(LIB_GETLOGIN) $(LIB_GETRANDOM)
+test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(LIB_GETLOGIN) $(LIB_GETRANDOM)
endif
diff --git a/modules/wchar-c++-tests b/modules/wchar-c++-tests
index 93135d5347..d0852b42b6 100644
--- a/modules/wchar-c++-tests
+++ b/modules/wchar-c++-tests
@@ -17,5 +17,5 @@ if ANSICXX
TESTS += test-wchar-c++
check_PROGRAMS += test-wchar-c++
test_wchar_c___SOURCES = test-wchar-c++.cc test-wchar-c++2.cc test-wchar-c++3.cc
-test_wchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS) $(LIBTHREAD)
+test_wchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(LIBTHREAD)
endif
diff --git a/modules/wctype-h-c++-tests b/modules/wctype-h-c++-tests
index 0f7db9c84a..ce869becf4 100644
--- a/modules/wctype-h-c++-tests
+++ b/modules/wctype-h-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-wctype-h-c++
check_PROGRAMS += test-wctype-h-c++
test_wctype_h_c___SOURCES = test-wctype-h-c++.cc test-wctype-h-c++2.cc
-test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS)
+test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN)
endif
--
2.34.1
[-- Attachment #5: 0004-fdatasync-Rename-LIB_FDATASYNC-to-FDATASYNC_LIB.patch --]
[-- Type: text/x-patch, Size: 3255 bytes --]
From c57d096e5c405f99cb2cf8032bca4f850410189d Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:23:26 +0100
Subject: [PATCH 04/18] fdatasync: Rename LIB_FDATASYNC to FDATASYNC_LIB.
* m4/fdatasync.m4: Rename LIB_FDATASYNC to FDATASYNC_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/fdatasync.m4 | 12 ++++++++----
modules/fdatasync | 2 +-
modules/fdatasync-tests | 2 +-
5 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c3bfd87e35..f5cfe89c21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ fdatasync: Rename LIB_FDATASYNC to FDATASYNC_LIB.
+ * m4/fdatasync.m4: Rename LIB_FDATASYNC to FDATASYNC_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
euidaccess: Rename LIB_EACCESS to EUIDACCESS_LIBGEN.
diff --git a/NEWS b/NEWS
index 3c20b45aec..ca974f2685 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 fdatasync Link with $(FDATASYNC_LIB) instead of
+ $(LIB_FDATASYNC).
+
2023-01-07 euidaccess Link with $(EUIDACCESS_LIBGEN) instead of
$(LIB_EACCESS).
diff --git a/m4/fdatasync.m4 b/m4/fdatasync.m4
index acd71a1a56..8c5cc4fdaf 100644
--- a/m4/fdatasync.m4
+++ b/m4/fdatasync.m4
@@ -1,4 +1,4 @@
-# fdatasync.m4 serial 6
+# fdatasync.m4 serial 7
dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -11,8 +11,8 @@ AC_DEFUN([gl_FUNC_FDATASYNC],
dnl Using AC_CHECK_FUNCS_ONCE would break our subsequent AC_SEARCH_LIBS
AC_CHECK_DECLS_ONCE([fdatasync])
- LIB_FDATASYNC=
- AC_SUBST([LIB_FDATASYNC])
+ FDATASYNC_LIB=
+ AC_SUBST([FDATASYNC_LIB])
if test $ac_cv_have_decl_fdatasync = no; then
HAVE_DECL_FDATASYNC=0
@@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_FDATASYNC],
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([fdatasync], [rt posix4],
[test "$ac_cv_search_fdatasync" = "none required" ||
- LIB_FDATASYNC=$ac_cv_search_fdatasync])
+ FDATASYNC_LIB=$ac_cv_search_fdatasync])
LIBS=$gl_saved_libs
;;
*)
@@ -42,4 +42,8 @@ AC_DEFUN([gl_FUNC_FDATASYNC],
;;
esac
fi
+
+ dnl For backward compatibility.
+ LIB_FDATASYNC="$FDATASYNC_LIB"
+ AC_SUBST([LIB_FDATASYNC])
])
diff --git a/modules/fdatasync b/modules/fdatasync
index bff4dc3a69..6e0f48df21 100644
--- a/modules/fdatasync
+++ b/modules/fdatasync
@@ -23,7 +23,7 @@ Include:
<unistd.h>
Link:
-$(LIB_FDATASYNC)
+$(FDATASYNC_LIB)
License:
LGPLv2+
diff --git a/modules/fdatasync-tests b/modules/fdatasync-tests
index cacfb8a11e..88da0b10de 100644
--- a/modules/fdatasync-tests
+++ b/modules/fdatasync-tests
@@ -11,4 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-fdatasync
check_PROGRAMS += test-fdatasync
-test_fdatasync_LDADD = $(LDADD) $(LIB_FDATASYNC)
+test_fdatasync_LDADD = $(LDADD) $(FDATASYNC_LIB)
--
2.34.1
[-- Attachment #6: 0005-gethrxtime-Rename-LIB_GETHRXTIME-to-GETHRXTIME_LIB.patch --]
[-- Type: text/x-patch, Size: 2812 bytes --]
From 0b15fd22718461843b29bfa6fc48ca9798854c66 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:26:46 +0100
Subject: [PATCH 05/18] gethrxtime: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
* m4/gethrxtime.m4: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/gethrxtime.m4 | 9 ++++++---
modules/gethrxtime | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f5cfe89c21..37e86accff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ gethrxtime: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
+ * m4/gethrxtime.m4: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
fdatasync: Rename LIB_FDATASYNC to FDATASYNC_LIB.
diff --git a/NEWS b/NEWS
index ca974f2685..12a0e469ce 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 gethrxtime Link with $(GETHRXTIME_LIB) instead of
+ $(LIB_GETHRXTIME).
+
2023-01-07 fdatasync Link with $(FDATASYNC_LIB) instead of
$(LIB_FDATASYNC).
diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index 8c0cccf625..f92ed7f810 100644
--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -1,4 +1,4 @@
-# gethrxtime.m4 serial 14
+# gethrxtime.m4 serial 15
dnl Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@ AC_DEFUN([gl_GETHRXTIME],
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_XTIME])
AC_CHECK_DECLS([gethrtime], [], [], [[#include <time.h>]])
- LIB_GETHRXTIME=
+ GETHRXTIME_LIB=
if test $ac_cv_have_decl_gethrtime = no \
|| test $gl_cv_arithmetic_hrtime_t = no; then
dnl Find libraries needed to link lib/gethrxtime.c.
@@ -34,10 +34,13 @@ AC_DEFUN([gl_GETHRXTIME],
[gl_cv_have_clock_gettime_macro=yes],
[gl_cv_have_clock_gettime_macro=no])])
if test $gl_cv_have_clock_gettime_macro = yes; then
- LIB_GETHRXTIME=$CLOCK_TIME_LIB
+ GETHRXTIME_LIB=$CLOCK_TIME_LIB
fi
fi
fi
+ AC_SUBST([GETHRXTIME_LIB])
+ dnl For backward compatibility.
+ LIB_GETHRXTIME="$GETHRXTIME_LIB"
AC_SUBST([LIB_GETHRXTIME])
])
diff --git a/modules/gethrxtime b/modules/gethrxtime
index b4a715f3ea..6bb274cf3e 100644
--- a/modules/gethrxtime
+++ b/modules/gethrxtime
@@ -25,7 +25,7 @@ Include:
"xtime.h"
Link:
-$(LIB_GETHRXTIME)
+$(GETHRXTIME_LIB)
License:
GPL
--
2.34.1
[-- Attachment #7: 0006-getlogin-getlogin_r-Rename-LIB_GETLOGIN-to-GETLOGIN_.patch --]
[-- Type: text/x-patch, Size: 4037 bytes --]
From b98a5b9d89ff223cd6d543c4f8d0ace24b228bce Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:33:28 +0100
Subject: [PATCH 06/18] getlogin, getlogin_r: Rename LIB_GETLOGIN to
GETLOGIN_LIB.
* m4/getlogin.m4: Rename LIB_GETLOGIN to GETLOGIN_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/getlogin.m4 | 9 ++++++---
modules/getlogin | 2 +-
modules/getlogin-tests | 2 +-
modules/getlogin_r | 2 +-
modules/getlogin_r-tests | 2 +-
modules/unistd-c++-tests | 2 +-
8 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 37e86accff..9497f9ce93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ getlogin, getlogin_r: Rename LIB_GETLOGIN to GETLOGIN_LIB.
+ * m4/getlogin.m4: Rename LIB_GETLOGIN to GETLOGIN_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
gethrxtime: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
diff --git a/NEWS b/NEWS
index 12a0e469ce..0b6da8e542 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 getlogin Link with $(GETLOGIN_LIB) instead of
+ getlogin_r $(LIB_GETLOGIN).
+
2023-01-07 gethrxtime Link with $(GETHRXTIME_LIB) instead of
$(LIB_GETHRXTIME).
diff --git a/m4/getlogin.m4 b/m4/getlogin.m4
index 142a2a94ad..0686b5f079 100644
--- a/m4/getlogin.m4
+++ b/m4/getlogin.m4
@@ -1,4 +1,4 @@
-# getlogin.m4 serial 5
+# getlogin.m4 serial 6
dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -24,9 +24,12 @@ AC_DEFUN([gl_LIB_GETLOGIN],
AC_REQUIRE([AC_CANONICAL_HOST])
case $host_os in
mingw*)
- LIB_GETLOGIN='-ladvapi32' ;;
+ GETLOGIN_LIB='-ladvapi32' ;;
*)
- LIB_GETLOGIN= ;;
+ GETLOGIN_LIB= ;;
esac
+ AC_SUBST([GETLOGIN_LIB])
+ dnl For backward compatibility.
+ LIB_GETLOGIN="$GETLOGIN_LIB"
AC_SUBST([LIB_GETLOGIN])
])
diff --git a/modules/getlogin b/modules/getlogin
index 0a88c92e0e..c73b2a9a2e 100644
--- a/modules/getlogin
+++ b/modules/getlogin
@@ -23,7 +23,7 @@ Include:
<unistd.h>
Link:
-$(LIB_GETLOGIN)
+$(GETLOGIN_LIB)
License:
LGPLv2+
diff --git a/modules/getlogin-tests b/modules/getlogin-tests
index 5056a9ca47..b8fff1e3f5 100644
--- a/modules/getlogin-tests
+++ b/modules/getlogin-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-getlogin
check_PROGRAMS += test-getlogin
-test_getlogin_LDADD = $(LDADD) $(LIB_GETLOGIN)
+test_getlogin_LDADD = $(LDADD) $(GETLOGIN_LIB)
diff --git a/modules/getlogin_r b/modules/getlogin_r
index b5f356a123..843bcde19c 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -31,7 +31,7 @@ Include:
<unistd.h>
Link:
-$(LIB_GETLOGIN)
+$(GETLOGIN_LIB)
License:
LGPLv2+
diff --git a/modules/getlogin_r-tests b/modules/getlogin_r-tests
index 7918ebd183..b53a729efa 100644
--- a/modules/getlogin_r-tests
+++ b/modules/getlogin_r-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-getlogin_r
check_PROGRAMS += test-getlogin_r
-test_getlogin_r_LDADD = $(LDADD) $(LIB_GETLOGIN)
+test_getlogin_r_LDADD = $(LDADD) $(GETLOGIN_LIB)
diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests
index b4fb9f80a4..4028a1178a 100644
--- a/modules/unistd-c++-tests
+++ b/modules/unistd-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-unistd-c++
check_PROGRAMS += test-unistd-c++
test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(LIB_GETLOGIN) $(LIB_GETRANDOM)
+test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(LIB_GETRANDOM)
endif
--
2.34.1
[-- Attachment #8: 0007-getrandom-Rename-LIB_GETRANDOM-to-GETRANDOM_LIB.patch --]
[-- Type: text/x-patch, Size: 20810 bytes --]
From daa573bc67c72b83d36c5e6ba57849e8ce96fe53 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:39:17 +0100
Subject: [PATCH 07/18] getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB.
* m4/getrandom.m4: Rename LIB_GETRANDOM to GETRANDOM_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/getrandom.m4 | 11 +++++++----
modules/argv-iter-tests | 2 +-
modules/clean-temp | 2 +-
modules/crypto/gc-arcfour-tests | 2 +-
modules/crypto/gc-arctwo-tests | 2 +-
modules/crypto/gc-des-tests | 2 +-
modules/crypto/gc-hmac-md5-tests | 2 +-
modules/crypto/gc-hmac-sha1-tests | 2 +-
modules/crypto/gc-hmac-sha256-tests | 2 +-
modules/crypto/gc-hmac-sha512-tests | 2 +-
modules/crypto/gc-md2-tests | 2 +-
modules/crypto/gc-md4-tests | 2 +-
modules/crypto/gc-md5-tests | 2 +-
modules/crypto/gc-pbkdf2-sha1-tests | 2 +-
modules/crypto/gc-pbkdf2-tests | 2 +-
modules/crypto/gc-random | 2 +-
modules/crypto/gc-rijndael-tests | 2 +-
modules/crypto/gc-sha1-tests | 2 +-
modules/crypto/gc-sha256-tests | 2 +-
modules/crypto/gc-sha512-tests | 2 +-
modules/crypto/gc-sm3-tests | 2 +-
modules/crypto/gc-tests | 2 +-
modules/getentropy | 2 +-
modules/getentropy-tests | 2 +-
modules/getrandom | 2 +-
modules/getrandom-tests | 2 +-
modules/getumask | 2 +-
modules/getumask-tests | 2 +-
modules/javacomp | 2 +-
modules/mkdtemp | 2 +-
modules/mkostemp | 2 +-
modules/mkostemps | 2 +-
modules/mkstemp | 2 +-
modules/mkstemps | 2 +-
modules/stdio-c++-tests | 2 +-
modules/stdlib-c++-tests | 2 +-
modules/stdlib-safer | 2 +-
modules/supersede | 2 +-
modules/supersede-tests | 2 +-
modules/sys_random-c++-tests | 2 +-
modules/sys_stat-c++-tests | 2 +-
modules/tempname | 2 +-
modules/tempname-tests | 2 +-
modules/tmpfile | 2 +-
modules/tmpfile-safer | 2 +-
modules/unistd-c++-tests | 2 +-
48 files changed, 62 insertions(+), 49 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9497f9ce93..2d968f4f75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB.
+ * m4/getrandom.m4: Rename LIB_GETRANDOM to GETRANDOM_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
getlogin, getlogin_r: Rename LIB_GETLOGIN to GETLOGIN_LIB.
diff --git a/NEWS b/NEWS
index 0b6da8e542..5ff7d0816f 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 getrandom Link with $(GETRANDOM_LIB) instead of
+ $(LIB_GETRANDOM).
+
2023-01-07 getlogin Link with $(GETLOGIN_LIB) instead of
getlogin_r $(LIB_GETLOGIN).
diff --git a/m4/getrandom.m4 b/m4/getrandom.m4
index f2010c0213..c508f1a55c 100644
--- a/m4/getrandom.m4
+++ b/m4/getrandom.m4
@@ -1,4 +1,4 @@
-# getrandom.m4 serial 9
+# getrandom.m4 serial 10
dnl Copyright 2020-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -62,13 +62,16 @@ AC_DEFUN([gl_FUNC_GETRANDOM],
if test $gl_cv_lib_assume_bcrypt = yes; then
AC_DEFINE([HAVE_LIB_BCRYPT], [1],
[Define to 1 if the bcrypt library is guaranteed to be present.])
- LIB_GETRANDOM='-lbcrypt'
+ GETRANDOM_LIB='-lbcrypt'
else
- LIB_GETRANDOM='-ladvapi32'
+ GETRANDOM_LIB='-ladvapi32'
fi
;;
*)
- LIB_GETRANDOM= ;;
+ GETRANDOM_LIB= ;;
esac
+ AC_SUBST([GETRANDOM_LIB])
+ dnl For backward compatibility.
+ LIB_GETRANDOM="$GETRANDOM_LIB"
AC_SUBST([LIB_GETRANDOM])
])
diff --git a/modules/argv-iter-tests b/modules/argv-iter-tests
index 97cbe50e9f..fedbf83031 100644
--- a/modules/argv-iter-tests
+++ b/modules/argv-iter-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-argv-iter
check_PROGRAMS += test-argv-iter
-test_argv_iter_LDADD = $(LDADD) $(LIB_GETRANDOM)
+test_argv_iter_LDADD = $(LDADD) $(GETRANDOM_LIB)
diff --git a/modules/clean-temp b/modules/clean-temp
index a83f249903..5cf087dcb0 100644
--- a/modules/clean-temp
+++ b/modules/clean-temp
@@ -38,7 +38,7 @@ Include:
"clean-temp.h"
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/crypto/gc-arcfour-tests b/modules/crypto/gc-arcfour-tests
index c6ebcb663f..3c22ae49d8 100644
--- a/modules/crypto/gc-arcfour-tests
+++ b/modules/crypto/gc-arcfour-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-arcfour
check_PROGRAMS += test-gc-arcfour
-test_gc_arcfour_LDADD = $(LDADD) $(LIB_GETRANDOM)
+test_gc_arcfour_LDADD = $(LDADD) $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-arctwo-tests b/modules/crypto/gc-arctwo-tests
index 6e74c80c2f..8bd22cc0e6 100644
--- a/modules/crypto/gc-arctwo-tests
+++ b/modules/crypto/gc-arctwo-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-arctwo
check_PROGRAMS += test-gc-arctwo
-test_gc_arctwo_LDADD = $(LDADD) $(LIB_GETRANDOM)
+test_gc_arctwo_LDADD = $(LDADD) $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-des-tests b/modules/crypto/gc-des-tests
index 5d1bd46ee8..cb5035e014 100644
--- a/modules/crypto/gc-des-tests
+++ b/modules/crypto/gc-des-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-des
check_PROGRAMS += test-gc-des
-test_gc_des_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_des_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-hmac-md5-tests b/modules/crypto/gc-hmac-md5-tests
index 345ba872ac..a3f7533b78 100644
--- a/modules/crypto/gc-hmac-md5-tests
+++ b/modules/crypto/gc-hmac-md5-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-hmac-md5
check_PROGRAMS += test-gc-hmac-md5
-test_gc_hmac_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_hmac_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-hmac-sha1-tests b/modules/crypto/gc-hmac-sha1-tests
index c1effd7864..d473db6a6e 100644
--- a/modules/crypto/gc-hmac-sha1-tests
+++ b/modules/crypto/gc-hmac-sha1-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-hmac-sha1
check_PROGRAMS += test-gc-hmac-sha1
-test_gc_hmac_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_hmac_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-hmac-sha256-tests b/modules/crypto/gc-hmac-sha256-tests
index de0370fe09..596524cedf 100644
--- a/modules/crypto/gc-hmac-sha256-tests
+++ b/modules/crypto/gc-hmac-sha256-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-hmac-sha256
check_PROGRAMS += test-gc-hmac-sha256
-test_gc_hmac_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_hmac_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-hmac-sha512-tests b/modules/crypto/gc-hmac-sha512-tests
index e1c2e478f0..a03da0cbc3 100644
--- a/modules/crypto/gc-hmac-sha512-tests
+++ b/modules/crypto/gc-hmac-sha512-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-hmac-sha512
check_PROGRAMS += test-gc-hmac-sha512
-test_gc_hmac_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_hmac_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-md2-tests b/modules/crypto/gc-md2-tests
index b7ef11ff7c..9600d8df19 100644
--- a/modules/crypto/gc-md2-tests
+++ b/modules/crypto/gc-md2-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-md2
check_PROGRAMS += test-gc-md2
-test_gc_md2_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_md2_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-md4-tests b/modules/crypto/gc-md4-tests
index 0b32e7e52f..9d9b4aa610 100644
--- a/modules/crypto/gc-md4-tests
+++ b/modules/crypto/gc-md4-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-md4
check_PROGRAMS += test-gc-md4
-test_gc_md4_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_md4_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-md5-tests b/modules/crypto/gc-md5-tests
index 4e4b8f8023..c4f0cd9ab7 100644
--- a/modules/crypto/gc-md5-tests
+++ b/modules/crypto/gc-md5-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-md5
check_PROGRAMS += test-gc-md5
-test_gc_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_md5_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-pbkdf2-sha1-tests b/modules/crypto/gc-pbkdf2-sha1-tests
index b1d73c785e..51996c0949 100644
--- a/modules/crypto/gc-pbkdf2-sha1-tests
+++ b/modules/crypto/gc-pbkdf2-sha1-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-pbkdf2-sha1
check_PROGRAMS += test-gc-pbkdf2-sha1
-test_gc_pbkdf2_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_pbkdf2_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-pbkdf2-tests b/modules/crypto/gc-pbkdf2-tests
index f5eac92289..f2dbb5db45 100644
--- a/modules/crypto/gc-pbkdf2-tests
+++ b/modules/crypto/gc-pbkdf2-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-pbkdf2
check_PROGRAMS += test-gc-pbkdf2
-test_gc_pbkdf2_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_pbkdf2_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-random b/modules/crypto/gc-random
index 0e1bd76e4e..8d635fcae4 100644
--- a/modules/crypto/gc-random
+++ b/modules/crypto/gc-random
@@ -16,7 +16,7 @@ Include:
"gc.h"
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
License:
LGPLv2+
diff --git a/modules/crypto/gc-rijndael-tests b/modules/crypto/gc-rijndael-tests
index 7c87920df6..a6ad2f8ae4 100644
--- a/modules/crypto/gc-rijndael-tests
+++ b/modules/crypto/gc-rijndael-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-rijndael
check_PROGRAMS += test-gc-rijndael
-test_gc_rijndael_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_rijndael_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-sha1-tests b/modules/crypto/gc-sha1-tests
index afa1ba2f35..c19cffa1f3 100644
--- a/modules/crypto/gc-sha1-tests
+++ b/modules/crypto/gc-sha1-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-sha1
check_PROGRAMS += test-gc-sha1
-test_gc_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_sha1_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-sha256-tests b/modules/crypto/gc-sha256-tests
index 13c55c5930..eb049c8852 100644
--- a/modules/crypto/gc-sha256-tests
+++ b/modules/crypto/gc-sha256-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-sha256
check_PROGRAMS += test-gc-sha256
-test_gc_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_sha256_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-sha512-tests b/modules/crypto/gc-sha512-tests
index 22cb3bab4c..0e650235d9 100644
--- a/modules/crypto/gc-sha512-tests
+++ b/modules/crypto/gc-sha512-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-sha512
check_PROGRAMS += test-gc-sha512
-test_gc_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_sha512_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-sm3-tests b/modules/crypto/gc-sm3-tests
index f64322a6d9..5afdcac1ae 100644
--- a/modules/crypto/gc-sm3-tests
+++ b/modules/crypto/gc-sm3-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc-sm3
check_PROGRAMS += test-gc-sm3
-test_gc_sm3_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_sm3_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/crypto/gc-tests b/modules/crypto/gc-tests
index 5a16ba3b3b..c137ed0543 100644
--- a/modules/crypto/gc-tests
+++ b/modules/crypto/gc-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-gc
check_PROGRAMS += test-gc
-test_gc_LDADD = $(LDADD) @LIB_CRYPTO@ $(LIB_GETRANDOM)
+test_gc_LDADD = $(LDADD) @LIB_CRYPTO@ $(GETRANDOM_LIB)
diff --git a/modules/getentropy b/modules/getentropy
index 0088b8b8e1..2f4bcf054c 100644
--- a/modules/getentropy
+++ b/modules/getentropy
@@ -24,7 +24,7 @@ Include:
<unistd.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
License:
LGPL
diff --git a/modules/getentropy-tests b/modules/getentropy-tests
index 7ad786109c..f384698d80 100644
--- a/modules/getentropy-tests
+++ b/modules/getentropy-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-getentropy
check_PROGRAMS += test-getentropy
-test_getentropy_LDADD = $(LDADD) $(LIB_GETRANDOM)
+test_getentropy_LDADD = $(LDADD) $(GETRANDOM_LIB)
diff --git a/modules/getrandom b/modules/getrandom
index fa468ed7f3..a8b14781d0 100644
--- a/modules/getrandom
+++ b/modules/getrandom
@@ -28,7 +28,7 @@ Include:
<sys/random.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
License:
LGPLv2+
diff --git a/modules/getrandom-tests b/modules/getrandom-tests
index b7f64dd205..1f9c67b884 100644
--- a/modules/getrandom-tests
+++ b/modules/getrandom-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-getrandom
check_PROGRAMS += test-getrandom
-test_getrandom_LDADD = $(LDADD) @LIB_GETRANDOM@
+test_getrandom_LDADD = $(LDADD) @GETRANDOM_LIB@
diff --git a/modules/getumask b/modules/getumask
index 4e8b843ed2..5e6cc2f211 100644
--- a/modules/getumask
+++ b/modules/getumask
@@ -30,7 +30,7 @@ Include:
<sys/stat.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
$(LIBTHREAD)
diff --git a/modules/getumask-tests b/modules/getumask-tests
index 455ef0ff6b..ce506e075f 100644
--- a/modules/getumask-tests
+++ b/modules/getumask-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-getumask
check_PROGRAMS += test-getumask
-test_getumask_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD)
+test_getumask_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD)
diff --git a/modules/javacomp b/modules/javacomp
index 838aa2b633..bd0a1ebf09 100644
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -43,7 +43,7 @@ Include:
Link:
$(LIB_MBRTOWC)
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/mkdtemp b/modules/mkdtemp
index 63a62c3f54..5f65e45a6b 100644
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -27,7 +27,7 @@ Include:
<stdlib.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/mkostemp b/modules/mkostemp
index a77f5b7538..467fb109ae 100644
--- a/modules/mkostemp
+++ b/modules/mkostemp
@@ -30,7 +30,7 @@ Include:
<stdlib.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/mkostemps b/modules/mkostemps
index 051ca8368f..92ef9ea29e 100644
--- a/modules/mkostemps
+++ b/modules/mkostemps
@@ -27,7 +27,7 @@ Include:
<stdlib.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/mkstemp b/modules/mkstemp
index 22de2c4e99..523c7b8d11 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -29,7 +29,7 @@ Include:
<stdlib.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/mkstemps b/modules/mkstemps
index 6ae3beeecf..4cb0f52315 100644
--- a/modules/mkstemps
+++ b/modules/mkstemps
@@ -26,7 +26,7 @@ Include:
<stdlib.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/stdio-c++-tests b/modules/stdio-c++-tests
index a4e7dd9a11..450a85c6d0 100644
--- a/modules/stdio-c++-tests
+++ b/modules/stdio-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-stdio-c++
check_PROGRAMS += test-stdio-c++
test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc
-test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(LIB_GETRANDOM)
+test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB)
endif
diff --git a/modules/stdlib-c++-tests b/modules/stdlib-c++-tests
index b9de379d08..2672dd5210 100644
--- a/modules/stdlib-c++-tests
+++ b/modules/stdlib-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-stdlib-c++
check_PROGRAMS += test-stdlib-c++
test_stdlib_c___SOURCES = test-stdlib-c++.cc test-stdlib-c++2.cc
-test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIB_GETRANDOM)
+test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(GETLOADAVG_LIBS) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB)
endif
diff --git a/modules/stdlib-safer b/modules/stdlib-safer
index 80414b3207..3a33a2c941 100644
--- a/modules/stdlib-safer
+++ b/modules/stdlib-safer
@@ -21,7 +21,7 @@ Include:
"stdlib-safer.h"
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
License:
GPL
diff --git a/modules/supersede b/modules/supersede
index 64a25e53ad..3118fad426 100644
--- a/modules/supersede
+++ b/modules/supersede
@@ -36,7 +36,7 @@ Include:
Link:
$(LIB_ACL)
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
$(LIBTHREAD)
diff --git a/modules/supersede-tests b/modules/supersede-tests
index 5166736fce..f3a9d777d9 100644
--- a/modules/supersede-tests
+++ b/modules/supersede-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-supersede
check_PROGRAMS += test-supersede
-test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(LIB_GETRANDOM) $(LIBINTL) $(LIBTHREAD)
+test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD)
diff --git a/modules/sys_random-c++-tests b/modules/sys_random-c++-tests
index 5b3c505fd4..3c006edb7e 100644
--- a/modules/sys_random-c++-tests
+++ b/modules/sys_random-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_random-c++
check_PROGRAMS += test-sys_random-c++
test_sys_random_c___SOURCES = test-sys_random-c++.cc
-test_sys_random_c___LDADD = $(LDADD) $(LIB_GETRANDOM)
+test_sys_random_c___LDADD = $(LDADD) $(GETRANDOM_LIB)
endif
diff --git a/modules/sys_stat-c++-tests b/modules/sys_stat-c++-tests
index c12ad60819..2dba0c1ee5 100644
--- a/modules/sys_stat-c++-tests
+++ b/modules/sys_stat-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_stat-c++
check_PROGRAMS += test-sys_stat-c++
test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
-test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) $(LIB_GETRANDOM)
+test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) $(GETRANDOM_LIB)
endif
diff --git a/modules/tempname b/modules/tempname
index 27699a8fe3..292c990dea 100644
--- a/modules/tempname
+++ b/modules/tempname
@@ -32,7 +32,7 @@ Include:
"tempname.h"
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/tempname-tests b/modules/tempname-tests
index 2ff355281e..cadbe08cb0 100644
--- a/modules/tempname-tests
+++ b/modules/tempname-tests
@@ -13,4 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-tempname
check_PROGRAMS += test-tempname
-test_tempname_LDADD = $(LDADD) $(LIB_GETRANDOM) $(CLOCK_TIME_LIB)
+test_tempname_LDADD = $(LDADD) $(GETRANDOM_LIB) $(CLOCK_TIME_LIB)
diff --git a/modules/tmpfile b/modules/tmpfile
index 6a13f830f5..261189c657 100644
--- a/modules/tmpfile
+++ b/modules/tmpfile
@@ -30,7 +30,7 @@ Include:
<stdio.h>
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/tmpfile-safer b/modules/tmpfile-safer
index fc9db9ef7f..07ff47b437 100644
--- a/modules/tmpfile-safer
+++ b/modules/tmpfile-safer
@@ -21,7 +21,7 @@ Include:
"stdio-safer.h"
Link:
-$(LIB_GETRANDOM)
+$(GETRANDOM_LIB)
$(CLOCK_TIME_LIB)
License:
diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests
index 4028a1178a..7a82baa22a 100644
--- a/modules/unistd-c++-tests
+++ b/modules/unistd-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-unistd-c++
check_PROGRAMS += test-unistd-c++
test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(LIB_GETRANDOM)
+test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(GETRANDOM_LIB)
endif
--
2.34.1
[-- Attachment #9: 0008-hard-locale-Rename-LIB_HARD_LOCALE-to-HARD_LOCALE_LI.patch --]
[-- Type: text/x-patch, Size: 2631 bytes --]
From 1a12d0fbfbaed60d41ee794dd45bf837ad15f227 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:42:52 +0100
Subject: [PATCH 08/18] hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB.
* modules/hard-locale (configure.ac): Rename LIB_HARD_LOCALE to
HARD_LOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 8 ++++++++
NEWS | 3 +++
modules/hard-locale | 7 +++++--
modules/hard-locale-tests | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2d968f4f75..50fd1701de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB.
+ * modules/hard-locale (configure.ac): Rename LIB_HARD_LOCALE to
+ HARD_LOCALE_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB.
diff --git a/NEWS b/NEWS
index 5ff7d0816f..913e04dd5f 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 hard-locale Link with $(HARD_LOCALE_LIB) instead of
+ $(LIB_HARD_LOCALE).
+
2023-01-07 getrandom Link with $(GETRANDOM_LIB) instead of
$(LIB_GETRANDOM).
diff --git a/modules/hard-locale b/modules/hard-locale
index df07d4a6ed..2c7846442e 100644
--- a/modules/hard-locale
+++ b/modules/hard-locale
@@ -11,7 +11,10 @@ setlocale-null
configure.ac:
AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
-LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL"
+HARD_LOCALE_LIB="$LIB_SETLOCALE_NULL"
+AC_SUBST([HARD_LOCALE_LIB])
+dnl For backward compatibility.
+LIB_HARD_LOCALE="$HARD_LOCALE_LIB"
AC_SUBST([LIB_HARD_LOCALE])
Makefile.am:
@@ -21,7 +24,7 @@ Include:
"hard-locale.h"
Link:
-$(LIB_HARD_LOCALE)
+$(HARD_LOCALE_LIB)
License:
LGPLv2+
diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests
index 7ed85754e5..90677d996f 100644
--- a/modules/hard-locale-tests
+++ b/modules/hard-locale-tests
@@ -13,7 +13,7 @@ AC_CHECK_FUNCS_ONCE([duplocale])
Makefile.am:
TESTS += test-hard-locale
check_PROGRAMS += test-hard-locale
-test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_HARD_LOCALE@
+test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @HARD_LOCALE_LIB@
# We cannot call this program 'locale', because the C++ compiler on Mac OS X
# would then barf upon '#include <locale>'. So, call it 'current-locale'.
noinst_PROGRAMS += current-locale
--
2.34.1
[-- Attachment #10: 0009-mbrtowc-Rename-LIB_MBRTOWC-to-MBRTOWC_LIB.patch --]
[-- Type: text/x-patch, Size: 54958 bytes --]
From bbdb1e97a4bd8240fd00c7589454ef08fc3b1c17 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 13:59:25 +0100
Subject: [PATCH 09/18] mbrtowc: Rename LIB_MBRTOWC to MBRTOWC_LIB.
* m4/mbrtowc.m4: Rename LIB_MBRTOWC to MBRTOWC_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 2 ++
m4/mbrtowc.m4 | 15 +++++++++------
modules/acl | 2 +-
modules/acl-tests | 6 +++---
modules/argmatch | 2 +-
modules/argmatch-tests | 2 +-
modules/backup-rename | 2 +-
modules/backupfile | 2 +-
modules/c32isalnum-tests | 2 +-
modules/c32isalpha-tests | 2 +-
modules/c32isblank-tests | 2 +-
modules/c32iscntrl-tests | 2 +-
modules/c32isdigit-tests | 2 +-
modules/c32isgraph-tests | 2 +-
modules/c32islower-tests | 2 +-
modules/c32isprint-tests | 2 +-
modules/c32ispunct-tests | 2 +-
modules/c32isspace-tests | 2 +-
modules/c32isupper-tests | 2 +-
modules/c32isxdigit-tests | 2 +-
modules/closein | 2 +-
modules/closein-tests | 2 +-
modules/closeout | 2 +-
modules/copy-file | 2 +-
modules/copy-file-tests | 2 +-
modules/csharpcomp | 2 +-
modules/csharpexec | 2 +-
modules/dfa | 2 +-
modules/dfa-tests | 2 +-
modules/exclude | 2 +-
modules/exclude-tests | 2 +-
modules/fnmatch | 2 +-
modules/fnmatch-gnu | 2 +-
modules/fnmatch-h-c++-tests | 2 +-
modules/fnmatch-tests | 2 +-
modules/glob | 2 +-
modules/glob-h-c++-tests | 2 +-
modules/glob-tests | 2 +-
modules/human | 2 +-
modules/iswdigit-tests | 2 +-
modules/iswxdigit-tests | 2 +-
modules/javacomp | 2 +-
modules/javaexec | 2 +-
modules/javaversion | 2 +-
modules/mbfile | 2 +-
modules/mbiter | 2 +-
modules/mbmemcasecmp | 2 +-
modules/mbmemcasecmp-tests | 2 +-
modules/mbmemcasecoll | 2 +-
modules/mbmemcasecoll-tests | 2 +-
modules/mbrlen | 2 +-
modules/mbrtoc32 | 2 +-
modules/mbrtoc32-tests | 2 +-
modules/mbrtowc | 2 +-
modules/mbrtowc-tests | 2 +-
modules/mbscasecmp | 2 +-
modules/mbscasecmp-tests | 2 +-
modules/mbscasestr | 2 +-
modules/mbscasestr-tests | 8 ++++----
modules/mbschr | 2 +-
modules/mbschr-tests | 2 +-
modules/mbscspn | 2 +-
modules/mbscspn-tests | 2 +-
modules/mbsinit | 2 +-
modules/mbsinit-tests | 2 +-
modules/mbslen | 2 +-
modules/mbsncasecmp | 2 +-
modules/mbsncasecmp-tests | 2 +-
modules/mbsnlen | 2 +-
modules/mbsnrtoc32s | 2 +-
modules/mbsnrtoc32s-tests | 2 +-
modules/mbsnrtowcs | 2 +-
modules/mbsnrtowcs-tests | 2 +-
modules/mbspbrk | 2 +-
modules/mbspbrk-tests | 2 +-
modules/mbspcasecmp | 2 +-
modules/mbspcasecmp-tests | 2 +-
modules/mbsrchr | 2 +-
modules/mbsrchr-tests | 2 +-
modules/mbsrtoc32s | 2 +-
modules/mbsrtoc32s-tests | 2 +-
modules/mbsrtowcs | 2 +-
modules/mbsrtowcs-tests | 2 +-
modules/mbssep | 2 +-
modules/mbsspn | 2 +-
modules/mbsspn-tests | 2 +-
modules/mbsstr | 2 +-
modules/mbsstr-tests | 6 +++---
modules/mbstoc32s | 2 +-
modules/mbstoc32s-tests | 2 +-
modules/mbstok_r | 2 +-
modules/mbswidth | 2 +-
modules/mbuiter | 2 +-
modules/mkdir-p | 2 +-
modules/propername | 2 +-
modules/quote | 2 +-
modules/quotearg | 2 +-
modules/quotearg-simple | 2 +-
modules/quotearg-simple-tests | 2 +-
modules/quotearg-tests | 2 +-
modules/readtokens-tests | 2 +-
modules/regex | 2 +-
modules/regex-quote | 2 +-
modules/regex-quote-tests | 2 +-
modules/regex-tests | 2 +-
modules/rpmatch | 2 +-
modules/sh-quote | 2 +-
modules/sh-quote-tests | 2 +-
modules/sys_stat-c++-tests | 2 +-
modules/system-quote | 2 +-
modules/system-quote-tests | 2 +-
modules/trim | 2 +-
modules/uchar-c++-tests | 2 +-
modules/unistdio/ulc-asnprintf | 2 +-
modules/unistdio/ulc-asnprintf-tests | 2 +-
modules/unistdio/ulc-fprintf | 2 +-
modules/unistdio/ulc-vasnprintf | 2 +-
modules/unistdio/ulc-vasnprintf-tests | 6 +++---
modules/unistdio/ulc-vasprintf | 2 +-
modules/unistdio/ulc-vasprintf-tests | 2 +-
modules/unistdio/ulc-vfprintf | 2 +-
modules/unistdio/ulc-vsnprintf | 2 +-
modules/unistdio/ulc-vsnprintf-tests | 2 +-
modules/unistdio/ulc-vsprintf | 2 +-
modules/unistdio/ulc-vsprintf-tests | 2 +-
modules/xfreopen | 2 +-
modules/xmemcoll | 2 +-
modules/yesno | 2 +-
modules/yesno-tests | 2 +-
130 files changed, 154 insertions(+), 142 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 50fd1701de..93abad736b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ mbrtowc: Rename LIB_MBRTOWC to MBRTOWC_LIB.
+ * m4/mbrtowc.m4: Rename LIB_MBRTOWC to MBRTOWC_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB.
diff --git a/NEWS b/NEWS
index 913e04dd5f..47e30c9bd5 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 mbrtowc Link with $(MBRTOWC_LIB) instead of $(LIB_MBRTOWC).
+
2023-01-07 hard-locale Link with $(HARD_LOCALE_LIB) instead of
$(LIB_HARD_LOCALE).
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index bb39304199..4bf91bec3b 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 38 -*- coding: utf-8 -*-
+# mbrtowc.m4 serial 39 -*- coding: utf-8 -*-
dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -91,20 +91,23 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
fi
if test $REPLACE_MBSTATE_T = 1; then
case "$host_os" in
- mingw*) LIB_MBRTOWC= ;;
+ mingw*) MBRTOWC_LIB= ;;
*)
gl_WEAK_SYMBOLS
case "$gl_cv_have_weak" in
- *yes) LIB_MBRTOWC= ;;
- *) LIB_MBRTOWC="$LIBPTHREAD" ;;
+ *yes) MBRTOWC_LIB= ;;
+ *) MBRTOWC_LIB="$LIBPTHREAD" ;;
esac
;;
esac
else
- LIB_MBRTOWC=
+ MBRTOWC_LIB=
fi
- dnl LIB_MBRTOWC is expected to be '-pthread' or '-lpthread' on AIX
+ dnl MBRTOWC_LIB is expected to be '-pthread' or '-lpthread' on AIX
dnl with gcc or xlc, and empty otherwise.
+ AC_SUBST([MBRTOWC_LIB])
+ dnl For backward compatibility.
+ LIB_MBRTOWC="$MBRTOWC_LIB"
AC_SUBST([LIB_MBRTOWC])
])
diff --git a/modules/acl b/modules/acl
index 1a3a14e6c2..8bcfd99420 100644
--- a/modules/acl
+++ b/modules/acl
@@ -21,7 +21,7 @@ Include:
"acl.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/acl-tests b/modules/acl-tests
index e4173fe9ae..44190b607d 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -25,6 +25,6 @@ TESTS += \
test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh
TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls
-test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIB_MBRTOWC)
-test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIB_MBRTOWC)
-test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIB_MBRTOWC)
+test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
+test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
+test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/argmatch b/modules/argmatch
index bd534f5056..f07012644b 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -27,7 +27,7 @@ Include:
"argmatch.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/argmatch-tests b/modules/argmatch-tests
index 1ede023b8a..2f70d491d2 100644
--- a/modules/argmatch-tests
+++ b/modules/argmatch-tests
@@ -9,5 +9,5 @@ configure.ac:
Makefile.am:
TESTS += test-argmatch
check_PROGRAMS += test-argmatch
-test_argmatch_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_argmatch_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/backup-rename b/modules/backup-rename
index 54a8270a90..6f6ab87a4b 100644
--- a/modules/backup-rename
+++ b/modules/backup-rename
@@ -36,7 +36,7 @@ Include:
"backupfile.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/backupfile b/modules/backupfile
index 804e62d48c..08bf1d2526 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -37,7 +37,7 @@ Include:
"backupfile.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/c32isalnum-tests b/modules/c32isalnum-tests
index 54ef82c0dc..a4fd812259 100644
--- a/modules/c32isalnum-tests
+++ b/modules/c32isalnum-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isalnum
-test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isalpha-tests b/modules/c32isalpha-tests
index 1e4c77bfbc..d5864dac3c 100644
--- a/modules/c32isalpha-tests
+++ b/modules/c32isalpha-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isalpha
-test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isblank-tests b/modules/c32isblank-tests
index 9efdda44c7..0e1a694548 100644
--- a/modules/c32isblank-tests
+++ b/modules/c32isblank-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isblank
-test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32iscntrl-tests b/modules/c32iscntrl-tests
index d927f33f41..dcf26e0f89 100644
--- a/modules/c32iscntrl-tests
+++ b/modules/c32iscntrl-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32iscntrl
-test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isdigit-tests b/modules/c32isdigit-tests
index b300e11ca8..db2e3d4752 100644
--- a/modules/c32isdigit-tests
+++ b/modules/c32isdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isdigit
-test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isgraph-tests b/modules/c32isgraph-tests
index a1badde179..9efa4342c7 100644
--- a/modules/c32isgraph-tests
+++ b/modules/c32isgraph-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isgraph
-test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32islower-tests b/modules/c32islower-tests
index 5a6010fdf5..b8d8fa4ab3 100644
--- a/modules/c32islower-tests
+++ b/modules/c32islower-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32islower
-test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isprint-tests b/modules/c32isprint-tests
index 5c804f244d..17fb0b6fe5 100644
--- a/modules/c32isprint-tests
+++ b/modules/c32isprint-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isprint
-test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32ispunct-tests b/modules/c32ispunct-tests
index 396d1ca4c0..8ab1c6fa52 100644
--- a/modules/c32ispunct-tests
+++ b/modules/c32ispunct-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32ispunct
-test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isspace-tests b/modules/c32isspace-tests
index aef1272a75..a648014e3a 100644
--- a/modules/c32isspace-tests
+++ b/modules/c32isspace-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isspace
-test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isupper-tests b/modules/c32isupper-tests
index beeb3a91ed..1d42997719 100644
--- a/modules/c32isupper-tests
+++ b/modules/c32isupper-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isupper
-test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isxdigit-tests b/modules/c32isxdigit-tests
index b0860405e6..9731b9593c 100644
--- a/modules/c32isxdigit-tests
+++ b/modules/c32isxdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isxdigit
-test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) $(LIBUNISTRING)
+test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/closein b/modules/closein
index f0c1287ba5..b5f3ce332f 100644
--- a/modules/closein
+++ b/modules/closein
@@ -21,7 +21,7 @@ Include:
"closein.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/closein-tests b/modules/closein-tests
index dc288f2ea0..d40156cb6d 100644
--- a/modules/closein-tests
+++ b/modules/closein-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-closein.sh
check_PROGRAMS += test-closein
-test_closein_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_closein_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/closeout b/modules/closeout
index 32fd9236d0..05f17957d9 100644
--- a/modules/closeout
+++ b/modules/closeout
@@ -23,7 +23,7 @@ Include:
"closeout.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/copy-file b/modules/copy-file
index fa4a403af1..dac8bd6358 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -37,7 +37,7 @@ Include:
Link:
$(LIB_ACL)
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index e20191ad24..1c554696f9 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -18,4 +18,4 @@ Makefile.am:
TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh
TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
check_PROGRAMS += test-copy-file
-test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(LIB_MBRTOWC)
+test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/csharpcomp b/modules/csharpcomp
index a880a12d4f..244a802965 100644
--- a/modules/csharpcomp
+++ b/modules/csharpcomp
@@ -28,7 +28,7 @@ Include:
"csharpcomp.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/csharpexec b/modules/csharpexec
index 853ec0b2c1..ee82df8dd9 100644
--- a/modules/csharpexec
+++ b/modules/csharpexec
@@ -28,7 +28,7 @@ Include:
"csharpexec.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/dfa b/modules/dfa
index 4b78ef4870..793352e4f5 100644
--- a/modules/dfa
+++ b/modules/dfa
@@ -38,7 +38,7 @@ Include:
"localeinfo.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/dfa-tests b/modules/dfa-tests
index 878e18d6d8..7d8f05a271 100644
--- a/modules/dfa-tests
+++ b/modules/dfa-tests
@@ -19,4 +19,4 @@ TESTS += \
test-dfa-match.sh
check_PROGRAMS += test-dfa-match-aux
-test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC)
+test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/exclude b/modules/exclude
index bd785cada9..841dd826cd 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -28,7 +28,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/exclude-tests b/modules/exclude-tests
index 762c18ce4b..1c3b0ab673 100644
--- a/modules/exclude-tests
+++ b/modules/exclude-tests
@@ -26,4 +26,4 @@ TESTS += \
test-exclude8.sh
check_PROGRAMS += test-exclude
-test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(LIB_MBRTOWC) $(LIBTHREAD)
+test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBTHREAD)
diff --git a/modules/fnmatch b/modules/fnmatch
index 7de95c565a..8114ecf437 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -47,7 +47,7 @@ Include:
<fnmatch.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/fnmatch-gnu b/modules/fnmatch-gnu
index ed47df2caf..aba4aa71a9 100644
--- a/modules/fnmatch-gnu
+++ b/modules/fnmatch-gnu
@@ -21,7 +21,7 @@ Include:
<fnmatch.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/fnmatch-h-c++-tests b/modules/fnmatch-h-c++-tests
index abae06d998..eedd075d23 100644
--- a/modules/fnmatch-h-c++-tests
+++ b/modules/fnmatch-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-fnmatch-h-c++
check_PROGRAMS += test-fnmatch-h-c++
test_fnmatch_h_c___SOURCES = test-fnmatch-h-c++.cc
-test_fnmatch_h_c___LDADD = $(LDADD) $(LIB_MBRTOWC)
+test_fnmatch_h_c___LDADD = $(LDADD) $(MBRTOWC_LIB)
endif
diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests
index 5fd97c7e4d..b98e0c2e80 100644
--- a/modules/fnmatch-tests
+++ b/modules/fnmatch-tests
@@ -6,4 +6,4 @@ tests/macros.h
Makefile.am:
TESTS += test-fnmatch
check_PROGRAMS += test-fnmatch
-test_fnmatch_LDADD = $(LDADD) $(LIB_MBRTOWC)
+test_fnmatch_LDADD = $(LDADD) $(MBRTOWC_LIB)
diff --git a/modules/glob b/modules/glob
index 4a89521e01..a03834a619 100644
--- a/modules/glob
+++ b/modules/glob
@@ -59,7 +59,7 @@ Include:
<glob.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/glob-h-c++-tests b/modules/glob-h-c++-tests
index ed8a008199..965f53f186 100644
--- a/modules/glob-h-c++-tests
+++ b/modules/glob-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-glob-h-c++
check_PROGRAMS += test-glob-h-c++
test_glob_h_c___SOURCES = test-glob-h-c++.cc
-test_glob_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC)
+test_glob_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(MBRTOWC_LIB)
endif
diff --git a/modules/glob-tests b/modules/glob-tests
index 5054196a23..2abbba3da6 100644
--- a/modules/glob-tests
+++ b/modules/glob-tests
@@ -12,7 +12,7 @@ configure.ac:
Makefile.am:
TESTS += test-glob
check_PROGRAMS += test-glob
-test_glob_LDADD = $(LDADD) $(LIBINTL) $(LIB_MBRTOWC)
+test_glob_LDADD = $(LDADD) $(LIBINTL) $(MBRTOWC_LIB)
MOSTLYCLEANFILES += \
test-glob.tglobfile \
test-glob.tgloblink1 \
diff --git a/modules/human b/modules/human
index 58b1b79ca3..a281fa4bf0 100644
--- a/modules/human
+++ b/modules/human
@@ -27,7 +27,7 @@ Include:
"human.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/iswdigit-tests b/modules/iswdigit-tests
index ca167ebc7c..e524b1bc6d 100644
--- a/modules/iswdigit-tests
+++ b/modules/iswdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-iswdigit
-test_iswdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_iswdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/iswxdigit-tests b/modules/iswxdigit-tests
index 425c51c96c..2897e7da3f 100644
--- a/modules/iswxdigit-tests
+++ b/modules/iswxdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-iswxdigit
-test_iswxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_iswxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/javacomp b/modules/javacomp
index bd0a1ebf09..cdd6473c4e 100644
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -42,7 +42,7 @@ Include:
"javacomp.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(GETRANDOM_LIB)
$(LIBTHREAD)
diff --git a/modules/javaexec b/modules/javaexec
index 8322a4842b..4859e76254 100644
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -29,7 +29,7 @@ Include:
"javaexec.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/javaversion b/modules/javaversion
index ebec3eafb4..e12fe0b2e9 100644
--- a/modules/javaversion
+++ b/modules/javaversion
@@ -26,7 +26,7 @@ Include:
"javaversion.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(LIBTHREAD)
License:
diff --git a/modules/mbfile b/modules/mbfile
index df169979a4..f7a0dc6338 100644
--- a/modules/mbfile
+++ b/modules/mbfile
@@ -26,7 +26,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbiter b/modules/mbiter
index 4b36756c25..42305d62cd 100644
--- a/modules/mbiter
+++ b/modules/mbiter
@@ -26,7 +26,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbmemcasecmp b/modules/mbmemcasecmp
index 79953d79b3..cb290adabb 100644
--- a/modules/mbmemcasecmp
+++ b/modules/mbmemcasecmp
@@ -18,7 +18,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index fea2084612..bf522e8472 100644
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbmemcasecmp
-test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbmemcasecoll b/modules/mbmemcasecoll
index db20df0ee7..7401d310c9 100644
--- a/modules/mbmemcasecoll
+++ b/modules/mbmemcasecoll
@@ -24,7 +24,7 @@ Include:
"mbmemcasecoll.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests
index 5201618048..0fe4d9c725 100644
--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbmemcasecoll
-test_mbmemcasecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbmemcasecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbrlen b/modules/mbrlen
index 420e8895d7..bdb81f4b64 100644
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -29,7 +29,7 @@ Include:
<wchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbrtoc32 b/modules/mbrtoc32
index 4757bcbe02..bc64ac5a33 100644
--- a/modules/mbrtoc32
+++ b/modules/mbrtoc32
@@ -49,7 +49,7 @@ Include:
<uchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbrtoc32-tests b/modules/mbrtoc32-tests
index d4c03f243f..9cb1f96ae8 100644
--- a/modules/mbrtoc32-tests
+++ b/modules/mbrtoc32-tests
@@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbrtoc32 test-mbrtoc32-w32
-test_mbrtoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbrtoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbrtowc b/modules/mbrtowc
index e81da6f350..4fbffab1de 100644
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -53,7 +53,7 @@ Include:
<wchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests
index 6331be01d0..3362aa0d91 100644
--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbrtowc test-mbrtowc-w32
-test_mbrtowc_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbrtowc_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbscasecmp b/modules/mbscasecmp
index b02b28830b..b1f7c0d4a9 100644
--- a/modules/mbscasecmp
+++ b/modules/mbscasecmp
@@ -19,7 +19,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index 7123e521e5..a777571945 100644
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbscasecmp
-test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbscasestr b/modules/mbscasestr
index b636b4802e..2892c2fc2b 100644
--- a/modules/mbscasestr
+++ b/modules/mbscasestr
@@ -24,7 +24,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 556c5903f3..09ebcaee77 100644
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -24,7 +24,7 @@ Makefile.am:
TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
-test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
-test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
-test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
-test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB)
+test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbschr b/modules/mbschr
index 387a67b775..1a68a3c93d 100644
--- a/modules/mbschr
+++ b/modules/mbschr
@@ -19,7 +19,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index e7bccb0192..0d6b44f8ac 100644
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbschr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbschr
-test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbscspn b/modules/mbscspn
index 288e39db49..4b2350c324 100644
--- a/modules/mbscspn
+++ b/modules/mbscspn
@@ -21,7 +21,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index 64253e43fd..054fc61cbc 100644
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbscspn
-test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsinit b/modules/mbsinit
index 1040068223..3146e7afba 100644
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -30,7 +30,7 @@ Include:
<wchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests
index b41fff3330..040ce4e588 100644
--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -17,4 +17,4 @@ Makefile.am:
TESTS += test-mbsinit.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsinit
-test_mbsinit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsinit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbslen b/modules/mbslen
index b4f4851e7f..a643fb8bcb 100644
--- a/modules/mbslen
+++ b/modules/mbslen
@@ -21,7 +21,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp
index 10b887b8f9..25b8624f1b 100644
--- a/modules/mbsncasecmp
+++ b/modules/mbsncasecmp
@@ -19,7 +19,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index 8b3aa79afa..c981e97c39 100644
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsncasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbsncasecmp
-test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsnlen b/modules/mbsnlen
index 3064b57974..2dc0222cfe 100644
--- a/modules/mbsnlen
+++ b/modules/mbsnlen
@@ -19,7 +19,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbsnrtoc32s b/modules/mbsnrtoc32s
index 24a8458f3f..996e8a1d8f 100644
--- a/modules/mbsnrtoc32s
+++ b/modules/mbsnrtoc32s
@@ -27,7 +27,7 @@ Include:
<uchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsnrtoc32s-tests b/modules/mbsnrtoc32s-tests
index 886f7fe878..a06d51c3f7 100644
--- a/modules/mbsnrtoc32s-tests
+++ b/modules/mbsnrtoc32s-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsnrtoc32s
-test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index 760448d02a..5b66cc2b8f 100644
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -34,7 +34,7 @@ Include:
<wchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests
index ce5ae468bb..9dade91a2a 100644
--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsnrtowcs
-test_mbsnrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsnrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbspbrk b/modules/mbspbrk
index 9620e3f0f3..5570a07f1b 100644
--- a/modules/mbspbrk
+++ b/modules/mbspbrk
@@ -21,7 +21,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index a0a66ca8dc..52f56d931e 100644
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspbrk.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbspbrk
-test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp
index da304ce71e..20b53c41a6 100644
--- a/modules/mbspcasecmp
+++ b/modules/mbspcasecmp
@@ -19,7 +19,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index d1ee204d87..d64055eb9f 100644
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspcasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbspcasecmp
-test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsrchr b/modules/mbsrchr
index 9c42a5c163..9b660b8036 100644
--- a/modules/mbsrchr
+++ b/modules/mbsrchr
@@ -19,7 +19,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index 13e29dfc21..cba16a3501 100644
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsrchr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrchr
-test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsrtoc32s b/modules/mbsrtoc32s
index f9d97d7548..0fec6bb042 100644
--- a/modules/mbsrtoc32s
+++ b/modules/mbsrtoc32s
@@ -26,7 +26,7 @@ Include:
<uchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbsrtoc32s-tests b/modules/mbsrtoc32s-tests
index dd1881e380..64eb047f4c 100644
--- a/modules/mbsrtoc32s-tests
+++ b/modules/mbsrtoc32s-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrtoc32s
-test_mbsrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index 15be6c2a60..4b5fa61cf4 100644
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -37,7 +37,7 @@ Include:
<wchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests
index 8073a53a47..b8137484b5 100644
--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrtowcs
-test_mbsrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbssep b/modules/mbssep
index 11c00bf1ca..0a93cf0c7e 100644
--- a/modules/mbssep
+++ b/modules/mbssep
@@ -21,7 +21,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsspn b/modules/mbsspn
index b9144364f6..650c1f4de4 100644
--- a/modules/mbsspn
+++ b/modules/mbsspn
@@ -20,7 +20,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index 9f7904cd4b..12434a3256 100644
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsspn
-test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbsstr b/modules/mbsstr
index 8547e0971e..c417f6bc3f 100644
--- a/modules/mbsstr
+++ b/modules/mbsstr
@@ -24,7 +24,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index 8be507d539..832c09c115 100644
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -20,6 +20,6 @@ Makefile.am:
TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
-test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
-test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
-test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB)
+test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbstoc32s b/modules/mbstoc32s
index e2b166294c..c32a4df683 100644
--- a/modules/mbstoc32s
+++ b/modules/mbstoc32s
@@ -19,7 +19,7 @@ Include:
<uchar.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv2+
diff --git a/modules/mbstoc32s-tests b/modules/mbstoc32s-tests
index 7234daab7c..5ddb287328 100644
--- a/modules/mbstoc32s-tests
+++ b/modules/mbstoc32s-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbstoc32s
-test_mbstoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
+test_mbstoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
diff --git a/modules/mbstok_r b/modules/mbstok_r
index dc0429e7cf..cc420ca196 100644
--- a/modules/mbstok_r
+++ b/modules/mbstok_r
@@ -22,7 +22,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mbswidth b/modules/mbswidth
index 287584d60b..f3fe2ed21b 100644
--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -27,7 +27,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/mbuiter b/modules/mbuiter
index 25d1d9fc78..b9e41031d5 100644
--- a/modules/mbuiter
+++ b/modules/mbuiter
@@ -27,7 +27,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPL
diff --git a/modules/mkdir-p b/modules/mkdir-p
index a9df81aed8..ca13e0b6ff 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -34,7 +34,7 @@ Include:
"mkdir-p.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/propername b/modules/propername
index fb1e78a9b2..2a63a0eaf0 100644
--- a/modules/propername
+++ b/modules/propername
@@ -31,7 +31,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/quote b/modules/quote
index 35c30ce539..d9533a2de7 100644
--- a/modules/quote
+++ b/modules/quote
@@ -17,7 +17,7 @@ Include:
"quote.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/quotearg b/modules/quotearg
index 6f5356dcc6..db0903fa97 100644
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -36,7 +36,7 @@ Include:
"quotearg.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/quotearg-simple b/modules/quotearg-simple
index 6a5c89296d..240192329a 100644
--- a/modules/quotearg-simple
+++ b/modules/quotearg-simple
@@ -13,7 +13,7 @@ Makefile.am:
Include:
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/quotearg-simple-tests b/modules/quotearg-simple-tests
index dbbd94e712..7f2f03f345 100644
--- a/modules/quotearg-simple-tests
+++ b/modules/quotearg-simple-tests
@@ -19,4 +19,4 @@ AC_CHECK_FUNCS_ONCE([mprotect])
Makefile.am:
TESTS += test-quotearg-simple
check_PROGRAMS += test-quotearg-simple
-test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index dc94b34afa..176b317785 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
host_os='@host_os@'
check_PROGRAMS += test-quotearg
-test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(LIB_MBRTOWC)
+test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/readtokens-tests b/modules/readtokens-tests
index 9e4c0606b9..1637125569 100644
--- a/modules/readtokens-tests
+++ b/modules/readtokens-tests
@@ -11,4 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-readtokens.sh
check_PROGRAMS += test-readtokens
-test_readtokens_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_readtokens_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/regex b/modules/regex
index 7779a1e796..dfe0c2918e 100644
--- a/modules/regex
+++ b/modules/regex
@@ -58,7 +58,7 @@ Include:
<regex.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(LIBTHREAD)
$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
diff --git a/modules/regex-quote b/modules/regex-quote
index 9ffa6aec60..43ddc49707 100644
--- a/modules/regex-quote
+++ b/modules/regex-quote
@@ -21,7 +21,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/regex-quote-tests b/modules/regex-quote-tests
index 64e4460d1d..85739b57e9 100644
--- a/modules/regex-quote-tests
+++ b/modules/regex-quote-tests
@@ -11,4 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-regex-quote
check_PROGRAMS += test-regex-quote
-test_regex_quote_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_MBRTOWC) $(LIBTHREAD)
+test_regex_quote_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(MBRTOWC_LIB) $(LIBTHREAD)
diff --git a/modules/regex-tests b/modules/regex-tests
index 4b14f4724c..6475707509 100644
--- a/modules/regex-tests
+++ b/modules/regex-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-regex
check_PROGRAMS += test-regex
-test_regex_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) @LIBINTL@ $(LIBTHREAD)
+test_regex_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/rpmatch b/modules/rpmatch
index 7f8d9910ab..c11296b985 100644
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -30,7 +30,7 @@ Include:
<stdlib.h>
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
License:
diff --git a/modules/sh-quote b/modules/sh-quote
index 97378f8bb5..c3e23dc878 100644
--- a/modules/sh-quote
+++ b/modules/sh-quote
@@ -19,7 +19,7 @@ Include:
"sh-quote.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/sh-quote-tests b/modules/sh-quote-tests
index 2ac9722945..1bded043f2 100644
--- a/modules/sh-quote-tests
+++ b/modules/sh-quote-tests
@@ -8,4 +8,4 @@ configure.ac:
Makefile.am:
TESTS += test-sh-quote
check_PROGRAMS += test-sh-quote
-test_sh_quote_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_sh_quote_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/sys_stat-c++-tests b/modules/sys_stat-c++-tests
index 2dba0c1ee5..f5b3f28c90 100644
--- a/modules/sys_stat-c++-tests
+++ b/modules/sys_stat-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_stat-c++
check_PROGRAMS += test-sys_stat-c++
test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
-test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(LIB_MBRTOWC) $(GETRANDOM_LIB)
+test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(MBRTOWC_LIB) $(GETRANDOM_LIB)
endif
diff --git a/modules/system-quote b/modules/system-quote
index b704684dfb..b1c860261b 100644
--- a/modules/system-quote
+++ b/modules/system-quote
@@ -20,7 +20,7 @@ Include:
"system-quote.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/system-quote-tests b/modules/system-quote-tests
index 22f08389f6..e5850614f5 100644
--- a/modules/system-quote-tests
+++ b/modules/system-quote-tests
@@ -18,7 +18,7 @@ configure.ac:
Makefile.am:
TESTS += test-system-quote.sh
check_PROGRAMS += test-system-quote-main test-system-quote-child
-test_system_quote_main_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_system_quote_main_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
# The test-system-quote-child program must be a real executable, not a libtool
# wrapper script, and should link against as few libraries as possible.
# Therefore don't link it against any libraries other than -lc.
diff --git a/modules/trim b/modules/trim
index 23df06cd74..a4483c2f65 100644
--- a/modules/trim
+++ b/modules/trim
@@ -22,7 +22,7 @@ Include:
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/uchar-c++-tests b/modules/uchar-c++-tests
index 7e63bb9fce..12183abd52 100644
--- a/modules/uchar-c++-tests
+++ b/modules/uchar-c++-tests
@@ -39,5 +39,5 @@ test_uchar_c___SOURCES = test-uchar-c++.cc
if CXX_HAVE_CUCHAR
test_uchar_c___SOURCES += test-uchar-c++2.cc
endif
-test_uchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
+test_uchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB)
endif
diff --git a/modules/unistdio/ulc-asnprintf b/modules/unistdio/ulc-asnprintf
index 500609dcb7..457640fe0f 100644
--- a/modules/unistdio/ulc-asnprintf
+++ b/modules/unistdio/ulc-asnprintf
@@ -22,7 +22,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-asnprintf-tests b/modules/unistdio/ulc-asnprintf-tests
index 16699cde32..99a5851624 100644
--- a/modules/unistdio/ulc-asnprintf-tests
+++ b/modules/unistdio/ulc-asnprintf-tests
@@ -12,4 +12,4 @@ Makefile.am:
TESTS += test-ulc-asnprintf1
check_PROGRAMS += test-ulc-asnprintf1
test_ulc_asnprintf1_SOURCES = unistdio/test-ulc-asnprintf1.c
-test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
diff --git a/modules/unistdio/ulc-fprintf b/modules/unistdio/ulc-fprintf
index 1747f2603f..fe0d16af38 100644
--- a/modules/unistdio/ulc-fprintf
+++ b/modules/unistdio/ulc-fprintf
@@ -22,7 +22,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf
index 61107fe13a..7f7614d8ac 100644
--- a/modules/unistdio/ulc-vasnprintf
+++ b/modules/unistdio/ulc-vasnprintf
@@ -60,7 +60,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests
index 55e55ce84d..6a5155dcf4 100644
--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -22,8 +22,8 @@ TESTS += test-ulc-vasnprintf1 unistdio/test-ulc-vasnprintf2.sh unistdio/test-ulc
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-ulc-vasnprintf1 test-ulc-vasnprintf2 test-ulc-vasnprintf3
test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c
-test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
test_ulc_vasnprintf2_SOURCES = unistdio/test-ulc-vasnprintf2.c
-test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
test_ulc_vasnprintf3_SOURCES = unistdio/test-ulc-vasnprintf3.c
-test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
diff --git a/modules/unistdio/ulc-vasprintf b/modules/unistdio/ulc-vasprintf
index 0a57c73d2b..f7b34748cb 100644
--- a/modules/unistdio/ulc-vasprintf
+++ b/modules/unistdio/ulc-vasprintf
@@ -22,7 +22,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-vasprintf-tests b/modules/unistdio/ulc-vasprintf-tests
index abbdfc54b0..ccec1aee8a 100644
--- a/modules/unistdio/ulc-vasprintf-tests
+++ b/modules/unistdio/ulc-vasprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
TESTS += test-ulc-vasprintf1
check_PROGRAMS += test-ulc-vasprintf1
test_ulc_vasprintf1_SOURCES = unistdio/test-ulc-vasprintf1.c
-test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
diff --git a/modules/unistdio/ulc-vfprintf b/modules/unistdio/ulc-vfprintf
index 83d0d241bd..bd3ce11d7c 100644
--- a/modules/unistdio/ulc-vfprintf
+++ b/modules/unistdio/ulc-vfprintf
@@ -22,7 +22,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-vsnprintf b/modules/unistdio/ulc-vsnprintf
index 5d93157844..ec4a449587 100644
--- a/modules/unistdio/ulc-vsnprintf
+++ b/modules/unistdio/ulc-vsnprintf
@@ -22,7 +22,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-vsnprintf-tests b/modules/unistdio/ulc-vsnprintf-tests
index 735a111cfd..c9acc634c9 100644
--- a/modules/unistdio/ulc-vsnprintf-tests
+++ b/modules/unistdio/ulc-vsnprintf-tests
@@ -12,4 +12,4 @@ Makefile.am:
TESTS += test-ulc-vsnprintf1
check_PROGRAMS += test-ulc-vsnprintf1
test_ulc_vsnprintf1_SOURCES = unistdio/test-ulc-vsnprintf1.c
-test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(MBRTOWC_LIB)
diff --git a/modules/unistdio/ulc-vsprintf b/modules/unistdio/ulc-vsprintf
index 0b5c424167..45896d7413 100644
--- a/modules/unistdio/ulc-vsprintf
+++ b/modules/unistdio/ulc-vsprintf
@@ -23,7 +23,7 @@ Include:
"unistdio.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
LGPLv3+ or GPLv2+
diff --git a/modules/unistdio/ulc-vsprintf-tests b/modules/unistdio/ulc-vsprintf-tests
index 98a6a6ce06..8d3f52e933 100644
--- a/modules/unistdio/ulc-vsprintf-tests
+++ b/modules/unistdio/ulc-vsprintf-tests
@@ -12,4 +12,4 @@ Makefile.am:
TESTS += test-ulc-vsprintf1
check_PROGRAMS += test-ulc-vsprintf1
test_ulc_vsprintf1_SOURCES = unistdio/test-ulc-vsprintf1.c
-test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(LIB_MBRTOWC)
+test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(MBRTOWC_LIB)
diff --git a/modules/xfreopen b/modules/xfreopen
index b71efde111..a88d237b79 100644
--- a/modules/xfreopen
+++ b/modules/xfreopen
@@ -20,7 +20,7 @@ Include:
"xfreopen.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/xmemcoll b/modules/xmemcoll
index 3ef5491081..2ce12cc208 100644
--- a/modules/xmemcoll
+++ b/modules/xmemcoll
@@ -22,7 +22,7 @@ Include:
"xmemcoll.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/yesno b/modules/yesno
index 7a45e0f8bb..28e6ea17a6 100644
--- a/modules/yesno
+++ b/modules/yesno
@@ -22,7 +22,7 @@ Include:
"yesno.h"
Link:
-$(LIB_MBRTOWC)
+$(MBRTOWC_LIB)
License:
GPL
diff --git a/modules/yesno-tests b/modules/yesno-tests
index 45f429fe9c..f66e068e00 100644
--- a/modules/yesno-tests
+++ b/modules/yesno-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-yesno.sh
check_PROGRAMS += test-yesno
-test_yesno_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC)
+test_yesno_LDADD = $(LDADD) @LIBINTL@ $(MBRTOWC_LIB)
--
2.34.1
[-- Attachment #11: 0010-nanosleep-Rename-LIB_NANOSLEEP-to-NANOSLEEP_LIB.patch --]
[-- Type: text/x-patch, Size: 14853 bytes --]
From a6c3c4defc6ec8c31fded6b5b5e68bafd47ace45 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:25:47 +0100
Subject: [PATCH 10/18] nanosleep: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
* m4/nanosleep.m4: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/nanosleep.m4 | 12 ++++++++----
modules/chown-tests | 2 +-
modules/dirent-c++-tests | 2 +-
modules/fchownat-tests | 2 +-
modules/fdutimensat-tests | 2 +-
modules/futimens-tests | 2 +-
modules/iconv-h-c++-tests | 2 +-
modules/lchown-tests | 2 +-
modules/nanosleep | 2 +-
modules/nanosleep-tests | 2 +-
modules/nl_langinfo-tests | 2 +-
modules/search-c++-tests | 2 +-
modules/setlocale-null-tests | 4 ++--
modules/signal-h-c++-tests | 2 +-
modules/spawn-c++-tests | 2 +-
modules/stat-time-tests | 2 +-
modules/stdio-c++-tests | 2 +-
modules/sys_select-c++-tests | 2 +-
modules/sys_socket-c++-tests | 2 +-
modules/sys_time-c++-tests | 2 +-
modules/time-c++-tests | 2 +-
modules/utime-tests | 2 +-
modules/utimens-tests | 2 +-
modules/utimensat-tests | 2 +-
modules/wchar-c++-tests | 2 +-
modules/wctype-h-c++-tests | 2 +-
modules/xnanosleep | 2 +-
29 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 93abad736b..521cf5e580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ nanosleep: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
+ * m4/nanosleep.m4: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
mbrtowc: Rename LIB_MBRTOWC to MBRTOWC_LIB.
diff --git a/NEWS b/NEWS
index 47e30c9bd5..7ca0afacf1 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 nanosleep Link with $(NANOSLEEP_LIB) instead of
+ $(LIB_NANOSLEEP).
+
2023-01-07 mbrtowc Link with $(MBRTOWC_LIB) instead of $(LIB_MBRTOWC).
2023-01-07 hard-locale Link with $(HARD_LOCALE_LIB) instead of
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 21ee5a21da..e21a3e343c 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-# serial 42
+# serial 43
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -25,11 +25,11 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
# Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
# Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
- LIB_NANOSLEEP=
- AC_SUBST([LIB_NANOSLEEP])
+ NANOSLEEP_LIB=
+ AC_SUBST([NANOSLEEP_LIB])
AC_SEARCH_LIBS([nanosleep], [rt posix4],
[test "$ac_cv_search_nanosleep" = "none required" ||
- LIB_NANOSLEEP=$ac_cv_search_nanosleep])
+ NANOSLEEP_LIB=$ac_cv_search_nanosleep])
if test "x$ac_cv_search_nanosleep" != xno; then
dnl The system has a nanosleep function.
@@ -143,4 +143,8 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
HAVE_NANOSLEEP=0
fi
LIBS=$nanosleep_save_libs
+
+ # For backward compatibility.
+ LIB_NANOSLEEP="$NANOSLEEP_LIB"
+ AC_SUBST([LIB_NANOSLEEP])
])
diff --git a/modules/chown-tests b/modules/chown-tests
index 1bd6744067..1fa6e44bc7 100644
--- a/modules/chown-tests
+++ b/modules/chown-tests
@@ -21,4 +21,4 @@ AC_CHECK_FUNCS_ONCE([getegid])
Makefile.am:
TESTS += test-chown
check_PROGRAMS += test-chown
-test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
diff --git a/modules/dirent-c++-tests b/modules/dirent-c++-tests
index 8b60ee9395..a777848334 100644
--- a/modules/dirent-c++-tests
+++ b/modules/dirent-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-dirent-c++
check_PROGRAMS += test-dirent-c++
test_dirent_c___SOURCES = test-dirent-c++.cc
-test_dirent_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+test_dirent_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
endif
diff --git a/modules/fchownat-tests b/modules/fchownat-tests
index f0e4cea78c..f498efaf66 100644
--- a/modules/fchownat-tests
+++ b/modules/fchownat-tests
@@ -22,4 +22,4 @@ AC_CHECK_FUNCS_ONCE([getegid])
Makefile.am:
TESTS += test-fchownat
check_PROGRAMS += test-fchownat
-test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
+test_fchownat_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@
diff --git a/modules/fdutimensat-tests b/modules/fdutimensat-tests
index e34ef6233b..c2f0d59f3d 100644
--- a/modules/fdutimensat-tests
+++ b/modules/fdutimensat-tests
@@ -23,4 +23,4 @@ Makefile.am:
TESTS += test-fdutimensat
check_PROGRAMS += test-fdutimensat
test_fdutimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) \
- $(LIB_NANOSLEEP) @LIBINTL@
+ $(NANOSLEEP_LIB) @LIBINTL@
diff --git a/modules/futimens-tests b/modules/futimens-tests
index 9b82da1450..c6f62d9d3c 100644
--- a/modules/futimens-tests
+++ b/modules/futimens-tests
@@ -21,4 +21,4 @@ configure.ac:
Makefile.am:
TESTS += test-futimens
check_PROGRAMS += test-futimens
-test_futimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
+test_futimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
diff --git a/modules/iconv-h-c++-tests b/modules/iconv-h-c++-tests
index cc41b11fc4..c7827da0c5 100644
--- a/modules/iconv-h-c++-tests
+++ b/modules/iconv-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-iconv-h-c++
check_PROGRAMS += test-iconv-h-c++
test_iconv_h_c___SOURCES = test-iconv-h-c++.cc
-test_iconv_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBICONV) $(LIB_NANOSLEEP)
+test_iconv_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBICONV) $(NANOSLEEP_LIB)
endif
diff --git a/modules/lchown-tests b/modules/lchown-tests
index edd0cc7c21..10119f22eb 100644
--- a/modules/lchown-tests
+++ b/modules/lchown-tests
@@ -21,4 +21,4 @@ AC_CHECK_FUNCS_ONCE([getegid])
Makefile.am:
TESTS += test-lchown
check_PROGRAMS += test-lchown
-test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
diff --git a/modules/nanosleep b/modules/nanosleep
index d0855460cd..8fa659b752 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -30,7 +30,7 @@ Include:
<time.h>
Link:
-$(LIB_NANOSLEEP)
+$(NANOSLEEP_LIB)
License:
LGPLv2+
diff --git a/modules/nanosleep-tests b/modules/nanosleep-tests
index c3b5f2f866..244dd81ef5 100644
--- a/modules/nanosleep-tests
+++ b/modules/nanosleep-tests
@@ -11,4 +11,4 @@ AC_CHECK_DECLS_ONCE([alarm])
Makefile.am:
TESTS += test-nanosleep
check_PROGRAMS += test-nanosleep
-test_nanosleep_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+test_nanosleep_LDADD = $(LDADD) $(NANOSLEEP_LIB)
diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests
index 9bf1510286..811112ff0f 100644
--- a/modules/nl_langinfo-tests
+++ b/modules/nl_langinfo-tests
@@ -21,4 +21,4 @@ TESTS += test-nl_langinfo.sh test-nl_langinfo-mt
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-nl_langinfo test-nl_langinfo-mt
test_nl_langinfo_LDADD = $(LDADD) $(LIB_SETLOCALE)
-test_nl_langinfo_mt_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBMULTITHREAD) $(LIB_NANOSLEEP)
+test_nl_langinfo_mt_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
diff --git a/modules/search-c++-tests b/modules/search-c++-tests
index f051eaf715..b1e3f4b2f3 100644
--- a/modules/search-c++-tests
+++ b/modules/search-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-search-c++
check_PROGRAMS += test-search-c++
test_search_c___SOURCES = test-search-c++.cc
-test_search_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+test_search_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
endif
diff --git a/modules/setlocale-null-tests b/modules/setlocale-null-tests
index f794711e39..8f8b835f5a 100644
--- a/modules/setlocale-null-tests
+++ b/modules/setlocale-null-tests
@@ -19,5 +19,5 @@ check_PROGRAMS += \
test-setlocale_null-mt-one \
test-setlocale_null-mt-all
test_setlocale_null_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@
-test_setlocale_null_mt_one_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(LIB_NANOSLEEP)
-test_setlocale_null_mt_all_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(LIB_NANOSLEEP)
+test_setlocale_null_mt_one_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
+test_setlocale_null_mt_all_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
diff --git a/modules/signal-h-c++-tests b/modules/signal-h-c++-tests
index c7b23713c6..a3d9a40076 100644
--- a/modules/signal-h-c++-tests
+++ b/modules/signal-h-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-signal-h-c++
check_PROGRAMS += test-signal-h-c++
test_signal_h_c___SOURCES = test-signal-h-c++.cc test-signal-h-c++2.cc
-test_signal_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_PTHREAD_SIGMASK)
+test_signal_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(LIB_PTHREAD_SIGMASK)
endif
diff --git a/modules/spawn-c++-tests b/modules/spawn-c++-tests
index e685cacf6b..1ee64043bb 100644
--- a/modules/spawn-c++-tests
+++ b/modules/spawn-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-spawn-c++
check_PROGRAMS += test-spawn-c++
test_spawn_c___SOURCES = test-spawn-c++.cc
-test_spawn_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+test_spawn_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
endif
diff --git a/modules/stat-time-tests b/modules/stat-time-tests
index 9fafb9fb9a..aa4e31c35c 100644
--- a/modules/stat-time-tests
+++ b/modules/stat-time-tests
@@ -14,4 +14,4 @@ configure.ac:
Makefile.am:
TESTS += test-stat-time
check_PROGRAMS += test-stat-time
-test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+test_stat_time_LDADD = $(LDADD) $(NANOSLEEP_LIB)
diff --git a/modules/stdio-c++-tests b/modules/stdio-c++-tests
index 450a85c6d0..f13f22b8da 100644
--- a/modules/stdio-c++-tests
+++ b/modules/stdio-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-stdio-c++
check_PROGRAMS += test-stdio-c++
test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc
-test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB)
+test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN) $(GETRANDOM_LIB)
endif
diff --git a/modules/sys_select-c++-tests b/modules/sys_select-c++-tests
index e9f0b25d28..e9d0417577 100644
--- a/modules/sys_select-c++-tests
+++ b/modules/sys_select-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_select-c++
check_PROGRAMS += test-sys_select-c++
test_sys_select_c___SOURCES = test-sys_select-c++.cc
-test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_SELECT) $(LIB_NANOSLEEP)
+test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_SELECT) $(NANOSLEEP_LIB)
endif
diff --git a/modules/sys_socket-c++-tests b/modules/sys_socket-c++-tests
index d2ecd2e8cb..0d7a63a8ef 100644
--- a/modules/sys_socket-c++-tests
+++ b/modules/sys_socket-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_socket-c++
check_PROGRAMS += test-sys_socket-c++
test_sys_socket_c___SOURCES = test-sys_socket-c++.cc
-test_sys_socket_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_NANOSLEEP)
+test_sys_socket_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(NANOSLEEP_LIB)
endif
diff --git a/modules/sys_time-c++-tests b/modules/sys_time-c++-tests
index 90803efd08..6cb9df826f 100644
--- a/modules/sys_time-c++-tests
+++ b/modules/sys_time-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_time-c++
check_PROGRAMS += test-sys_time-c++
test_sys_time_c___SOURCES = test-sys_time-c++.cc
-test_sys_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+test_sys_time_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
endif
diff --git a/modules/time-c++-tests b/modules/time-c++-tests
index 520e86e5c1..7a22d92cdc 100644
--- a/modules/time-c++-tests
+++ b/modules/time-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-time-c++
check_PROGRAMS += test-time-c++
test_time_c___SOURCES = test-time-c++.cc test-time-c++2.cc
-test_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(CLOCK_TIME_LIB)
+test_time_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(CLOCK_TIME_LIB)
endif
diff --git a/modules/utime-tests b/modules/utime-tests
index b7464cdb1f..146180e04b 100644
--- a/modules/utime-tests
+++ b/modules/utime-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-utime
check_PROGRAMS += test-utime
-test_utime_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
+test_utime_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
diff --git a/modules/utimens-tests b/modules/utimens-tests
index 9aee72e517..381139c8dd 100644
--- a/modules/utimens-tests
+++ b/modules/utimens-tests
@@ -22,4 +22,4 @@ configure.ac:
Makefile.am:
TESTS += test-utimens
check_PROGRAMS += test-utimens
-test_utimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
+test_utimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
diff --git a/modules/utimensat-tests b/modules/utimensat-tests
index 85d64d640d..0ba5e09e02 100644
--- a/modules/utimensat-tests
+++ b/modules/utimensat-tests
@@ -19,4 +19,4 @@ configure.ac:
Makefile.am:
TESTS += test-utimensat
check_PROGRAMS += test-utimensat
-test_utimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(LIB_NANOSLEEP) @LIBINTL@
+test_utimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
diff --git a/modules/wchar-c++-tests b/modules/wchar-c++-tests
index d0852b42b6..f355de00be 100644
--- a/modules/wchar-c++-tests
+++ b/modules/wchar-c++-tests
@@ -17,5 +17,5 @@ if ANSICXX
TESTS += test-wchar-c++
check_PROGRAMS += test-wchar-c++
test_wchar_c___SOURCES = test-wchar-c++.cc test-wchar-c++2.cc test-wchar-c++3.cc
-test_wchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN) $(LIBTHREAD)
+test_wchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN) $(LIBTHREAD)
endif
diff --git a/modules/wctype-h-c++-tests b/modules/wctype-h-c++-tests
index ce869becf4..d8ed1caefe 100644
--- a/modules/wctype-h-c++-tests
+++ b/modules/wctype-h-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-wctype-h-c++
check_PROGRAMS += test-wctype-h-c++
test_wctype_h_c___SOURCES = test-wctype-h-c++.cc test-wctype-h-c++2.cc
-test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(EUIDACCESS_LIBGEN)
+test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(EUIDACCESS_LIBGEN)
endif
diff --git a/modules/xnanosleep b/modules/xnanosleep
index 039c6d156d..034eab9f2d 100644
--- a/modules/xnanosleep
+++ b/modules/xnanosleep
@@ -24,7 +24,7 @@ Include:
"xnanosleep.h"
Link:
-$(LIB_NANOSLEEP)
+$(NANOSLEEP_LIB)
License:
GPL
--
2.34.1
[-- Attachment #12: 0011-poll-Rename-LIB_POLL-to-POLL_LIB.patch --]
[-- Type: text/x-patch, Size: 3242 bytes --]
From c356b3955940a6d556af44b1ff7dbd884a2a1435 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:28:33 +0100
Subject: [PATCH 11/18] poll: Rename LIB_POLL to POLL_LIB.
* m4/poll.m4: Rename LIB_POLL to POLL_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 2 ++
m4/poll.m4 | 9 ++++++---
modules/poll | 2 +-
modules/poll-h-c++-tests | 2 +-
modules/poll-tests | 2 +-
6 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 521cf5e580..edfd93d690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ poll: Rename LIB_POLL to POLL_LIB.
+ * m4/poll.m4: Rename LIB_POLL to POLL_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
nanosleep: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
diff --git a/NEWS b/NEWS
index 7ca0afacf1..894a52404c 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 poll Link with $(POLL_LIB) instead of $(LIB_POLL).
+
2023-01-07 nanosleep Link with $(NANOSLEEP_LIB) instead of
$(LIB_NANOSLEEP).
diff --git a/m4/poll.m4 b/m4/poll.m4
index 3039a603e7..cfadbf24fd 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 20
+# poll.m4 serial 21
dnl Copyright (c) 2003, 2005-2007, 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -76,7 +76,7 @@ This is MacOSX or AIX
fi
dnl Determine the needed libraries.
- LIB_POLL="$LIBSOCKET"
+ POLL_LIB="$LIBSOCKET"
if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
case "$host_os" in
mingw*)
@@ -94,10 +94,13 @@ main ()
return 0;
}]])],
[],
- [LIB_POLL="$LIB_POLL -luser32"])
+ [POLL_LIB="$POLL_LIB -luser32"])
;;
esac
fi
+ AC_SUBST([POLL_LIB])
+ dnl For backward compatibility.
+ LIB_POLL="$POLL_LIB"
AC_SUBST([LIB_POLL])
])
diff --git a/modules/poll b/modules/poll
index f626c5e2c6..d423310796 100644
--- a/modules/poll
+++ b/modules/poll
@@ -35,7 +35,7 @@ Include:
<poll.h>
Link:
-$(LIB_POLL)
+$(POLL_LIB)
License:
LGPLv2+
diff --git a/modules/poll-h-c++-tests b/modules/poll-h-c++-tests
index 8dd6262bab..1db7fff510 100644
--- a/modules/poll-h-c++-tests
+++ b/modules/poll-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-poll-h-c++
check_PROGRAMS += test-poll-h-c++
test_poll_h_c___SOURCES = test-poll-h-c++.cc
-test_poll_h_c___LDADD = $(LDADD) $(LIB_POLL)
+test_poll_h_c___LDADD = $(LDADD) $(POLL_LIB)
endif
diff --git a/modules/poll-tests b/modules/poll-tests
index 39d9e04fcd..b5b3ce4fbe 100644
--- a/modules/poll-tests
+++ b/modules/poll-tests
@@ -29,4 +29,4 @@ AC_CHECK_HEADERS_ONCE([unistd.h sys/wait.h])
Makefile.am:
TESTS += test-poll
check_PROGRAMS += test-poll
-test_poll_LDADD = $(LDADD) $(LIB_POLL) @LIBSOCKET@ $(INET_PTON_LIB)
+test_poll_LDADD = $(LDADD) $(POLL_LIB) @LIBSOCKET@ $(INET_PTON_LIB)
--
2.34.1
[-- Attachment #13: 0012-posix_spawn-Rename-LIB_POSIX_SPAWN-to-POSIX_SPAWN_LI.patch --]
[-- Type: text/x-patch, Size: 2776 bytes --]
From 3e101a6f82265225e76b020eef1a0671c7a53809 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:32:04 +0100
Subject: [PATCH 12/18] posix_spawn: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
* m4/spawn_h.m4: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/spawn_h.m4 | 11 +++++++----
modules/posix_spawn | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index edfd93d690..934f4e1398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ posix_spawn: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
+ * m4/spawn_h.m4: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
poll: Rename LIB_POLL to POLL_LIB.
diff --git a/NEWS b/NEWS
index 894a52404c..a4db3501d0 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 posix_spawn Link with $(POSIX_SPAWN_LIB) instead of
+ $(LIB_POSIX_SPAWN).
+
2023-01-07 poll Link with $(POLL_LIB) instead of $(LIB_POLL).
2023-01-07 nanosleep Link with $(NANOSLEEP_LIB) instead of
diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
index 118490adb7..3bee0f7be4 100644
--- a/m4/spawn_h.m4
+++ b/m4/spawn_h.m4
@@ -1,4 +1,4 @@
-# spawn_h.m4 serial 22
+# spawn_h.m4 serial 23
dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -65,14 +65,17 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
dnl that occur in other macros.
AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
- LIB_POSIX_SPAWN=
- AC_SUBST([LIB_POSIX_SPAWN])
+ POSIX_SPAWN_LIB=
+ AC_SUBST([POSIX_SPAWN_LIB])
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([posix_spawn], [rt],
[test "$ac_cv_search_posix_spawn" = "none required" ||
- LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
+ POSIX_SPAWN_LIB=$ac_cv_search_posix_spawn])
gl_CHECK_FUNCS_ANDROID([posix_spawn], [[#include <spawn.h>]])
LIBS=$gl_saved_libs
+ dnl For backward compatibility.
+ LIB_POSIX_SPAWN="$POSIX_SPAWN_LIB"
+ AC_SUBST([LIB_POSIX_SPAWN])
if test $ac_cv_func_posix_spawn != yes; then
HAVE_POSIX_SPAWN=0
diff --git a/modules/posix_spawn b/modules/posix_spawn
index b150aab643..6ca7ab9331 100644
--- a/modules/posix_spawn
+++ b/modules/posix_spawn
@@ -24,7 +24,7 @@ Include:
<spawn.h>
Link:
-$(LIB_POSIX_SPAWN)
+$(POSIX_SPAWN_LIB)
License:
LGPLv2+
--
2.34.1
[-- Attachment #14: 0013-pthread_sigmask-Rename-LIB_PTHREAD_SIGMASK-to-PTHREA.patch --]
[-- Type: text/x-patch, Size: 6507 bytes --]
From 29dbb50da940e099e1171f77f4aa2049f6a348d7 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:39:16 +0100
Subject: [PATCH 13/18] pthread_sigmask: Rename LIB_PTHREAD_SIGMASK to
PTHREAD_SIGMASK_LIB.
* m4/pthread_sigmask.m4: Rename LIB_PTHREAD_SIGMASK to
PTHREAD_SIGMASK_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 8 ++++++++
NEWS | 3 +++
m4/pthread_sigmask.m4 | 15 +++++++++------
modules/pselect | 2 +-
modules/pselect-tests | 2 +-
modules/pthread_sigmask | 2 +-
modules/pthread_sigmask-tests | 4 ++--
modules/signal-h-c++-tests | 2 +-
8 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 934f4e1398..cb61ac4bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ pthread_sigmask: Rename LIB_PTHREAD_SIGMASK to PTHREAD_SIGMASK_LIB.
+ * m4/pthread_sigmask.m4: Rename LIB_PTHREAD_SIGMASK to
+ PTHREAD_SIGMASK_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
posix_spawn: Rename LIB_POSIX_SPAWN to POSIX_SPAWN_LIB.
diff --git a/NEWS b/NEWS
index a4db3501d0..ec6147be99 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 pthread_sigmask Link with $(PTHREAD_SIGMASK_LIB) instead of
+ $(LIB_PTHREAD_SIGMASK).
+
2023-01-07 posix_spawn Link with $(POSIX_SPAWN_LIB) instead of
$(LIB_POSIX_SPAWN).
diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4
index 5110668155..27795282be 100644
--- a/m4/pthread_sigmask.m4
+++ b/m4/pthread_sigmask.m4
@@ -1,4 +1,4 @@
-# pthread_sigmask.m4 serial 21
+# pthread_sigmask.m4 serial 22
dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK],
[gl_cv_func_pthread_sigmask_macro=no])
])
- LIB_PTHREAD_SIGMASK=
+ PTHREAD_SIGMASK_LIB=
if test $gl_cv_func_pthread_sigmask_macro = yes; then
dnl pthread_sigmask is a dummy macro.
@@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK],
])
if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
dnl pthread_sigmask is available with -pthread or -lpthread.
- LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
+ PTHREAD_SIGMASK_LIB="$LIBMULTITHREAD"
else
dnl pthread_sigmask is not available at all.
HAVE_PTHREAD_SIGMASK=0
@@ -101,6 +101,9 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK],
])
fi
+ AC_SUBST([PTHREAD_SIGMASK_LIB])
+ dnl For backward compatibility.
+ LIB_PTHREAD_SIGMASK="$PTHREAD_SIGMASK_LIB"
AC_SUBST([LIB_PTHREAD_SIGMASK])
dnl We don't need a variable LTLIB_PTHREAD_SIGMASK, because when
dnl "$gl_threads_api" = posix, $LTLIBMULTITHREAD and $LIBMULTITHREAD are the
@@ -114,7 +117,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK],
dnl On FreeBSD 13.0, MidnightBSD 1.1, HP-UX 11.31, Solaris 9, in programs
dnl that are not linked with -lpthread, the pthread_sigmask() function
dnl always returns 0 and has no effect.
- if test -z "$LIB_PTHREAD_SIGMASK"; then
+ if test -z "$PTHREAD_SIGMASK_LIB"; then
case " $LIBS " in
*' -pthread '*) ;;
*' -lpthread '*) ;;
@@ -162,7 +165,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK],
[gl_cv_func_pthread_sigmask_return_works],
[
gl_save_LIBS="$LIBS"
- LIBS="$LIBS $LIB_PTHREAD_SIGMASK"
+ LIBS="$LIBS $PTHREAD_SIGMASK_LIB"
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <pthread.h>
@@ -208,7 +211,7 @@ int main ()
gl_cv_func_pthread_sigmask_unblock_works="guessing yes";;
esac
m4_ifdef([gl_][THREADLIB],
- [dnl Link against $LIBMULTITHREAD, not only $LIB_PTHREAD_SIGMASK.
+ [dnl Link against $LIBMULTITHREAD, not only $PTHREAD_SIGMASK_LIB.
dnl Otherwise we get a false positive on those platforms where
dnl $gl_cv_func_pthread_sigmask_in_libc_works is "no".
gl_save_LIBS=$LIBS
diff --git a/modules/pselect b/modules/pselect
index 207ec76c8a..8c4c396f7a 100644
--- a/modules/pselect
+++ b/modules/pselect
@@ -27,7 +27,7 @@ Include:
Link:
$(LIB_SELECT)
-$(LIB_PTHREAD_SIGMASK)
+$(PTHREAD_SIGMASK_LIB)
License:
LGPLv2+
diff --git a/modules/pselect-tests b/modules/pselect-tests
index 0c37ff6abf..d7441f0937 100644
--- a/modules/pselect-tests
+++ b/modules/pselect-tests
@@ -30,4 +30,4 @@ AC_CHECK_HEADERS_ONCE([sys/wait.h])
Makefile.am:
TESTS += test-pselect
check_PROGRAMS += test-pselect
-test_pselect_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ @LIB_PTHREAD_SIGMASK@ $(INET_PTON_LIB)
+test_pselect_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ @PTHREAD_SIGMASK_LIB@ $(INET_PTON_LIB)
diff --git a/modules/pthread_sigmask b/modules/pthread_sigmask
index a519d3df4c..5919f40ce3 100644
--- a/modules/pthread_sigmask
+++ b/modules/pthread_sigmask
@@ -28,7 +28,7 @@ Include:
<signal.h>
Link:
-$(LIB_PTHREAD_SIGMASK)
+$(PTHREAD_SIGMASK_LIB)
License:
LGPLv2+
diff --git a/modules/pthread_sigmask-tests b/modules/pthread_sigmask-tests
index e30bb91411..e4e0d5b019 100644
--- a/modules/pthread_sigmask-tests
+++ b/modules/pthread_sigmask-tests
@@ -13,5 +13,5 @@ configure.ac:
Makefile.am:
TESTS += test-pthread_sigmask1 test-pthread_sigmask2
check_PROGRAMS += test-pthread_sigmask1 test-pthread_sigmask2
-test_pthread_sigmask1_LDADD = $(LDADD) @LIB_PTHREAD_SIGMASK@
-test_pthread_sigmask2_LDADD = $(LDADD) @LIB_PTHREAD_SIGMASK@ @LIBMULTITHREAD@
+test_pthread_sigmask1_LDADD = $(LDADD) @PTHREAD_SIGMASK_LIB@
+test_pthread_sigmask2_LDADD = $(LDADD) @PTHREAD_SIGMASK_LIB@ @LIBMULTITHREAD@
diff --git a/modules/signal-h-c++-tests b/modules/signal-h-c++-tests
index a3d9a40076..707f0b2734 100644
--- a/modules/signal-h-c++-tests
+++ b/modules/signal-h-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-signal-h-c++
check_PROGRAMS += test-signal-h-c++
test_signal_h_c___SOURCES = test-signal-h-c++.cc test-signal-h-c++2.cc
-test_signal_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(LIB_PTHREAD_SIGMASK)
+test_signal_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB) $(PTHREAD_SIGMASK_LIB)
endif
--
2.34.1
[-- Attachment #15: 0014-sched_yield-Rename-LIB_SCHED_YIELD-to-SCHED_YIELD_LI.patch --]
[-- Type: text/x-patch, Size: 7848 bytes --]
From a164eac98dc028a2960c706c095de2ef15ff1537 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:48:31 +0100
Subject: [PATCH 14/18] sched_yield: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
* m4/threadlib.m4: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/threadlib.m4 | 15 +++++++++------
m4/yield.m4 | 4 ++--
modules/pthread-cond-tests | 2 +-
modules/pthread-mutex-tests | 2 +-
modules/pthread-once-tests | 2 +-
modules/pthread-rwlock-tests | 2 +-
modules/pthread-spin-tests | 2 +-
modules/pthread-tss-tests | 2 +-
modules/sched-c++-tests | 2 +-
modules/sched_yield | 2 +-
12 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb61ac4bc2..634203127f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ sched_yield: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
+ * m4/threadlib.m4: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
pthread_sigmask: Rename LIB_PTHREAD_SIGMASK to PTHREAD_SIGMASK_LIB.
diff --git a/NEWS b/NEWS
index ec6147be99..e5605ee295 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 sched_yield Link with $(SCHED_YIELD_LIB) instead of
+ $(LIB_SCHED_YIELD).
+
2023-01-07 pthread_sigmask Link with $(PTHREAD_SIGMASK_LIB) instead of
$(LIB_PTHREAD_SIGMASK).
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index ff959346c0..332491d42f 100644
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 32
+# threadlib.m4 serial 33
dnl Copyright (C) 2005-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -174,7 +174,7 @@ dnl Sets the variable LIBPMULTITHREAD, for programs that really need
dnl multithread functionality. The difference between LIBPTHREAD and
dnl LIBPMULTITHREAD is that on platforms supporting weak symbols, typically
dnl LIBPTHREAD is empty whereas LIBPMULTITHREAD is not.
-dnl Sets the variable LIB_SCHED_YIELD to the linker options needed to use the
+dnl Sets the variable SCHED_YIELD_LIB to the linker options needed to use the
dnl sched_yield() function.
dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
dnl multithread-safe programs.
@@ -297,13 +297,16 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
[AC_LANG_PROGRAM(
[[#include <sched.h>]],
[[sched_yield ();]])],
- [LIB_SCHED_YIELD=
+ [SCHED_YIELD_LIB=
],
[dnl Solaris 7...10 has sched_yield in librt, not in libpthread or libc.
- AC_CHECK_LIB([rt], [sched_yield], [LIB_SCHED_YIELD=-lrt],
+ AC_CHECK_LIB([rt], [sched_yield], [SCHED_YIELD_LIB=-lrt],
[dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
- AC_CHECK_LIB([posix4], [sched_yield], [LIB_SCHED_YIELD=-lposix4])])
+ AC_CHECK_LIB([posix4], [sched_yield], [SCHED_YIELD_LIB=-lposix4])])
])
+ AC_SUBST([SCHED_YIELD_LIB])
+ dnl For backward compatibility.
+ LIB_SCHED_YIELD="$SCHED_YIELD_LIB"
AC_SUBST([LIB_SCHED_YIELD])
gl_pthreadlib_body_done=done
@@ -362,7 +365,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY],
fi
else
dnl Libraries needed by thrd.c, mtx.c, cnd.c, tss.c.
- LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD"
+ LIBSTDTHREAD="$LIBPMULTITHREAD $SCHED_YIELD_LIB"
fi
;;
esac
diff --git a/m4/yield.m4 b/m4/yield.m4
index 3bfb8cda5b..4eb6bd9808 100644
--- a/m4/yield.m4
+++ b/m4/yield.m4
@@ -1,4 +1,4 @@
-# yield.m4 serial 4
+# yield.m4 serial 5
dnl Copyright (C) 2005-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@ AC_DEFUN([gl_YIELD],
AC_REQUIRE([gl_THREADLIB])
if test $gl_threads_api = posix; then
- YIELD_LIB="$LIB_SCHED_YIELD"
+ YIELD_LIB="$SCHED_YIELD_LIB"
else
YIELD_LIB=
fi
diff --git a/modules/pthread-cond-tests b/modules/pthread-cond-tests
index 75a335d565..b104ae0651 100644
--- a/modules/pthread-cond-tests
+++ b/modules/pthread-cond-tests
@@ -13,4 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-pthread-cond
check_PROGRAMS += test-pthread-cond
-test_pthread_cond_LDADD = $(LDADD) @LIBPMULTITHREAD@ @LIB_SCHED_YIELD@
+test_pthread_cond_LDADD = $(LDADD) @LIBPMULTITHREAD@ @SCHED_YIELD_LIB@
diff --git a/modules/pthread-mutex-tests b/modules/pthread-mutex-tests
index c419dcc00d..4575ef5c79 100644
--- a/modules/pthread-mutex-tests
+++ b/modules/pthread-mutex-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-pthread-mutex
check_PROGRAMS += test-pthread-mutex
-test_pthread_mutex_LDADD = $(LDADD) @LIBPMULTITHREAD@ @LIB_SCHED_YIELD@ @LIB_SEMAPHORE@
+test_pthread_mutex_LDADD = $(LDADD) @LIBPMULTITHREAD@ @SCHED_YIELD_LIB@ @LIB_SEMAPHORE@
diff --git a/modules/pthread-once-tests b/modules/pthread-once-tests
index d77dc19a5a..fc89cbcfcf 100644
--- a/modules/pthread-once-tests
+++ b/modules/pthread-once-tests
@@ -14,4 +14,4 @@ Makefile.am:
TESTS += test-pthread-once1 test-pthread-once2
check_PROGRAMS += test-pthread-once1 test-pthread-once2
test_pthread_once1_LDADD = $(LDADD) @LIBPMULTITHREAD@
-test_pthread_once2_LDADD = $(LDADD) @LIBPMULTITHREAD@ @LIB_SCHED_YIELD@
+test_pthread_once2_LDADD = $(LDADD) @LIBPMULTITHREAD@ @SCHED_YIELD_LIB@
diff --git a/modules/pthread-rwlock-tests b/modules/pthread-rwlock-tests
index 594f6b6601..af29895580 100644
--- a/modules/pthread-rwlock-tests
+++ b/modules/pthread-rwlock-tests
@@ -13,4 +13,4 @@ configure.ac:
Makefile.am:
TESTS += test-pthread-rwlock
check_PROGRAMS += test-pthread-rwlock
-test_pthread_rwlock_LDADD = $(LDADD) @LIBPMULTITHREAD@ @LIB_SCHED_YIELD@ @LIB_SEMAPHORE@
+test_pthread_rwlock_LDADD = $(LDADD) @LIBPMULTITHREAD@ @SCHED_YIELD_LIB@ @LIB_SEMAPHORE@
diff --git a/modules/pthread-spin-tests b/modules/pthread-spin-tests
index aafe8c7bcd..9dfa698ca4 100644
--- a/modules/pthread-spin-tests
+++ b/modules/pthread-spin-tests
@@ -17,4 +17,4 @@ AC_REQUIRE([gl_SEMAPHORE])
Makefile.am:
TESTS += test-pthread-spin
check_PROGRAMS += test-pthread-spin
-test_pthread_spin_LDADD = $(LDADD) @LIBPMULTITHREAD@ @LIB_SCHED_YIELD@ @LIB_SEMAPHORE@
+test_pthread_spin_LDADD = $(LDADD) @LIBPMULTITHREAD@ @SCHED_YIELD_LIB@ @LIB_SEMAPHORE@
diff --git a/modules/pthread-tss-tests b/modules/pthread-tss-tests
index caa4520e52..1d339345dd 100644
--- a/modules/pthread-tss-tests
+++ b/modules/pthread-tss-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-pthread-tss
check_PROGRAMS += test-pthread-tss
-test_pthread_tss_LDADD = $(LDADD) @LIBPMULTITHREAD@ @LIB_SCHED_YIELD@
+test_pthread_tss_LDADD = $(LDADD) @LIBPMULTITHREAD@ @SCHED_YIELD_LIB@
diff --git a/modules/sched-c++-tests b/modules/sched-c++-tests
index 28c6ea184d..5e025de0ca 100644
--- a/modules/sched-c++-tests
+++ b/modules/sched-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sched-c++
check_PROGRAMS += test-sched-c++
test_sched_c___SOURCES = test-sched-c++.cc
-test_sched_c___LDADD = $(LDADD) $(LIB_SCHED_YIELD)
+test_sched_c___LDADD = $(LDADD) $(SCHED_YIELD_LIB)
endif
diff --git a/modules/sched_yield b/modules/sched_yield
index 6d683d58d4..ad29bcafb9 100644
--- a/modules/sched_yield
+++ b/modules/sched_yield
@@ -24,7 +24,7 @@ Include:
<sched.h>
Link:
-$(LIB_SCHED_YIELD)
+$(SCHED_YIELD_LIB)
License:
LGPLv2+
--
2.34.1
[-- Attachment #16: 0015-select-Rename-LIB_SELECT-to-SELECT_LIB.patch --]
[-- Type: text/x-patch, Size: 4477 bytes --]
From 0332816b4ef61d2afb0784f15b0e66a760488212 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:52:00 +0100
Subject: [PATCH 15/18] select: Rename LIB_SELECT to SELECT_LIB.
* m4/select.m4: Rename LIB_SELECT to SELECT_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 2 ++
m4/select.m4 | 9 ++++++---
modules/pselect | 2 +-
modules/pselect-tests | 2 +-
modules/select | 2 +-
modules/select-tests | 6 +++---
modules/sys_select-c++-tests | 2 +-
8 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 634203127f..c0e2031997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ select: Rename LIB_SELECT to SELECT_LIB.
+ * m4/select.m4: Rename LIB_SELECT to SELECT_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
sched_yield: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
diff --git a/NEWS b/NEWS
index e5605ee295..397109252c 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 select Link with $(SELECT_LIB) instead of $(LIB_SELECT).
+
2023-01-07 sched_yield Link with $(SCHED_YIELD_LIB) instead of
$(LIB_SCHED_YIELD).
diff --git a/m4/select.m4 b/m4/select.m4
index 96ffa13beb..b5cffd6055 100644
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,4 +1,4 @@
-# select.m4 serial 13
+# select.m4 serial 14
dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -91,7 +91,7 @@ changequote([,])dnl
fi
dnl Determine the needed libraries.
- LIB_SELECT="$LIBSOCKET"
+ SELECT_LIB="$LIBSOCKET"
if test $REPLACE_SELECT = 1; then
case "$host_os" in
mingw*)
@@ -109,9 +109,12 @@ main ()
return 0;
}]])],
[],
- [LIB_SELECT="$LIB_SELECT -luser32"])
+ [SELECT_LIB="$SELECT_LIB -luser32"])
;;
esac
fi
+ AC_SUBST([SELECT_LIB])
+ dnl For backward compatibility.
+ LIB_SELECT="$LIB_SELECT"
AC_SUBST([LIB_SELECT])
])
diff --git a/modules/pselect b/modules/pselect
index 8c4c396f7a..36037a59b3 100644
--- a/modules/pselect
+++ b/modules/pselect
@@ -26,7 +26,7 @@ Include:
<sys/select.h>
Link:
-$(LIB_SELECT)
+$(SELECT_LIB)
$(PTHREAD_SIGMASK_LIB)
License:
diff --git a/modules/pselect-tests b/modules/pselect-tests
index d7441f0937..dd41a7026f 100644
--- a/modules/pselect-tests
+++ b/modules/pselect-tests
@@ -30,4 +30,4 @@ AC_CHECK_HEADERS_ONCE([sys/wait.h])
Makefile.am:
TESTS += test-pselect
check_PROGRAMS += test-pselect
-test_pselect_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ @PTHREAD_SIGMASK_LIB@ $(INET_PTON_LIB)
+test_pselect_LDADD = $(LDADD) @SELECT_LIB@ @LIBSOCKET@ @PTHREAD_SIGMASK_LIB@ $(INET_PTON_LIB)
diff --git a/modules/select b/modules/select
index fd3529315c..213fb78656 100644
--- a/modules/select
+++ b/modules/select
@@ -27,7 +27,7 @@ Include:
<sys/select.h>
Link:
-$(LIB_SELECT)
+$(SELECT_LIB)
License:
LGPLv2+
diff --git a/modules/select-tests b/modules/select-tests
index 899b50cddf..f62130dd9c 100644
--- a/modules/select-tests
+++ b/modules/select-tests
@@ -37,6 +37,6 @@ Makefile.am:
TESTS += test-select test-select-in.sh test-select-out.sh
# test-select-stdin has to be run by hand.
check_PROGRAMS += test-select test-select-fd test-select-stdin
-test_select_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ $(INET_PTON_LIB)
-test_select_fd_LDADD = $(LDADD) @LIB_SELECT@
-test_select_stdin_LDADD = $(LDADD) @LIB_SELECT@
+test_select_LDADD = $(LDADD) @SELECT_LIB@ @LIBSOCKET@ $(INET_PTON_LIB)
+test_select_fd_LDADD = $(LDADD) @SELECT_LIB@
+test_select_stdin_LDADD = $(LDADD) @SELECT_LIB@
diff --git a/modules/sys_select-c++-tests b/modules/sys_select-c++-tests
index e9d0417577..fc93cbfd54 100644
--- a/modules/sys_select-c++-tests
+++ b/modules/sys_select-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
TESTS += test-sys_select-c++
check_PROGRAMS += test-sys_select-c++
test_sys_select_c___SOURCES = test-sys_select-c++.cc
-test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_SELECT) $(NANOSLEEP_LIB)
+test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(SELECT_LIB) $(NANOSLEEP_LIB)
endif
--
2.34.1
[-- Attachment #17: 0016-setlocale-Rename-LIB_SETLOCALE-to-SETLOCALE_LIB.patch --]
[-- Type: text/x-patch, Size: 44410 bytes --]
From d4bfa9ec1545e7a5fd30466b481fa6fe6cc0a34a Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 15:05:00 +0100
Subject: [PATCH 16/18] setlocale: Rename LIB_SETLOCALE to SETLOCALE_LIB.
* m4/setlocale.m4: Rename LIB_SETLOCALE to SETLOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/setlocale.m4 | 11 +++++++----
modules/astrxfrm-tests | 2 +-
modules/btoc32-tests | 2 +-
modules/btowc-tests | 2 +-
modules/c-ctype-tests | 2 +-
modules/c-dtoastr-tests | 2 +-
modules/c-ldtoastr-tests | 2 +-
modules/c-snprintf-tests | 2 +-
modules/c-strcase-tests | 4 ++--
modules/c-vasprintf-tests | 2 +-
modules/c-vsnprintf-tests | 2 +-
modules/c-xvasprintf-tests | 2 +-
modules/c32isalnum-tests | 2 +-
modules/c32isalpha-tests | 2 +-
modules/c32isblank-tests | 2 +-
modules/c32iscntrl-tests | 2 +-
modules/c32isdigit-tests | 2 +-
modules/c32isgraph-tests | 2 +-
modules/c32islower-tests | 2 +-
modules/c32isprint-tests | 2 +-
modules/c32ispunct-tests | 2 +-
modules/c32isspace-tests | 2 +-
modules/c32isupper-tests | 2 +-
modules/c32isxdigit-tests | 2 +-
modules/c32rtomb-tests | 2 +-
modules/c32snrtombs-tests | 2 +-
modules/c32srtombs-tests | 2 +-
modules/c32stombs-tests | 2 +-
modules/dfa-tests | 2 +-
modules/duplocale-tests | 2 +-
modules/hard-locale-tests | 2 +-
modules/iswdigit-tests | 2 +-
modules/iswxdigit-tests | 2 +-
modules/localcharset-tests | 2 +-
modules/locale-c++-tests | 2 +-
modules/localename-tests | 2 +-
modules/mbmemcasecmp-tests | 2 +-
modules/mbmemcasecoll-tests | 2 +-
modules/mbrtoc32-tests | 2 +-
modules/mbrtowc-tests | 2 +-
modules/mbscasecmp-tests | 2 +-
modules/mbscasestr-tests | 6 +++---
modules/mbschr-tests | 2 +-
modules/mbscspn-tests | 2 +-
modules/mbsinit-tests | 2 +-
modules/mbsncasecmp-tests | 2 +-
modules/mbsnrtoc32s-tests | 2 +-
modules/mbsnrtowcs-tests | 2 +-
modules/mbspbrk-tests | 2 +-
modules/mbspcasecmp-tests | 2 +-
modules/mbsrchr-tests | 2 +-
modules/mbsrtoc32s-tests | 2 +-
modules/mbsrtowcs-tests | 2 +-
modules/mbsspn-tests | 2 +-
modules/mbsstr-tests | 4 ++--
modules/mbstoc32s-tests | 2 +-
modules/nl_langinfo-tests | 4 ++--
modules/quotearg-tests | 2 +-
modules/regex-tests | 2 +-
modules/setlocale | 2 +-
modules/setlocale-tests | 4 ++--
modules/strfmon_l-tests | 2 +-
modules/strtod-tests | 2 +-
modules/strtold-tests | 2 +-
modules/unicase/locale-language-tests | 2 +-
modules/unicase/ulc-casecmp-tests | 2 +-
modules/unicase/ulc-casecoll-tests | 2 +-
modules/unicodeio-tests | 2 +-
modules/unigbrk/ulc-grapheme-breaks-tests | 2 +-
modules/unistdio/u16-vasnprintf-tests | 4 ++--
modules/unistdio/u32-vasnprintf-tests | 4 ++--
modules/unistdio/u8-vasnprintf-tests | 4 ++--
modules/unistdio/ulc-vasnprintf-tests | 4 ++--
modules/uniwbrk/ulc-wordbreaks-tests | 2 +-
modules/vasnprintf-posix-tests | 4 ++--
modules/wcrtomb-tests | 2 +-
modules/wcsnrtombs-tests | 2 +-
modules/wcsrtombs-tests | 2 +-
modules/wcwidth-tests | 2 +-
81 files changed, 106 insertions(+), 93 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c0e2031997..af5ae11f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ setlocale: Rename LIB_SETLOCALE to SETLOCALE_LIB.
+ * m4/setlocale.m4: Rename LIB_SETLOCALE to SETLOCALE_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
2023-01-07 Bruno Haible <bruno@clisp.org>
select: Rename LIB_SELECT to SELECT_LIB.
diff --git a/NEWS b/NEWS
index 397109252c..adc1a5c7de 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 setlocale Link with $(SETLOCALE_LIB) instead of
+ $(LIB_SETLOCALE).
+
2023-01-07 select Link with $(SELECT_LIB) instead of $(LIB_SELECT).
2023-01-07 sched_yield Link with $(SCHED_YIELD_LIB) instead of
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index e3777fc34c..7e9e40889c 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-# setlocale.m4 serial 7
+# setlocale.m4 serial 8
dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -66,12 +66,15 @@ int main ()
fi
if test $NEED_SETLOCALE_MTSAFE = 1; then
- LIB_SETLOCALE="$LIB_SETLOCALE_NULL"
+ SETLOCALE_LIB="$LIB_SETLOCALE_NULL"
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])
])
diff --git a/modules/astrxfrm-tests b/modules/astrxfrm-tests
index b113e34a31..f7cb9aa0c8 100644
--- a/modules/astrxfrm-tests
+++ b/modules/astrxfrm-tests
@@ -9,4 +9,4 @@ configure.ac:
Makefile.am:
TESTS += test-astrxfrm
check_PROGRAMS += test-astrxfrm
-test_astrxfrm_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_astrxfrm_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/btoc32-tests b/modules/btoc32-tests
index 95900d59ba..b3373f3cf8 100644
--- a/modules/btoc32-tests
+++ b/modules/btoc32-tests
@@ -18,4 +18,4 @@ Makefile.am:
TESTS += test-btoc32-1.sh test-btoc32-2.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-btoc32
-test_btoc32_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_btoc32_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/btowc-tests b/modules/btowc-tests
index e36cc61c42..6bd3258520 100644
--- a/modules/btowc-tests
+++ b/modules/btowc-tests
@@ -18,4 +18,4 @@ Makefile.am:
TESTS += test-btowc1.sh test-btowc2.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-btowc
-test_btowc_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_btowc_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-ctype-tests b/modules/c-ctype-tests
index 02706b00de..0d8a8b63c5 100644
--- a/modules/c-ctype-tests
+++ b/modules/c-ctype-tests
@@ -11,4 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-c-ctype
check_PROGRAMS += test-c-ctype
-test_c_ctype_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_ctype_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-dtoastr-tests b/modules/c-dtoastr-tests
index 687d7669bd..47658c038b 100644
--- a/modules/c-dtoastr-tests
+++ b/modules/c-dtoastr-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-c-dtoastr.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-c-dtoastr
-test_c_dtoastr_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_dtoastr_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-ldtoastr-tests b/modules/c-ldtoastr-tests
index 2d4c7f81ea..1c2cfaecc0 100644
--- a/modules/c-ldtoastr-tests
+++ b/modules/c-ldtoastr-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-c-ldtoastr.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-c-ldtoastr
-test_c_ldtoastr_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_ldtoastr_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-snprintf-tests b/modules/c-snprintf-tests
index 231a4fdb66..aeb2c3545c 100644
--- a/modules/c-snprintf-tests
+++ b/modules/c-snprintf-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-c-snprintf.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-c-snprintf
-test_c_snprintf_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_snprintf_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests
index 7cdb29cef2..23a3eb8aba 100644
--- a/modules/c-strcase-tests
+++ b/modules/c-strcase-tests
@@ -19,5 +19,5 @@ Makefile.am:
TESTS += test-c-strcase.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-c-strcasecmp test-c-strncasecmp
-test_c_strcasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE)
-test_c_strncasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_strcasecmp_LDADD = $(LDADD) $(SETLOCALE_LIB)
+test_c_strncasecmp_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-vasprintf-tests b/modules/c-vasprintf-tests
index b82fc8b7e1..7becd9aa97 100644
--- a/modules/c-vasprintf-tests
+++ b/modules/c-vasprintf-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-c-vasprintf.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-c-vasprintf
-test_c_vasprintf_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_vasprintf_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-vsnprintf-tests b/modules/c-vsnprintf-tests
index 542d8d98f3..0b90c6719f 100644
--- a/modules/c-vsnprintf-tests
+++ b/modules/c-vsnprintf-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-c-vsnprintf.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-c-vsnprintf
-test_c_vsnprintf_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c_vsnprintf_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-xvasprintf-tests b/modules/c-xvasprintf-tests
index 75ce919410..9d5414d74f 100644
--- a/modules/c-xvasprintf-tests
+++ b/modules/c-xvasprintf-tests
@@ -16,4 +16,4 @@ Makefile.am:
TESTS += test-c-xvasprintf.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-c-xvasprintf
-test_c_xvasprintf_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@
+test_c_xvasprintf_LDADD = $(LDADD) $(SETLOCALE_LIB) @LIBINTL@
diff --git a/modules/c32isalnum-tests b/modules/c32isalnum-tests
index a4fd812259..3c9036cb96 100644
--- a/modules/c32isalnum-tests
+++ b/modules/c32isalnum-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isalnum
-test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isalnum_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isalpha-tests b/modules/c32isalpha-tests
index d5864dac3c..f62f78c288 100644
--- a/modules/c32isalpha-tests
+++ b/modules/c32isalpha-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isalpha
-test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isalpha_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isblank-tests b/modules/c32isblank-tests
index 0e1a694548..9f19076407 100644
--- a/modules/c32isblank-tests
+++ b/modules/c32isblank-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isblank
-test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isblank_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32iscntrl-tests b/modules/c32iscntrl-tests
index dcf26e0f89..097de3cf47 100644
--- a/modules/c32iscntrl-tests
+++ b/modules/c32iscntrl-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32iscntrl
-test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32iscntrl_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isdigit-tests b/modules/c32isdigit-tests
index db2e3d4752..fe83e357ed 100644
--- a/modules/c32isdigit-tests
+++ b/modules/c32isdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isdigit
-test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isgraph-tests b/modules/c32isgraph-tests
index 9efa4342c7..a6aac6e067 100644
--- a/modules/c32isgraph-tests
+++ b/modules/c32isgraph-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isgraph
-test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isgraph_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32islower-tests b/modules/c32islower-tests
index b8d8fa4ab3..a502e28eb1 100644
--- a/modules/c32islower-tests
+++ b/modules/c32islower-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32islower
-test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32islower_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isprint-tests b/modules/c32isprint-tests
index 17fb0b6fe5..0c13d467b4 100644
--- a/modules/c32isprint-tests
+++ b/modules/c32isprint-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isprint
-test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isprint_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32ispunct-tests b/modules/c32ispunct-tests
index 8ab1c6fa52..7475e3bd76 100644
--- a/modules/c32ispunct-tests
+++ b/modules/c32ispunct-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32ispunct
-test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32ispunct_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isspace-tests b/modules/c32isspace-tests
index a648014e3a..51988a7a48 100644
--- a/modules/c32isspace-tests
+++ b/modules/c32isspace-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isspace
-test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isspace_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isupper-tests b/modules/c32isupper-tests
index 1d42997719..db5783c181 100644
--- a/modules/c32isupper-tests
+++ b/modules/c32isupper-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isupper
-test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isupper_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32isxdigit-tests b/modules/c32isxdigit-tests
index 9731b9593c..3c986916b7 100644
--- a/modules/c32isxdigit-tests
+++ b/modules/c32isxdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32isxdigit
-test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING)
+test_c32isxdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING)
diff --git a/modules/c32rtomb-tests b/modules/c32rtomb-tests
index a8d2bee3fe..f1f83ae45c 100644
--- a/modules/c32rtomb-tests
+++ b/modules/c32rtomb-tests
@@ -40,4 +40,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32rtomb test-c32rtomb-w32
-test_c32rtomb_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c32rtomb_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c32snrtombs-tests b/modules/c32snrtombs-tests
index 038d334ec3..d6e578d07d 100644
--- a/modules/c32snrtombs-tests
+++ b/modules/c32snrtombs-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32snrtombs
-test_c32snrtombs_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c32snrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c32srtombs-tests b/modules/c32srtombs-tests
index 2501ba3726..bb12d4140b 100644
--- a/modules/c32srtombs-tests
+++ b/modules/c32srtombs-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32srtombs
-test_c32srtombs_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c32srtombs_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c32stombs-tests b/modules/c32stombs-tests
index c96de03299..92389ba29e 100644
--- a/modules/c32stombs-tests
+++ b/modules/c32stombs-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-c32stombs
-test_c32stombs_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_c32stombs_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/dfa-tests b/modules/dfa-tests
index 7d8f05a271..afa317acdf 100644
--- a/modules/dfa-tests
+++ b/modules/dfa-tests
@@ -19,4 +19,4 @@ TESTS += \
test-dfa-match.sh
check_PROGRAMS += test-dfa-match-aux
-test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB)
+test_dfa_match_aux_LDADD = $(LDADD) $(SETLOCALE_LIB) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/duplocale-tests b/modules/duplocale-tests
index 55ec1f279e..01df43bf84 100644
--- a/modules/duplocale-tests
+++ b/modules/duplocale-tests
@@ -15,4 +15,4 @@ gt_FUNC_USELOCALE
Makefile.am:
TESTS += test-duplocale
check_PROGRAMS += test-duplocale
-test_duplocale_LDADD = $(LDADD) $(LIB_SETLOCALE) @DUPLOCALE_LIB@
+test_duplocale_LDADD = $(LDADD) $(SETLOCALE_LIB) @DUPLOCALE_LIB@
diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests
index 90677d996f..b37fc39289 100644
--- a/modules/hard-locale-tests
+++ b/modules/hard-locale-tests
@@ -13,7 +13,7 @@ AC_CHECK_FUNCS_ONCE([duplocale])
Makefile.am:
TESTS += test-hard-locale
check_PROGRAMS += test-hard-locale
-test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @HARD_LOCALE_LIB@
+test_hard_locale_LDADD = $(LDADD) $(SETLOCALE_LIB) @HARD_LOCALE_LIB@
# We cannot call this program 'locale', because the C++ compiler on Mac OS X
# would then barf upon '#include <locale>'. So, call it 'current-locale'.
noinst_PROGRAMS += current-locale
diff --git a/modules/iswdigit-tests b/modules/iswdigit-tests
index e524b1bc6d..c224ca6516 100644
--- a/modules/iswdigit-tests
+++ b/modules/iswdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-iswdigit
-test_iswdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_iswdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/iswxdigit-tests b/modules/iswxdigit-tests
index 2897e7da3f..c2f9f652a8 100644
--- a/modules/iswxdigit-tests
+++ b/modules/iswxdigit-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-iswxdigit
-test_iswxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_iswxdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/localcharset-tests b/modules/localcharset-tests
index 70d5cfd551..cb84f2cdc7 100644
--- a/modules/localcharset-tests
+++ b/modules/localcharset-tests
@@ -7,4 +7,4 @@ configure.ac:
Makefile.am:
noinst_PROGRAMS += test-localcharset
-test_localcharset_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_localcharset_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/locale-c++-tests b/modules/locale-c++-tests
index 1b6b7d9250..8346327d86 100644
--- a/modules/locale-c++-tests
+++ b/modules/locale-c++-tests
@@ -16,5 +16,5 @@ if ANSICXX
TESTS += test-locale-c++
check_PROGRAMS += test-locale-c++
test_locale_c___SOURCES = test-locale-c++.cc test-locale-c++2.cc
-test_locale_c___LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_locale_c___LDADD = $(LDADD) $(SETLOCALE_LIB)
endif
diff --git a/modules/localename-tests b/modules/localename-tests
index 4b9a28a65c..af9ee464da 100644
--- a/modules/localename-tests
+++ b/modules/localename-tests
@@ -15,5 +15,5 @@ AC_CHECK_FUNCS_ONCE([newlocale])
Makefile.am:
TESTS += test-localename
check_PROGRAMS += test-localename
-test_localename_LDADD = $(LDADD) $(LIB_SETLOCALE) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
+test_localename_LDADD = $(LDADD) $(SETLOCALE_LIB) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index bf522e8472..bb2c4e6231 100644
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbmemcasecmp
-test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests
index 0fe4d9c725..8fa2805872 100644
--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbmemcasecoll
-test_mbmemcasecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbmemcasecoll_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbrtoc32-tests b/modules/mbrtoc32-tests
index 9cb1f96ae8..e123772a20 100644
--- a/modules/mbrtoc32-tests
+++ b/modules/mbrtoc32-tests
@@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbrtoc32 test-mbrtoc32-w32
-test_mbrtoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbrtoc32_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests
index 3362aa0d91..801425ad24 100644
--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbrtowc test-mbrtowc-w32
-test_mbrtowc_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbrtowc_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index a777571945..cd974fab20 100644
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbscasecmp
-test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 09ebcaee77..40f0944dba 100644
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -25,6 +25,6 @@ TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasest
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB)
-test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
-test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
-test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
+test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
+test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index 0d6b44f8ac..5ba4550d70 100644
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbschr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbschr
-test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index 054fc61cbc..3763e1ce3e 100644
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbscspn
-test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests
index 040ce4e588..15f21581c7 100644
--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -17,4 +17,4 @@ Makefile.am:
TESTS += test-mbsinit.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsinit
-test_mbsinit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsinit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index c981e97c39..079fedb691 100644
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsncasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbsncasecmp
-test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsnrtoc32s-tests b/modules/mbsnrtoc32s-tests
index a06d51c3f7..449c277aa0 100644
--- a/modules/mbsnrtoc32s-tests
+++ b/modules/mbsnrtoc32s-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsnrtoc32s
-test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsnrtoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests
index 9dade91a2a..c7c528448f 100644
--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsnrtowcs
-test_mbsnrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsnrtowcs_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index 52f56d931e..7fa86d9a9b 100644
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspbrk.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbspbrk
-test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index d64055eb9f..a7d5ad6aef 100644
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspcasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbspcasecmp
-test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index cba16a3501..18589a3be6 100644
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsrchr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrchr
-test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsrtoc32s-tests b/modules/mbsrtoc32s-tests
index 64eb047f4c..f794c5ae32 100644
--- a/modules/mbsrtoc32s-tests
+++ b/modules/mbsrtoc32s-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrtoc32s
-test_mbsrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsrtoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests
index b8137484b5..d7301057d9 100644
--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrtowcs
-test_mbsrtowcs_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsrtowcs_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index 12434a3256..d2cc24c206 100644
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsspn
-test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index 832c09c115..826ad32f83 100644
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -21,5 +21,5 @@ TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB)
-test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
-test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
+test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/mbstoc32s-tests b/modules/mbstoc32s-tests
index 5ddb287328..565796a06f 100644
--- a/modules/mbstoc32s-tests
+++ b/modules/mbstoc32s-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbstoc32s
-test_mbstoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB)
+test_mbstoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB)
diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests
index 811112ff0f..c6770ec321 100644
--- a/modules/nl_langinfo-tests
+++ b/modules/nl_langinfo-tests
@@ -20,5 +20,5 @@ Makefile.am:
TESTS += test-nl_langinfo.sh test-nl_langinfo-mt
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-nl_langinfo test-nl_langinfo-mt
-test_nl_langinfo_LDADD = $(LDADD) $(LIB_SETLOCALE)
-test_nl_langinfo_mt_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
+test_nl_langinfo_LDADD = $(LDADD) $(SETLOCALE_LIB)
+test_nl_langinfo_mt_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 176b317785..0ff8b4d402 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
host_os='@host_os@'
check_PROGRAMS += test-quotearg
-test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB)
+test_quotearg_LDADD = $(LDADD) $(SETLOCALE_LIB) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/regex-tests b/modules/regex-tests
index 6475707509..b6946c1417 100644
--- a/modules/regex-tests
+++ b/modules/regex-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-regex
check_PROGRAMS += test-regex
-test_regex_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD)
+test_regex_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/setlocale b/modules/setlocale
index 552c978baa..0b2c8e0486 100644
--- a/modules/setlocale
+++ b/modules/setlocale
@@ -27,7 +27,7 @@ Include:
<locale.h>
Link:
-$(LIB_SETLOCALE)
+$(SETLOCALE_LIB)
License:
LGPL
diff --git a/modules/setlocale-tests b/modules/setlocale-tests
index 25129f92ef..78060d1ccc 100644
--- a/modules/setlocale-tests
+++ b/modules/setlocale-tests
@@ -27,5 +27,5 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-setlocale1 test-setlocale2
-test_setlocale1_LDADD = $(LDADD) @LIB_SETLOCALE@
-test_setlocale2_LDADD = $(LDADD) @LIB_SETLOCALE@
+test_setlocale1_LDADD = $(LDADD) @SETLOCALE_LIB@
+test_setlocale2_LDADD = $(LDADD) @SETLOCALE_LIB@
diff --git a/modules/strfmon_l-tests b/modules/strfmon_l-tests
index cf2d6a2fa3..397a035858 100644
--- a/modules/strfmon_l-tests
+++ b/modules/strfmon_l-tests
@@ -10,4 +10,4 @@ configure.ac:
Makefile.am:
TESTS += test-strfmon_l
check_PROGRAMS += test-strfmon_l
-test_strfmon_l_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_strfmon_l_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/strtod-tests b/modules/strtod-tests
index 03966580f9..c654264c3d 100644
--- a/modules/strtod-tests
+++ b/modules/strtod-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-strtod1
-test_strtod1_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_strtod1_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/strtold-tests b/modules/strtold-tests
index dc82f50a08..0d35390877 100644
--- a/modules/strtold-tests
+++ b/modules/strtold-tests
@@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR='@LOCALE_FR@' \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-strtold1
-test_strtold1_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_strtold1_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests
index 1399e52692..1407383da0 100644
--- a/modules/unicase/locale-language-tests
+++ b/modules/unicase/locale-language-tests
@@ -23,4 +23,4 @@ TESTS += unicase/test-locale-language.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-locale-language
test_locale_language_SOURCES = unicase/test-locale-language.c
-test_locale_language_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
+test_locale_language_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
diff --git a/modules/unicase/ulc-casecmp-tests b/modules/unicase/ulc-casecmp-tests
index 08a8620d5f..f62f45de4d 100644
--- a/modules/unicase/ulc-casecmp-tests
+++ b/modules/unicase/ulc-casecmp-tests
@@ -22,5 +22,5 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-ulc-casecmp
test_ulc_casecmp_SOURCES = unicase/test-ulc-casecmp.c
-test_ulc_casecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_ulc_casecmp_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests
index 1610872651..0aff32f725 100644
--- a/modules/unicase/ulc-casecoll-tests
+++ b/modules/unicase/ulc-casecoll-tests
@@ -22,5 +22,5 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-ulc-casecoll
test_ulc_casecoll_SOURCES = unicase/test-ulc-casecoll.c
-test_ulc_casecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_ulc_casecoll_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unicodeio-tests b/modules/unicodeio-tests
index c53f26f2b5..05fcdeb0ba 100644
--- a/modules/unicodeio-tests
+++ b/modules/unicodeio-tests
@@ -18,4 +18,4 @@ gt_LOCALE_ZH_CN
Makefile.am:
TESTS += test-unicodeio1.sh test-unicodeio2.sh test-unicodeio3.sh
check_PROGRAMS += test-unicodeio
-test_unicodeio_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) $(LIBICONV) $(LIBINTL)
+test_unicodeio_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) $(LIBICONV) $(LIBINTL)
diff --git a/modules/unigbrk/ulc-grapheme-breaks-tests b/modules/unigbrk/ulc-grapheme-breaks-tests
index a6dacd0001..341e308a5c 100644
--- a/modules/unigbrk/ulc-grapheme-breaks-tests
+++ b/modules/unigbrk/ulc-grapheme-breaks-tests
@@ -16,4 +16,4 @@ TESTS += unigbrk/test-ulc-grapheme-breaks.sh
TESTS_ENVIRONMENT += LOCALE_AR='@LOCALE_AR@'
check_PROGRAMS += test-ulc-grapheme-breaks
test_ulc_grapheme_breaks_SOURCES = unigbrk/test-ulc-grapheme-breaks.c
-test_ulc_grapheme_breaks_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_ulc_grapheme_breaks_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests
index 45e3ab2200..6daf878bec 100644
--- a/modules/unistdio/u16-vasnprintf-tests
+++ b/modules/unistdio/u16-vasnprintf-tests
@@ -28,6 +28,6 @@ check_PROGRAMS += test-u16-vasnprintf1 test-u16-vasnprintf2 test-u16-vasnprintf3
test_u16_vasnprintf1_SOURCES = unistdio/test-u16-vasnprintf1.c
test_u16_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
test_u16_vasnprintf2_SOURCES = unistdio/test-u16-vasnprintf2.c
-test_u16_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_u16_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
test_u16_vasnprintf3_SOURCES = unistdio/test-u16-vasnprintf3.c
-test_u16_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_u16_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests
index 7343c328e6..a5d4b08925 100644
--- a/modules/unistdio/u32-vasnprintf-tests
+++ b/modules/unistdio/u32-vasnprintf-tests
@@ -28,6 +28,6 @@ check_PROGRAMS += test-u32-vasnprintf1 test-u32-vasnprintf2 test-u32-vasnprintf3
test_u32_vasnprintf1_SOURCES = unistdio/test-u32-vasnprintf1.c
test_u32_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
test_u32_vasnprintf2_SOURCES = unistdio/test-u32-vasnprintf2.c
-test_u32_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_u32_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
test_u32_vasnprintf3_SOURCES = unistdio/test-u32-vasnprintf3.c
-test_u32_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_u32_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests
index 70c9820326..219cb4b590 100644
--- a/modules/unistdio/u8-vasnprintf-tests
+++ b/modules/unistdio/u8-vasnprintf-tests
@@ -28,6 +28,6 @@ check_PROGRAMS += test-u8-vasnprintf1 test-u8-vasnprintf2 test-u8-vasnprintf3
test_u8_vasnprintf1_SOURCES = unistdio/test-u8-vasnprintf1.c
test_u8_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
test_u8_vasnprintf2_SOURCES = unistdio/test-u8-vasnprintf2.c
-test_u8_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_u8_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
test_u8_vasnprintf3_SOURCES = unistdio/test-u8-vasnprintf3.c
-test_u8_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_u8_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests
index 6a5155dcf4..2930ee7edd 100644
--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -24,6 +24,6 @@ check_PROGRAMS += test-ulc-vasnprintf1 test-ulc-vasnprintf2 test-ulc-vasnprintf3
test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c
test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
test_ulc_vasnprintf2_SOURCES = unistdio/test-ulc-vasnprintf2.c
-test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
+test_ulc_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
test_ulc_vasnprintf3_SOURCES = unistdio/test-ulc-vasnprintf3.c
-test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
+test_ulc_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB)
diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests
index cfb866b503..e2e2e056ee 100644
--- a/modules/uniwbrk/ulc-wordbreaks-tests
+++ b/modules/uniwbrk/ulc-wordbreaks-tests
@@ -16,5 +16,5 @@ TESTS += uniwbrk/test-ulc-wordbreaks.sh
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
check_PROGRAMS += test-ulc-wordbreaks
test_ulc_wordbreaks_SOURCES = uniwbrk/test-ulc-wordbreaks.c
-test_ulc_wordbreaks_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@
+test_ulc_wordbreaks_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@
diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests
index 2ea2791ddf..2ff8fc1da3 100644
--- a/modules/vasnprintf-posix-tests
+++ b/modules/vasnprintf-posix-tests
@@ -24,5 +24,5 @@ Makefile.am:
TESTS += test-vasnprintf-posix test-vasnprintf-posix2.sh test-vasnprintf-posix3
TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-vasnprintf-posix test-vasnprintf-posix2 test-vasnprintf-posix3
-test_vasnprintf_posix2_LDADD = $(LDADD) $(LIB_SETLOCALE)
-test_vasnprintf_posix3_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_vasnprintf_posix2_LDADD = $(LDADD) $(SETLOCALE_LIB)
+test_vasnprintf_posix3_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests
index 18ff62c227..56ab65d09a 100644
--- a/modules/wcrtomb-tests
+++ b/modules/wcrtomb-tests
@@ -39,4 +39,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-wcrtomb test-wcrtomb-w32
-test_wcrtomb_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_wcrtomb_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests
index adeda4e9d1..6ddd43a27e 100644
--- a/modules/wcsnrtombs-tests
+++ b/modules/wcsnrtombs-tests
@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-wcsnrtombs
-test_wcsnrtombs_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_wcsnrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests
index 2f52f68b20..09b12d7ef3 100644
--- a/modules/wcsrtombs-tests
+++ b/modules/wcsrtombs-tests
@@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \
LOCALE_JA='@LOCALE_JA@' \
LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-wcsrtombs
-test_wcsrtombs_LDADD = $(LDADD) $(LIB_SETLOCALE)
+test_wcsrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/wcwidth-tests b/modules/wcwidth-tests
index 875d18f8d3..07627def04 100644
--- a/modules/wcwidth-tests
+++ b/modules/wcwidth-tests
@@ -12,4 +12,4 @@ configure.ac:
Makefile.am:
TESTS += test-wcwidth
check_PROGRAMS += test-wcwidth
-test_wcwidth_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING)
+test_wcwidth_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING)
--
2.34.1
[-- Attachment #18: 0017-setlocale-null-Rename-LIB_SETLOCALE_NULL-to-SETLOCAL.patch --]
[-- Type: text/x-patch, Size: 7005 bytes --]
From 407b452a469cb4deb1fb5d58860a6e7ceb4761be Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 15:12:41 +0100
Subject: [PATCH 17/18] setlocale-null: Rename LIB_SETLOCALE_NULL to
SETLOCALE_NULL_LIB.
* m4/setlocale_null.m4: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
All uses changed.
* NEWS: Mention the change
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/duplocale.m4 | 4 ++--
m4/nl_langinfo.m4 | 4 ++--
m4/setlocale.m4 | 4 ++--
m4/setlocale_null.m4 | 15 +++++++++------
modules/hard-locale | 2 +-
modules/setlocale-null | 2 +-
modules/setlocale-null-tests | 6 +++---
tests/test-setlocale_null.c | 2 +-
10 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index af5ae11f35..bd0f9bbfe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ setlocale-null: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
+ * m4/setlocale_null.m4: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
+ All uses changed.
+ * NEWS: Mention the change
+
2023-01-07 Bruno Haible <bruno@clisp.org>
setlocale: Rename LIB_SETLOCALE to SETLOCALE_LIB.
diff --git a/NEWS b/NEWS
index adc1a5c7de..ee439a0784 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 setlocale-null Link with $(SETLOCALE_NULL_LIB) instead of
+ $(LIB_SETLOCALE_NULL).
+
2023-01-07 setlocale Link with $(SETLOCALE_LIB) instead of
$(LIB_SETLOCALE).
diff --git a/m4/duplocale.m4 b/m4/duplocale.m4
index 2e4686f078..c1525e90f5 100644
--- a/m4/duplocale.m4
+++ b/m4/duplocale.m4
@@ -1,4 +1,4 @@
-# duplocale.m4 serial 13
+# duplocale.m4 serial 14
dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -111,7 +111,7 @@ int main ()
HAVE_DUPLOCALE=0
fi
if test $REPLACE_DUPLOCALE = 1; then
- DUPLOCALE_LIB="$LIB_SETLOCALE_NULL"
+ DUPLOCALE_LIB="$SETLOCALE_NULL_LIB"
else
DUPLOCALE_LIB=
fi
diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index 51e783ce86..f3192f30d1 100644
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,4 +1,4 @@
-# nl_langinfo.m4 serial 8
+# nl_langinfo.m4 serial 9
dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
HAVE_NL_LANGINFO=0
fi
if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then
- LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL"
+ LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB"
else
LIB_NL_LANGINFO=
fi
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index 7e9e40889c..2e8094dc9a 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-# setlocale.m4 serial 8
+# setlocale.m4 serial 9
dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -66,7 +66,7 @@ int main ()
fi
if test $NEED_SETLOCALE_MTSAFE = 1; then
- SETLOCALE_LIB="$LIB_SETLOCALE_NULL"
+ SETLOCALE_LIB="$SETLOCALE_NULL_LIB"
else
SETLOCALE_LIB=
fi
diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4
index 032119d0f4..dd6a5ef538 100644
--- a/m4/setlocale_null.m4
+++ b/m4/setlocale_null.m4
@@ -1,4 +1,4 @@
-# setlocale_null.m4 serial 5
+# setlocale_null.m4 serial 6
dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -74,20 +74,23 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
dnl Determine link dependencies of lib/setlocale_null.c and lib/setlocale-lock.c.
if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
case "$host_os" in
- mingw*) LIB_SETLOCALE_NULL= ;;
+ mingw*) SETLOCALE_NULL_LIB= ;;
*)
gl_WEAK_SYMBOLS
case "$gl_cv_have_weak" in
- *yes) LIB_SETLOCALE_NULL= ;;
- *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;;
+ *yes) SETLOCALE_NULL_LIB= ;;
+ *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;;
esac
;;
esac
else
- LIB_SETLOCALE_NULL=
+ SETLOCALE_NULL_LIB=
fi
- dnl LIB_SETLOCALE_NULL is expected to be '-pthread' or '-lpthread' on AIX
+ dnl SETLOCALE_NULL_LIB is expected to be '-pthread' or '-lpthread' on AIX
dnl with gcc or xlc, and empty otherwise.
+ AC_SUBST([SETLOCALE_NULL_LIB])
+ dnl For backward compatibility.
+ LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB"
AC_SUBST([LIB_SETLOCALE_NULL])
])
diff --git a/modules/hard-locale b/modules/hard-locale
index 2c7846442e..2dbe64e4a9 100644
--- a/modules/hard-locale
+++ b/modules/hard-locale
@@ -11,7 +11,7 @@ setlocale-null
configure.ac:
AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
-HARD_LOCALE_LIB="$LIB_SETLOCALE_NULL"
+HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB"
AC_SUBST([HARD_LOCALE_LIB])
dnl For backward compatibility.
LIB_HARD_LOCALE="$HARD_LOCALE_LIB"
diff --git a/modules/setlocale-null b/modules/setlocale-null
index 11ad6f1faa..91efd51483 100644
--- a/modules/setlocale-null
+++ b/modules/setlocale-null
@@ -33,7 +33,7 @@ Include:
#include "setlocale_null.h" or #include <locale.h>
Link:
-$(LIB_SETLOCALE_NULL)
+$(SETLOCALE_NULL_LIB)
License:
LGPLv2+
diff --git a/modules/setlocale-null-tests b/modules/setlocale-null-tests
index 8f8b835f5a..d92e229133 100644
--- a/modules/setlocale-null-tests
+++ b/modules/setlocale-null-tests
@@ -18,6 +18,6 @@ check_PROGRAMS += \
test-setlocale_null \
test-setlocale_null-mt-one \
test-setlocale_null-mt-all
-test_setlocale_null_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@
-test_setlocale_null_mt_one_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
-test_setlocale_null_mt_all_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
+test_setlocale_null_LDADD = $(LDADD) @SETLOCALE_NULL_LIB@
+test_setlocale_null_mt_one_LDADD = $(LDADD) @SETLOCALE_NULL_LIB@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
+test_setlocale_null_mt_all_LDADD = $(LDADD) @SETLOCALE_NULL_LIB@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
diff --git a/tests/test-setlocale_null.c b/tests/test-setlocale_null.c
index 73cbc3c095..2495964b60 100644
--- a/tests/test-setlocale_null.c
+++ b/tests/test-setlocale_null.c
@@ -27,6 +27,6 @@ static char buf[SETLOCALE_NULL_ALL_MAX];
int
main ()
{
- /* Check that setlocale_null_r() can be used with $(LIB_SETLOCALE_NULL). */
+ /* Check that setlocale_null_r() can be used with $(SETLOCALE_NULL_LIB). */
return setlocale_null_r (LC_ALL, buf, sizeof (buf)) != 0;
}
--
2.34.1
[-- Attachment #19: 0018-timer_time-Rename-LIB_TIMER_TIME-to-TIMER_TIME_LIB.patch --]
[-- Type: text/x-patch, Size: 3404 bytes --]
From 07bf5d4f11fa151331248a5d87dfc12b9e406e43 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 15:17:30 +0100
Subject: [PATCH 18/18] timer_time: Rename LIB_TIMER_TIME to TIMER_TIME_LIB.
* m4/timer_time.m4: Rename LIB_TIMER_TIME to TIMER_TIME_LIB.
All uses changed.
* NEWS: Mention the change
---
ChangeLog | 7 +++++++
NEWS | 3 +++
m4/timer_time.m4 | 15 +++++++++------
modules/timer-time | 2 +-
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bd0f9bbfe5..eeeefeca27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ timer_time: Rename LIB_TIMER_TIME to TIMER_TIME_LIB.
+ * m4/timer_time.m4: Rename LIB_TIMER_TIME to TIMER_TIME_LIB.
+ All uses changed.
+ * NEWS: Mention the change
+
2023-01-07 Bruno Haible <bruno@clisp.org>
setlocale-null: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
diff --git a/NEWS b/NEWS
index ee439a0784..f960dd978f 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 timer_time Link with $(TIMER_TIME_LIB) instead of
+ $(LIB_TIMER_TIME).
+
2023-01-07 setlocale-null Link with $(SETLOCALE_NULL_LIB) instead of
$(LIB_SETLOCALE_NULL).
diff --git a/m4/timer_time.m4 b/m4/timer_time.m4
index 4c2608b58e..437d1dc542 100644
--- a/m4/timer_time.m4
+++ b/m4/timer_time.m4
@@ -1,10 +1,10 @@
-# timer_time.m4 serial 5
+# timer_time.m4 serial 6
dnl Copyright (C) 2011-2023 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.
-# Check for timer_settime, and set LIB_TIMER_TIME.
+# Check for timer_settime, and set TIMER_TIME_LIB.
AC_DEFUN([gl_TIMER_TIME],
[
@@ -21,13 +21,13 @@ AC_DEFUN([gl_TIMER_TIME],
AC_CHECK_DECL([timer_settime], [], [],
[[#include <time.h>
]])
- LIB_TIMER_TIME=
- AC_SUBST([LIB_TIMER_TIME])
+ TIMER_TIME_LIB=
+ AC_SUBST([TIMER_TIME_LIB])
AS_IF([test "$ac_cv_have_decl_timer_settime" = yes], [
gl_saved_libs=$LIBS
AC_SEARCH_LIBS([timer_settime], [rt posix4],
[test "$ac_cv_search_timer_settime" = "none required" ||
- LIB_TIMER_TIME=$ac_cv_search_timer_settime])
+ TIMER_TIME_LIB=$ac_cv_search_timer_settime])
m4_ifdef([gl_][PTHREADLIB],
[dnl GLIBC uses threads to emulate posix timers when kernel support
dnl is not available (like Linux < 2.6 or when used with kFreeBSD)
@@ -42,8 +42,11 @@ AC_DEFUN([gl_TIMER_TIME],
#endif
#endif
],
- [LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBPMULTITHREAD"])])
+ [TIMER_TIME_LIB="$TIMER_TIME_LIB $LIBPMULTITHREAD"])])
AC_CHECK_FUNCS([timer_settime])
LIBS=$gl_saved_libs
])
+ dnl For backward compatibility.
+ LIB_TIMER_TIME="$TIMER_TIME_LIB"
+ AC_SUBST([LIB_TIMER_TIME])
])
diff --git a/modules/timer-time b/modules/timer-time
index 7f496d78d7..11ac61ce4a 100644
--- a/modules/timer-time
+++ b/modules/timer-time
@@ -18,7 +18,7 @@ Include:
<time.h>
Link:
-$(LIB_TIMER_TIME)
+$(TIMER_TIME_LIB)
License:
LGPLv2+
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-07 17:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 10:14 More systematic naming of LIB variables Bruno Haible
2023-01-07 1:26 ` Paul Eggert
2023-01-07 7:01 ` Bruno Haible
2023-01-07 17:05 ` Bruno Haible
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).