>From 4d458b63d7b27660fcd20669cc7c04e626930345 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Jan 2023 11:13:35 +0100 Subject: [PATCH 02/18] duplocale: Rename LIB_DUPLOCALE to DUPLOCALE_LIB. * m4/duplocale.m4: Rename LIB_DUPLOCALE to DUPLOCALE_LIB. All uses changed. * NEWS: Mention the change. --- ChangeLog | 7 +++++++ NEWS | 3 +++ m4/duplocale.m4 | 11 +++++++---- modules/duplocale | 2 +- modules/duplocale-tests | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9da31ee4e5..f13184ba8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-01-07 Bruno Haible + + duplocale: Rename LIB_DUPLOCALE to DUPLOCALE_LIB. + * m4/duplocale.m4: Rename LIB_DUPLOCALE to DUPLOCALE_LIB. + All uses changed. + * NEWS: Mention the change. + 2023-01-07 Bruno Haible clock_time: Rename LIB_CLOCK_GETTIME to CLOCK_TIME_LIB. diff --git a/NEWS b/NEWS index 64f83a622a..faf0633464 100644 --- a/NEWS +++ b/NEWS @@ -74,6 +74,9 @@ User visible incompatible changes Date Modules Changes +2023-01-07 duplocale Link with $(DUPLOCALE_LIB) instead of + $(LIB_DUPLOCALE). + 2023-01-07 clock_time Link with $(CLOCK_TIME_LIB) instead of $(LIB_CLOCK_GETTIME). diff --git a/m4/duplocale.m4 b/m4/duplocale.m4 index 488094b398..2e4686f078 100644 --- a/m4/duplocale.m4 +++ b/m4/duplocale.m4 @@ -1,4 +1,4 @@ -# duplocale.m4 serial 12 +# duplocale.m4 serial 13 dnl Copyright (C) 2009-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, @@ -111,12 +111,15 @@ int main () HAVE_DUPLOCALE=0 fi if test $REPLACE_DUPLOCALE = 1; then - LIB_DUPLOCALE="$LIB_SETLOCALE_NULL" + DUPLOCALE_LIB="$LIB_SETLOCALE_NULL" else - LIB_DUPLOCALE= + DUPLOCALE_LIB= fi - dnl LIB_DUPLOCALE is expected to be '-pthread' or '-lpthread' on AIX + dnl DUPLOCALE_LIB is expected to be '-pthread' or '-lpthread' on AIX dnl with gcc or xlc, and empty otherwise. + AC_SUBST([DUPLOCALE_LIB]) + dnl For backward compatibility. + LIB_DUPLOCALE="$DUPLOCALE_LIB" AC_SUBST([LIB_DUPLOCALE]) ]) diff --git a/modules/duplocale b/modules/duplocale index 0c6dc22757..80d4aaaf54 100644 --- a/modules/duplocale +++ b/modules/duplocale @@ -26,7 +26,7 @@ Include: Link: -$(LIB_DUPLOCALE) +$(DUPLOCALE_LIB) License: LGPL diff --git a/modules/duplocale-tests b/modules/duplocale-tests index e30810982a..55ec1f279e 100644 --- a/modules/duplocale-tests +++ b/modules/duplocale-tests @@ -15,4 +15,4 @@ gt_FUNC_USELOCALE Makefile.am: TESTS += test-duplocale check_PROGRAMS += test-duplocale -test_duplocale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_DUPLOCALE@ +test_duplocale_LDADD = $(LDADD) $(LIB_SETLOCALE) @DUPLOCALE_LIB@ -- 2.34.1