Rename module search to search-h.

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

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

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

diff --git a/modules/posixcheck b/modules/posixcheck
index 16b8c536c814cacc57914bbbd4317ecba17c3687..dfb047929a82d0c673054c0821abdc9d92e435ee 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -25,7 +25,7 @@ poll-h
 pthread-h
 pty-h
 sched-h
-search
+search-h
 signal-h
 spawn
 stdio

diff --git a/modules/search b/modules/search
index 2debf36b89edd6c0a8955c40ed6f31fa3a8007e8..21383b2c694db2a1aba633184d1ef236fa63f0b1 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -1,50 +1,20 @@
 Description:
 A GNU-like <search.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'search-h' instead.
+
 Files:
-lib/search.in.h
-m4/search_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
+search-h
 
 configure.ac:
-gl_SEARCH_H
-gl_SEARCH_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += search.h
-
-# We need the following in order to create <search.h> when the system
-# doesn't have one that works with the given compiler.
-search.h: search.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|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_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_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
-             -e 's|@''HAVE_TYPE_VISIT''@|$(HAVE_TYPE_VISIT)|g' \
-             -e 's/@''GNULIB_TSEARCH''@/$(GNULIB_TSEARCH)/g' \
-             -e 's/@''GNULIB_MDA_LFIND''@/$(GNULIB_MDA_LFIND)/g' \
-             -e 's/@''GNULIB_MDA_LSEARCH''@/$(GNULIB_MDA_LSEARCH)/g' \
-             -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
-             -e 's|@''HAVE_TWALK''@|$(HAVE_TWALK)|g' \
-             -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
-             -e 's|@''REPLACE_TWALK''@|$(REPLACE_TWALK)|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)/search.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += search.h search.h-t
 
 Include:
 <search.h>
@@ -53,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

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

diff --git a/modules/search-h b/modules/search-h
new file mode 100644 (file)
index 0000000..2debf36
--- /dev/null
+++ b/modules/search-h
@@ -0,0 +1,56 @@
+Description:
+A GNU-like <search.h>.
+
+Files:
+lib/search.in.h
+m4/search_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_SEARCH_H
+gl_SEARCH_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += search.h
+
+# We need the following in order to create <search.h> when the system
+# doesn't have one that works with the given compiler.
+search.h: search.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|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_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_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
+             -e 's|@''HAVE_TYPE_VISIT''@|$(HAVE_TYPE_VISIT)|g' \
+             -e 's/@''GNULIB_TSEARCH''@/$(GNULIB_TSEARCH)/g' \
+             -e 's/@''GNULIB_MDA_LFIND''@/$(GNULIB_MDA_LFIND)/g' \
+             -e 's/@''GNULIB_MDA_LSEARCH''@/$(GNULIB_MDA_LSEARCH)/g' \
+             -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
+             -e 's|@''HAVE_TWALK''@|$(HAVE_TWALK)|g' \
+             -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
+             -e 's|@''REPLACE_TWALK''@|$(REPLACE_TWALK)|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)/search.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += search.h search.h-t
+
+Include:
+<search.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

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

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

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

diff --git a/modules/tsearch b/modules/tsearch
index c4c363b7a6bf4874412fc29a4c84e46ea414faef..8cec5f66b2195e2dc173ae9514f06d2495bcc71b 100644 (file)
--- a/modules/tsearch
+++ b/modules/tsearch
@@ -6,7 +6,7 @@ lib/tsearch.c
 m4/tsearch.m4
 
 Depends-on:
-search
+search-h
 
 configure.ac:
 gl_FUNC_TSEARCH

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

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