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