>From a6c3c4defc6ec8c31fded6b5b5e68bafd47ace45 Mon Sep 17 00:00:00 2001 From: Bruno Haible 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 + + 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 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: 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