From: Bruno Haible <bruno@clisp.org>
Date: Fri, 27 Dec 2024 22:14:18 +0000 (+0100)
Subject: Rename module locale to locale-h.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca55f73b6e1bcb9ecb37f3b093bb6046e9af170b;p=thirdparty%2Fgnulib.git

Rename module locale to locale-h.

* modules/locale-h: Renamed from modules/locale.
* modules/locale-h-tests: Renamed from modules/locale-tests.
* modules/locale-h-c++-tests: Renamed from modules/locale-c++-tests.
* tests/test-locale-h.c: Renamed from tests/test-locale.c.
* tests/test-locale-h-c++.cc: Renamed from tests/test-locale-c++.cc.
* tests/test-locale-h-c++2.cc: Renamed from tests/test-locale-c++2.cc.
* doc/posix-headers/locale.texi: Update.
* modules/* (Depends-on): Update.
* modules/locale: New file.
---

diff --git a/ChangeLog b/ChangeLog
index dfd3baac6b..23d806b2d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module locale to locale-h.
+	* modules/locale-h: Renamed from modules/locale.
+	* modules/locale-h-tests: Renamed from modules/locale-tests.
+	* modules/locale-h-c++-tests: Renamed from modules/locale-c++-tests.
+	* tests/test-locale-h.c: Renamed from tests/test-locale.c.
+	* tests/test-locale-h-c++.cc: Renamed from tests/test-locale-c++.cc.
+	* tests/test-locale-h-c++2.cc: Renamed from tests/test-locale-c++2.cc.
+	* doc/posix-headers/locale.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/locale: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename module langinfo to langinfo-h.
diff --git a/doc/posix-headers/locale.texi b/doc/posix-headers/locale.texi
index 966a34f40c..0ba1826832 100644
--- a/doc/posix-headers/locale.texi
+++ b/doc/posix-headers/locale.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/locale.h.html}
 
-Gnulib module: locale
-@mindex locale
+Gnulib module: locale-h
+@mindex locale-h
 
 Portability problems fixed by Gnulib:
 @itemize
diff --git a/modules/c-nstrftime b/modules/c-nstrftime
index 25c182ab13..86a9d89f0a 100644
--- a/modules/c-nstrftime
+++ b/modules/c-nstrftime
@@ -16,7 +16,7 @@ errno-h
 extensions
 intprops
 libc-config
-locale
+locale-h
 stdbool
 stdckdint
 time_rz
diff --git a/modules/c-strtod b/modules/c-strtod
index 2ca8f2a2f2..02d5b07343 100644
--- a/modules/c-strtod
+++ b/modules/c-strtod
@@ -10,7 +10,7 @@ m4/intl-thread-locale.m4
 Depends-on:
 c99
 extensions
-locale
+locale-h
 c-ctype
 strtod
 
diff --git a/modules/c-strtof b/modules/c-strtof
index ec6251fd9e..de6e38182f 100644
--- a/modules/c-strtof
+++ b/modules/c-strtof
@@ -11,7 +11,7 @@ m4/intl-thread-locale.m4
 Depends-on:
 c99
 extensions
-locale
+locale-h
 c-ctype
 strtof
 
diff --git a/modules/c-strtold b/modules/c-strtold
index 0ec27d7983..55b64ec2ae 100644
--- a/modules/c-strtold
+++ b/modules/c-strtold
@@ -11,7 +11,7 @@ m4/intl-thread-locale.m4
 Depends-on:
 c99
 extensions
-locale
+locale-h
 c-ctype
 strtold
 
diff --git a/modules/dfa b/modules/dfa
index e9461ded98..569de68f77 100644
--- a/modules/dfa
+++ b/modules/dfa
@@ -21,7 +21,7 @@ flexmember
 gettext-h
 gnulib-i18n
 idx
-locale
+locale-h
 mbrtoc32-regular
 mbszero
 regex
diff --git a/modules/duplocale b/modules/duplocale
index 7c1a8730a5..9914007b8f 100644
--- a/modules/duplocale
+++ b/modules/duplocale
@@ -6,7 +6,7 @@ lib/duplocale.c
 m4/duplocale.m4
 
 Depends-on:
-locale
+locale-h
 setlocale-null  [test $HAVE_DUPLOCALE = 1 && test $REPLACE_DUPLOCALE = 1]
 
 configure.ac:
diff --git a/modules/locale b/modules/locale
index df0237723d..23c529c9f0 100644
--- a/modules/locale
+++ b/modules/locale
@@ -1,59 +1,20 @@
 Description:
 A <locale.h> that conforms to POSIX.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'locale-h' instead.
+
 Files:
-lib/locale.in.h
-m4/locale_h.m4
 
 Depends-on:
-extensions
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-stddef
+locale-h
 
 configure.ac:
-gl_LOCALE_H
-gl_LOCALE_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += locale.h
-
-# We need the following in order to create <locale.h> when the system
-# doesn't have one that provides all definitions.
-locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@NMD@	$(AM_V_GEN)$(MKDIR_P) '%reldir%'
-	$(gl_V_at)$(SED_HEADER_STDOUT) \
-	      -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
-	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
-	      -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \
-	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
-	      -e 's/@''GNULIB_LOCALENAME_UNSAFE''@/$(GNULIB_LOCALENAME_UNSAFE)/g' \
-	      -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
-	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
-	      -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
-	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
-	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
-	      -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \
-	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
-	      -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \
-	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
-	      -e 's|@''LOCALENAME_ENHANCE_LOCALE_FUNCS''@|$(LOCALENAME_ENHANCE_LOCALE_FUNCS)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      $(srcdir)/locale.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += locale.h locale.h-t
 
 Include:
 <locale.h>
@@ -62,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all
diff --git a/modules/locale-c++-tests b/modules/locale-c++-tests
deleted file mode 100644
index 8346327d86..0000000000
--- a/modules/locale-c++-tests
+++ /dev/null
@@ -1,20 +0,0 @@
-Files:
-tests/test-locale-c++.cc
-tests/test-locale-c++2.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-locale-c++
-check_PROGRAMS += test-locale-c++
-test_locale_c___SOURCES = test-locale-c++.cc test-locale-c++2.cc
-test_locale_c___LDADD = $(LDADD) $(SETLOCALE_LIB)
-endif
diff --git a/modules/locale-h b/modules/locale-h
new file mode 100644
index 0000000000..df0237723d
--- /dev/null
+++ b/modules/locale-h
@@ -0,0 +1,65 @@
+Description:
+A <locale.h> that conforms to POSIX.
+
+Files:
+lib/locale.in.h
+m4/locale_h.m4
+
+Depends-on:
+extensions
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+stddef
+
+configure.ac:
+gl_LOCALE_H
+gl_LOCALE_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += locale.h
+
+# We need the following in order to create <locale.h> when the system
+# doesn't have one that provides all definitions.
+locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+@NMD@	$(AM_V_GEN)$(MKDIR_P) '%reldir%'
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
+	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
+	      -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \
+	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
+	      -e 's/@''GNULIB_LOCALENAME_UNSAFE''@/$(GNULIB_LOCALENAME_UNSAFE)/g' \
+	      -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
+	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
+	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
+	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
+	      -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \
+	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \
+	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
+	      -e 's|@''LOCALENAME_ENHANCE_LOCALE_FUNCS''@|$(LOCALENAME_ENHANCE_LOCALE_FUNCS)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      $(srcdir)/locale.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += locale.h locale.h-t
+
+Include:
+<locale.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/locale-h-c++-tests b/modules/locale-h-c++-tests
new file mode 100644
index 0000000000..15b2014b3b
--- /dev/null
+++ b/modules/locale-h-c++-tests
@@ -0,0 +1,20 @@
+Files:
+tests/test-locale-h-c++.cc
+tests/test-locale-h-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-locale-h-c++
+check_PROGRAMS += test-locale-h-c++
+test_locale_h_c___SOURCES = test-locale-h-c++.cc test-locale-h-c++2.cc
+test_locale_h_c___LDADD = $(LDADD) $(SETLOCALE_LIB)
+endif
diff --git a/modules/locale-tests b/modules/locale-h-tests
similarity index 55%
rename from modules/locale-tests
rename to modules/locale-h-tests
index 5c7c032fa8..440a80deac 100644
--- a/modules/locale-tests
+++ b/modules/locale-h-tests
@@ -1,13 +1,13 @@
 Files:
-tests/test-locale.c
+tests/test-locale-h.c
 
 Depends-on:
 assert-h
-locale-c++-tests
+locale-h-c++-tests
 
 configure.ac:
 gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]])
 
 Makefile.am:
-TESTS += test-locale
-check_PROGRAMS += test-locale
+TESTS += test-locale-h
+check_PROGRAMS += test-locale-h
diff --git a/modules/localeconv b/modules/localeconv
index 3f22cafa36..610a0cb0a9 100644
--- a/modules/localeconv
+++ b/modules/localeconv
@@ -7,7 +7,7 @@ lib/localeconv.c
 m4/localeconv.m4
 
 Depends-on:
-locale
+locale-h
 
 configure.ac:
 gl_FUNC_LOCALECONV
diff --git a/modules/localename b/modules/localename
index 576e0451e3..6f419f11b3 100644
--- a/modules/localename
+++ b/modules/localename
@@ -7,7 +7,7 @@ lib/localename.c
 lib/struniq.h
 
 Depends-on:
-locale
+locale-h
 localename-unsafe
 flexmember
 lock
diff --git a/modules/localename-tests b/modules/localename-tests
index cf4d586806..6a3d522fce 100644
--- a/modules/localename-tests
+++ b/modules/localename-tests
@@ -9,7 +9,7 @@ m4/musl.m4
 m4/windows-rc.m4
 
 Depends-on:
-locale
+locale-h
 setenv
 unsetenv
 setlocale
diff --git a/modules/localename-unsafe b/modules/localename-unsafe
index 6f9437c661..c19a838a95 100644
--- a/modules/localename-unsafe
+++ b/modules/localename-unsafe
@@ -18,7 +18,7 @@ Depends-on:
 localename-unsafe-limited
 extensions
 stdbool
-locale
+locale-h
 flexmember
 free-posix
 strdup
diff --git a/modules/localename-unsafe-limited b/modules/localename-unsafe-limited
index b9f845bfbd..74bf0d5697 100644
--- a/modules/localename-unsafe-limited
+++ b/modules/localename-unsafe-limited
@@ -12,7 +12,7 @@ m4/lcmessage.m4
 
 Depends-on:
 extensions
-locale
+locale-h
 setlocale-null-unlocked
 
 configure.ac:
diff --git a/modules/posixcheck b/modules/posixcheck
index 01fa5eccae..ef52102c67 100644
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -16,7 +16,7 @@ glob-h
 iconv-h
 inttypes-h-incomplete
 langinfo-h
-locale
+locale-h
 malloc-h
 math
 monetary
diff --git a/modules/setlocale b/modules/setlocale
index 0b2c8e0486..c59ca1f41e 100644
--- a/modules/setlocale
+++ b/modules/setlocale
@@ -6,7 +6,7 @@ lib/setlocale.c
 m4/setlocale.m4
 
 Depends-on:
-locale
+locale-h
 localename      [test $NEED_SETLOCALE_IMPROVED = 1]
 setlocale-null  [test $NEED_SETLOCALE_MTSAFE = 1]
 
diff --git a/modules/setlocale-null b/modules/setlocale-null
index 782e29ad8d..872d63e86b 100644
--- a/modules/setlocale-null
+++ b/modules/setlocale-null
@@ -11,7 +11,7 @@ m4/threadlib.m4
 m4/visibility.m4
 
 Depends-on:
-locale
+locale-h
 snippet/arg-nonnull
 setlocale-null-unlocked
 
diff --git a/modules/setlocale-null-unlocked b/modules/setlocale-null-unlocked
index 21d9611501..7b734b8ec3 100644
--- a/modules/setlocale-null-unlocked
+++ b/modules/setlocale-null-unlocked
@@ -7,7 +7,7 @@ lib/setlocale_null.h
 lib/setlocale_null-unlocked.c
 
 Depends-on:
-locale
+locale-h
 snippet/arg-nonnull
 
 configure.ac:
diff --git a/tests/test-locale-c++.cc b/tests/test-locale-h-c++.cc
similarity index 100%
rename from tests/test-locale-c++.cc
rename to tests/test-locale-h-c++.cc
diff --git a/tests/test-locale-c++2.cc b/tests/test-locale-h-c++2.cc
similarity index 100%
rename from tests/test-locale-c++2.cc
rename to tests/test-locale-h-c++2.cc
diff --git a/tests/test-locale.c b/tests/test-locale-h.c
similarity index 100%
rename from tests/test-locale.c
rename to tests/test-locale-h.c