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

Rename module langinfo to langinfo-h.

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

diff --git a/ChangeLog b/ChangeLog
index c118d64bac..dfd3baac6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module langinfo to langinfo-h.
+	* modules/langinfo-h: Renamed from modules/langinfo.
+	* modules/langinfo-h-tests: Renamed from modules/langinfo-tests.
+	* modules/langinfo-h-c++-tests: Renamed from modules/langinfo-c++-tests.
+	* tests/test-langinfo-h.c: Renamed from tests/test-langinfo.c.
+	* tests/test-langinfo-h-c++.cc: Renamed from tests/test-langinfo-c++.cc.
+	* doc/posix-headers/langinfo.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/langinfo: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename module inttypes to inttypes-h.
diff --git a/doc/posix-headers/langinfo.texi b/doc/posix-headers/langinfo.texi
index 8375da8c90..a0f8fcf593 100644
--- a/doc/posix-headers/langinfo.texi
+++ b/doc/posix-headers/langinfo.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/langinfo.h.html}
 
-Gnulib module: langinfo
-@mindex langinfo
+Gnulib module: langinfo-h
+@mindex langinfo-h
 
 Portability problems fixed by Gnulib:
 @itemize
diff --git a/modules/duplocale-tests b/modules/duplocale-tests
index 77295bb38a..395d252dc8 100644
--- a/modules/duplocale-tests
+++ b/modules/duplocale-tests
@@ -5,7 +5,7 @@ tests/macros.h
 m4/intl-thread-locale.m4
 
 Depends-on:
-langinfo
+langinfo-h
 
 configure.ac:
 AC_CHECK_FUNCS_ONCE([strfmon_l snprintf_l])
diff --git a/modules/langinfo b/modules/langinfo
index 24d14883b8..60e5055cf1 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -1,49 +1,20 @@
 Description:
 A GNU-like <langinfo.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'langinfo-h' instead.
+
 Files:
-lib/langinfo.in.h
-m4/langinfo_h.m4
 
 Depends-on:
-extensions
-gen-header
-include_next
-snippet/c++defs
-snippet/warn-on-use
+langinfo-h
 
 configure.ac:
-gl_LANGINFO_H
-gl_LANGINFO_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += langinfo.h
-
-# We need the following in order to create an empty placeholder for
-# <langinfo.h> when the system doesn't have one.
-langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|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_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
-	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
-	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
-	      -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
-	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
-	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
-	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      $(srcdir)/langinfo.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += langinfo.h langinfo.h-t
 
 Include:
 <langinfo.h>
@@ -52,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all
diff --git a/modules/langinfo-c++-tests b/modules/langinfo-c++-tests
deleted file mode 100644
index 653637f05b..0000000000
--- a/modules/langinfo-c++-tests
+++ /dev/null
@@ -1,18 +0,0 @@
-Files:
-tests/test-langinfo-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-langinfo-c++
-check_PROGRAMS += test-langinfo-c++
-test_langinfo_c___SOURCES = test-langinfo-c++.cc
-endif
diff --git a/modules/langinfo-h b/modules/langinfo-h
new file mode 100644
index 0000000000..24d14883b8
--- /dev/null
+++ b/modules/langinfo-h
@@ -0,0 +1,55 @@
+Description:
+A GNU-like <langinfo.h>.
+
+Files:
+lib/langinfo.in.h
+m4/langinfo_h.m4
+
+Depends-on:
+extensions
+gen-header
+include_next
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_LANGINFO_H
+gl_LANGINFO_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += langinfo.h
+
+# We need the following in order to create an empty placeholder for
+# <langinfo.h> when the system doesn't have one.
+langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|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_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
+	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
+	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
+	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+	      -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
+	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
+	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
+	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
+	      -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      $(srcdir)/langinfo.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += langinfo.h langinfo.h-t
+
+Include:
+<langinfo.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/langinfo-h-c++-tests b/modules/langinfo-h-c++-tests
new file mode 100644
index 0000000000..720dcc98ad
--- /dev/null
+++ b/modules/langinfo-h-c++-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-langinfo-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-langinfo-h-c++
+check_PROGRAMS += test-langinfo-h-c++
+test_langinfo_h_c___SOURCES = test-langinfo-h-c++.cc
+endif
diff --git a/modules/langinfo-h-tests b/modules/langinfo-h-tests
new file mode 100644
index 0000000000..efad452c3a
--- /dev/null
+++ b/modules/langinfo-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-langinfo-h.c
+
+Depends-on:
+langinfo-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-langinfo-h
+check_PROGRAMS += test-langinfo-h
diff --git a/modules/langinfo-tests b/modules/langinfo-tests
deleted file mode 100644
index ef94dfc05f..0000000000
--- a/modules/langinfo-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-langinfo.c
-
-Depends-on:
-langinfo-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-langinfo
-check_PROGRAMS += test-langinfo
diff --git a/modules/localename-unsafe b/modules/localename-unsafe
index 3bcdbcad7b..6f9437c661 100644
--- a/modules/localename-unsafe
+++ b/modules/localename-unsafe
@@ -23,7 +23,7 @@ flexmember
 free-posix
 strdup
 lock
-langinfo
+langinfo-h
 setlocale-null
 setlocale-null-unlocked
 thread-optim
diff --git a/modules/nl_langinfo b/modules/nl_langinfo
index 3d014c91c2..b553cfb99b 100644
--- a/modules/nl_langinfo
+++ b/modules/nl_langinfo
@@ -10,7 +10,7 @@ m4/threadlib.m4
 m4/visibility.m4
 
 Depends-on:
-langinfo
+langinfo-h
 localeconv      [test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1]
 setlocale-null  [test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0]
 
diff --git a/modules/posixcheck b/modules/posixcheck
index 0460a5f20b..01fa5eccae 100644
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -15,7 +15,7 @@ fnmatch-h
 glob-h
 iconv-h
 inttypes-h-incomplete
-langinfo
+langinfo-h
 locale
 malloc-h
 math
diff --git a/modules/regex b/modules/regex
index 325df23e2e..5e7feef374 100644
--- a/modules/regex
+++ b/modules/regex
@@ -26,7 +26,7 @@ glibc-internal/dynarray [test $ac_use_included_regex = yes]
 gnulib-i18n             [test $ac_use_included_regex = yes]
 intprops                [test $ac_use_included_regex = yes]
 iswctype                [test $ac_use_included_regex = yes]
-langinfo                [test $ac_use_included_regex = yes]
+langinfo-h              [test $ac_use_included_regex = yes]
 libc-config             [test $ac_use_included_regex = yes]
 limits-h                [test $ac_use_included_regex = yes]
 lock                    [test $ac_use_included_regex = yes]
diff --git a/tests/test-langinfo-c++.cc b/tests/test-langinfo-h-c++.cc
similarity index 100%
rename from tests/test-langinfo-c++.cc
rename to tests/test-langinfo-h-c++.cc
diff --git a/tests/test-langinfo.c b/tests/test-langinfo-h.c
similarity index 100%
rename from tests/test-langinfo.c
rename to tests/test-langinfo-h.c