summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-01-07 11:42:52 +0100
committerBruno Haible <bruno@clisp.org>2023-01-07 18:06:51 +0100
commit7d19811f99083c87c761eff0e5fbe1ab32156fb6 (patch)
treef1eaf280018a27da10f5e2c0d092cb4b522a67c3
parent353a6ecc8bbfc2bfef0b1abc585662bee5f84699 (diff)
downloadgnulib-7d19811f99083c87c761eff0e5fbe1ab32156fb6.tar.gz
hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB.
* modules/hard-locale (configure.ac): Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB. All uses changed. * NEWS: Mention the change.
-rw-r--r--ChangeLog8
-rw-r--r--NEWS3
-rw-r--r--modules/hard-locale7
-rw-r--r--modules/hard-locale-tests2
4 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d968f4f75..50fd1701de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2023-01-07 Bruno Haible <bruno@clisp.org>
+ hard-locale: Rename LIB_HARD_LOCALE to HARD_LOCALE_LIB.
+ * modules/hard-locale (configure.ac): Rename LIB_HARD_LOCALE to
+ HARD_LOCALE_LIB.
+ All uses changed.
+ * NEWS: Mention the change.
+
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
getrandom: Rename LIB_GETRANDOM to GETRANDOM_LIB.
* m4/getrandom.m4: Rename LIB_GETRANDOM to GETRANDOM_LIB.
All uses changed.
diff --git a/NEWS b/NEWS
index 5ff7d0816f..913e04dd5f 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
Date Modules Changes
+2023-01-07 hard-locale Link with $(HARD_LOCALE_LIB) instead of
+ $(LIB_HARD_LOCALE).
+
2023-01-07 getrandom Link with $(GETRANDOM_LIB) instead of
$(LIB_GETRANDOM).
diff --git a/modules/hard-locale b/modules/hard-locale
index df07d4a6ed..2c7846442e 100644
--- a/modules/hard-locale
+++ b/modules/hard-locale
@@ -11,7 +11,10 @@ setlocale-null
configure.ac:
AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
-LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL"
+HARD_LOCALE_LIB="$LIB_SETLOCALE_NULL"
+AC_SUBST([HARD_LOCALE_LIB])
+dnl For backward compatibility.
+LIB_HARD_LOCALE="$HARD_LOCALE_LIB"
AC_SUBST([LIB_HARD_LOCALE])
Makefile.am:
@@ -21,7 +24,7 @@ Include:
"hard-locale.h"
Link:
-$(LIB_HARD_LOCALE)
+$(HARD_LOCALE_LIB)
License:
LGPLv2+
diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests
index 7ed85754e5..90677d996f 100644
--- a/modules/hard-locale-tests
+++ b/modules/hard-locale-tests
@@ -13,7 +13,7 @@ AC_CHECK_FUNCS_ONCE([duplocale])
Makefile.am:
TESTS += test-hard-locale
check_PROGRAMS += test-hard-locale
-test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_HARD_LOCALE@
+test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @HARD_LOCALE_LIB@
# We cannot call this program 'locale', because the C++ compiler on Mac OS X
# would then barf upon '#include <locale>'. So, call it 'current-locale'.
noinst_PROGRAMS += current-locale