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