>From 07bf5d4f11fa151331248a5d87dfc12b9e406e43 Mon Sep 17 00:00:00 2001 From: Bruno Haible 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 + + 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 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 ]]) - 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: Link: -$(LIB_TIMER_TIME) +$(TIMER_TIME_LIB) License: LGPLv2+ -- 2.34.1