Rename module netdb to netdb-h.

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

diff --git a/ChangeLog b/ChangeLog
index b7aca0d7fe4dcb31e613d84ac067caef4b290380..12ae4c74bc2b73d51058b6315345700a4ad76502 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module netdb to netdb-h.
+       * modules/netdb-h: Renamed from modules/netdb.
+       * modules/netdb-h-tests: Renamed from modules/netdb-tests.
+       * modules/netdb-h-c++-tests: Renamed from modules/netdb-c++-tests.
+       * tests/test-netdb-h.c: Renamed from tests/test-netdb.c.
+       * tests/test-netdb-h-c++.cc: Renamed from tests/test-netdb-c++.cc.
+       * doc/posix-headers/netdb.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/netdb: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module monetary to monetary-h.

diff --git a/doc/posix-headers/netdb.texi b/doc/posix-headers/netdb.texi
index a6555427176535a0bcdd18cd5126e4f21116aecb..aaaf05b23fc4b9f6ab5cf1334fc45a31e7422f79 100644 (file)
--- a/doc/posix-headers/netdb.texi
+++ b/doc/posix-headers/netdb.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html}
 
-Gnulib module: netdb
-@mindex netdb
+Gnulib module: netdb-h
+@mindex netdb-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index 31b648734e6d408690ce12f6c5f237aebfa6f918..bdb6915e9f771eac19c56557ca51f05dc3759860 100644 (file)
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -7,7 +7,7 @@ lib/gai_strerror.c
 m4/getaddrinfo.m4
 
 Depends-on:
-netdb
+netdb-h
 sys_socket
 extensions
 gettext-h       [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1 || test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1]

diff --git a/modules/getdomainname b/modules/getdomainname
index 1e21c906583a4ee8891876017224cdb5288ae524..bf8bb3475b00f015b80c227b2fce0d81b0832b68 100644 (file)
--- a/modules/getdomainname
+++ b/modules/getdomainname
@@ -8,7 +8,7 @@ m4/getdomainname.m4
 Depends-on:
 unistd
 extensions
-netdb           [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1]
+netdb-h         [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1]
 sys_socket      [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1]
 
 configure.ac:

diff --git a/modules/netdb b/modules/netdb
index b81d389cd173bad69dde799d53b9b710a63209dd..534da75fb2e001f328295c29a68fae33b5a6bc6e 100644 (file)
--- a/modules/netdb
+++ b/modules/netdb
@@ -1,51 +1,20 @@
 Description:
 A <netdb.h> for systems lacking it.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'netdb-h' instead.
+
 Files:
-lib/netdb.in.h
-m4/netdb_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-sys_socket
+netdb-h
 
 configure.ac:
-gl_NETDB_H
-gl_NETDB_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += netdb.h
-
-# We need the following in order to create <netdb.h> when the system
-# doesn't have one that works with the given compiler.
-netdb.h: netdb.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_NETDB_H''@|$(NEXT_NETDB_H)|g' \
-             -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \
-             -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \
-             -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \
-             -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \
-             -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \
-             -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
-             -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
-             -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|g' \
-             -e 's|@''REPLACE_GETADDRINFO''@|$(REPLACE_GETADDRINFO)|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)/netdb.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += netdb.h netdb.h-t
 
 Include:
 <netdb.h>
@@ -54,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Simon Josefsson

diff --git a/modules/netdb-c++-tests b/modules/netdb-c++-tests
deleted file mode 100644 (file)
index af07dee..0000000
--- a/modules/netdb-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-netdb-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-netdb-c++
-check_PROGRAMS += test-netdb-c++
-test_netdb_c___SOURCES = test-netdb-c++.cc
-test_netdb_c___LDADD = $(LDADD) $(GETADDRINFO_LIB)
-endif

diff --git a/modules/netdb-h b/modules/netdb-h
new file mode 100644 (file)
index 0000000..b81d389
--- /dev/null
+++ b/modules/netdb-h
@@ -0,0 +1,57 @@
+Description:
+A <netdb.h> for systems lacking it.
+
+Files:
+lib/netdb.in.h
+m4/netdb_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+sys_socket
+
+configure.ac:
+gl_NETDB_H
+gl_NETDB_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += netdb.h
+
+# We need the following in order to create <netdb.h> when the system
+# doesn't have one that works with the given compiler.
+netdb.h: netdb.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_NETDB_H''@|$(NEXT_NETDB_H)|g' \
+             -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \
+             -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \
+             -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \
+             -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \
+             -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \
+             -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
+             -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
+             -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|g' \
+             -e 's|@''REPLACE_GETADDRINFO''@|$(REPLACE_GETADDRINFO)|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)/netdb.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += netdb.h netdb.h-t
+
+Include:
+<netdb.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Simon Josefsson

diff --git a/modules/netdb-h-c++-tests b/modules/netdb-h-c++-tests
new file mode 100644 (file)
index 0000000..d211c62
--- /dev/null
+++ b/modules/netdb-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-netdb-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-netdb-h-c++
+check_PROGRAMS += test-netdb-h-c++
+test_netdb_h_c___SOURCES = test-netdb-h-c++.cc
+test_netdb_h_c___LDADD = $(LDADD) $(GETADDRINFO_LIB)
+endif

diff --git a/modules/netdb-h-tests b/modules/netdb-h-tests
new file mode 100644 (file)
index 0000000..fdc06e9
--- /dev/null
+++ b/modules/netdb-h-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-netdb-h.c
+
+Depends-on:
+netdb-h-c++-tests
+assert-h
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-netdb-h
+check_PROGRAMS += test-netdb-h

diff --git a/modules/netdb-tests b/modules/netdb-tests
deleted file mode 100644 (file)
index 2f84ec3..0000000
--- a/modules/netdb-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-netdb.c
-
-Depends-on:
-netdb-c++-tests
-assert-h
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-netdb
-check_PROGRAMS += test-netdb

diff --git a/modules/posixcheck b/modules/posixcheck
index 3c04ecc4d493f063c6cf5dfd851ed44e49614070..9cf7f3340c8f941e16ad3075085b5ba5136acd79 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -20,7 +20,7 @@ locale-h
 malloc-h
 math-h
 monetary-h
-netdb
+netdb-h
 poll-h
 pthread-h
 pty

diff --git a/tests/test-netdb-c++.cc b/tests/test-netdb-h-c++.cc
similarity index 100%
rename from tests/test-netdb-c++.cc
rename to tests/test-netdb-h-c++.cc

diff --git a/tests/test-netdb.c b/tests/test-netdb-h.c
similarity index 100%
rename from tests/test-netdb.c
rename to tests/test-netdb-h.c