>From 0b15fd22718461843b29bfa6fc48ca9798854c66 Mon Sep 17 00:00:00 2001 From: Bruno Haible 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 + + 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 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 ]]) - 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