]> git.ipfire.org Git - thirdparty/gnulib.git/commitdiff
Rename module string to string-h.
authorBruno Haible <bruno@clisp.org>
Fri, 27 Dec 2024 22:37:59 +0000 (23:37 +0100)
committerBruno Haible <bruno@clisp.org>
Fri, 27 Dec 2024 22:38:50 +0000 (23:38 +0100)
* modules/string-h: Renamed from modules/string.
* modules/string-h-tests: Renamed from modules/string-tests.
* modules/string-h-c++-tests: Renamed from modules/string-c++-tests.
* tests/test-string-h.c: Renamed from tests/test-string.c.
* tests/test-string-h-c++.cc: Renamed from tests/test-string-c++.cc.
* tests/test-string-h-c++2.cc: Renamed from tests/test-string-c++2.cc.
* doc/posix-headers/string.texi: Update.
* doc/posix-functions/strcat.texi: Update.
* doc/posix-functions/strcpy.texi: Update.
* doc/posix-functions/strncpy.texi: Update.
* modules/* (Depends-on): Update.
* modules/string: New file.

71 files changed:
ChangeLog
doc/posix-functions/strcat.texi
doc/posix-functions/strcpy.texi
doc/posix-functions/strncpy.texi
doc/posix-headers/string.texi
modules/dfa
modules/dfa-tests
modules/explicit_bzero
modules/ffsl
modules/ffsll
modules/free-posix
modules/getprogname-tests
modules/mbscasecmp
modules/mbscasestr
modules/mbschr
modules/mbscspn
modules/mbslen
modules/mbsncasecmp
modules/mbsnlen
modules/mbspbrk
modules/mbspcasecmp
modules/mbsrchr
modules/mbssep
modules/mbsspn
modules/mbsstr
modules/mbstok_r
modules/memchr
modules/memcpy
modules/memmem-simple
modules/memmove
modules/mempcpy
modules/memrchr
modules/memset
modules/memset_explicit
modules/posixcheck
modules/rawmemchr
modules/relocatable-prog-wrapper
modules/sigabbrev_np
modules/sigdescr_np
modules/snprintf-posix
modules/stack-tests
modules/stpcpy
modules/stpncpy
modules/strcasestr-simple
modules/strchrnul
modules/strdup
modules/strdup-posix
modules/strerror
modules/strerror_r-posix
modules/strerrorname_np
modules/string
modules/string-c++-tests [deleted file]
modules/string-h [new file with mode: 0644]
modules/string-h-c++-tests [new file with mode: 0644]
modules/string-h-tests [new file with mode: 0644]
modules/string-tests [deleted file]
modules/strncat
modules/strncpy
modules/strndup
modules/strnlen
modules/strpbrk
modules/strptime
modules/strsep
modules/strsignal
modules/strstr-simple
modules/strtok_r
modules/strverscmp
modules/vsnprintf-posix
tests/test-string-h-c++.cc [moved from tests/test-string-c++.cc with 100% similarity]
tests/test-string-h-c++2.cc [moved from tests/test-string-c++2.cc with 100% similarity]
tests/test-string-h.c [moved from tests/test-string.c with 100% similarity]

index adf50e86c74e65660e6739ee4a6834c8217133c6..21666360bae2c82fd4199f11054516bc7482cb08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module string to string-h.
+       * modules/string-h: Renamed from modules/string.
+       * modules/string-h-tests: Renamed from modules/string-tests.
+       * modules/string-h-c++-tests: Renamed from modules/string-c++-tests.
+       * tests/test-string-h.c: Renamed from tests/test-string.c.
+       * tests/test-string-h-c++.cc: Renamed from tests/test-string-c++.cc.
+       * tests/test-string-h-c++2.cc: Renamed from tests/test-string-c++2.cc.
+       * doc/posix-headers/string.texi: Update.
+       * doc/posix-functions/strcat.texi: Update.
+       * doc/posix-functions/strcpy.texi: Update.
+       * doc/posix-functions/strncpy.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/string: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module stdnoreturn to stdnoreturn-h.
index 24aa6477de1af13706c2930d2bee0e65a245da4f..2e3f9d2dda144dd8ba4c00e5fc93c783dbcf4fba 100644 (file)
@@ -4,8 +4,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcat.html}
 
-Gnulib module: string
-@mindex string
+Gnulib module: string-h
+@mindex string-h
 
 Portability problems fixed by Gnulib:
 @itemize
index 638aecb23264840889c071ce533326d0464faebb..6bce4d68bba973a4eb94494b29f96504f10a3814 100644 (file)
@@ -4,8 +4,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcpy.html}
 
-Gnulib module: string
-@mindex string
+Gnulib module: string-h
+@mindex string-h
 
 Portability problems fixed by Gnulib:
 @itemize
index ea5f41dcceb38a2a21cf8e8cd33875df255614ec..8dd33de80e19fdf89a941cc48f7d06ab467090bf 100644 (file)
@@ -4,11 +4,11 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncpy.html}
 
-Gnulib module: string or strncpy
-@mindex string
+Gnulib module: string-h or strncpy
+@mindex string-h
 @mindex strncpy
 
-Portability problems fixed by Gnulib module @code{string} or Gnulib module @code{strncpy}:
+Portability problems fixed by Gnulib module @code{string-h} or Gnulib module @code{strncpy}:
 @itemize
 @item
 This function cannot be called from plain inline or extern inline functions
index 2e513ebd8e93c0ef8ec6e5e40f65863a0615b433..e3a26c15450c81ef8d23216c4c72d7daa74543e1 100644 (file)
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/string.h.html}
 
-Gnulib module: string
-@mindex string
+Gnulib module: string-h
+@mindex string-h
 
 Portability problems fixed by Gnulib:
 @itemize
index 275ddbd3b3a4b44605d083c54dfe53d3b01a2f04..60b0086fc5d51f526465f520cda8e68c4014f972 100644 (file)
@@ -30,7 +30,7 @@ stddef-h
 stdint-h
 stdio-h
 stdlib-h
-string
+string-h
 uchar
 # The lonesome_lower array requires ISO C 23 semantics for char32_t.
 # But uchar-c23 has a global effect, therefore leave it to each package
index f3aa498555d1f33724ae3d47aefcc6d180de37d1..6cdacf985f4f40ede7fe1ecca22c13982e1e8e6f 100644 (file)
@@ -8,7 +8,7 @@ Depends-on:
 binary-io
 stdio-h
 stdlib-h
-string
+string-h
 unistd
 regex
 setlocale
index 8ba9a06ada173acc0de9b954cfc5aab131bafa0d..7fd0b80ef72fd03210258996cf90c6e0dc81e90a 100644 (file)
@@ -8,7 +8,7 @@ m4/explicit_bzero.m4
 Depends-on:
 extensions
 memset_explicit
-string
+string-h
 
 configure.ac:
 gl_FUNC_EXPLICIT_BZERO
index 02990c761da5195cfde6ab6fa9884d71eff2ba98..4cfe1236b46c995ac3df66cd6e729c1f1aac2931 100644 (file)
@@ -8,7 +8,7 @@ m4/ffsl.m4
 
 Depends-on:
 extensions
-string
+string-h
 ffs             [test $HAVE_FFSL = 0]
 
 configure.ac:
index e215301a72a4c0986ac85f6128af7f5392cc2254..c1f39e55ae3d172bb3037b77886b357a003d30fe 100644 (file)
@@ -8,7 +8,7 @@ m4/ffsll.m4
 
 Depends-on:
 extensions
-string
+string-h
 ffs             [test $HAVE_FFSLL = 0 || test $REPLACE_FFSLL = 1]
 
 configure.ac:
index 8e8d0708f84674adecebb8b74007215aa0bda401..11b67ca73b1569c463ec270e2f9c5b63813b0460 100644 (file)
@@ -7,7 +7,7 @@ m4/free.m4
 
 Depends-on:
 stdlib-h
-string
+string-h
 wchar
 
 configure.ac:
index cbfda75af761b8d98e7ab78b082f27e018b88ca5..bd7137f8eaffdd8a931e9db76e19bd87e0c1a1e0 100644 (file)
@@ -2,7 +2,7 @@ Files:
 tests/test-getprogname.c
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 
index 38644a7a5d41876a22cc6355e1f36f699d97d14c..113df00173544560147c5f1932e51084dccb9db0 100644 (file)
@@ -8,7 +8,7 @@ Depends-on:
 c32tolower
 mbuiterf            [test "$GNULIB_MCEL_PREFER" != yes]
 stdlib-h
-string
+string-h
 uchar
 
 configure.ac:
index a3e702214b05d3de8ee71ca57093dc2729c3734a..dfb1f82f7d45f466333a377db6ee75094f9c6fcf 100644 (file)
@@ -9,7 +9,7 @@ Depends-on:
 alignasof
 mbuiter
 stdbool-h
-string
+string-h
 mbslen
 malloca
 c32tolower
index e99a3caf6cdb47e2c9777ebf6a5dc8c009de4914..c1e9c203ca34f404169d75f817b480cc22bae8ec 100644 (file)
@@ -6,7 +6,7 @@ lib/mbschr.c
 
 Depends-on:
 mbuiterf
-string
+string-h
 
 configure.ac:
 gl_STRING_MODULE_INDICATOR([mbschr])
index c730f907a7b6a0d2791d58911035a749a6c0b63d..db4f50861d98650eb30c830d99eab461fb591edd 100644 (file)
@@ -6,7 +6,7 @@ lib/mbscspn.c
 
 Depends-on:
 mbuiterf
-string
+string-h
 mbschr
 strcspn
 
index 6b6c6078e5afc25ea724f7ee0dc7e00fe2f7df4a..0426f5a5c8622ae6f7c913a66a908a8846205278 100644 (file)
@@ -7,7 +7,7 @@ m4/mbslen.m4
 
 Depends-on:
 mbuiterf
-string
+string-h
 
 configure.ac:
 gl_FUNC_MBSLEN
index e01a1a8652bed3a7e85680f1dd3c1dce4c39e874..665342ddf0bc7e55ff0966f6639b884427b65420 100644 (file)
@@ -7,7 +7,7 @@ lib/mbsncasecmp.c
 Depends-on:
 c32tolower
 mbuiterf
-string
+string-h
 
 configure.ac:
 gl_STRING_MODULE_INDICATOR([mbsncasecmp])
index 3a3486f6899876518ab2f13eedf4b585a21a0817..1d39c746afeb3d42c178a3f204511f3ac47e4ccc 100644 (file)
@@ -6,7 +6,7 @@ lib/mbsnlen.c
 
 Depends-on:
 mbiterf
-string
+string-h
 
 configure.ac:
 gl_STRING_MODULE_INDICATOR([mbsnlen])
index 158f55caa8b016cf6a740783e854ab6a69e1ef69..8787a088c54d6666db89ace872607574ef7dc690 100644 (file)
@@ -6,7 +6,7 @@ lib/mbspbrk.c
 
 Depends-on:
 mbuiterf
-string
+string-h
 mbschr
 strpbrk
 
index ffb58bc4f6fc8aa9ee0490dec4047737054c1c46..29a5f051725552129e448ec6f0d23ee474bded0d 100644 (file)
@@ -7,7 +7,7 @@ lib/mbspcasecmp.c
 Depends-on:
 c32tolower
 mbuiterf
-string
+string-h
 
 configure.ac:
 gl_STRING_MODULE_INDICATOR([mbspcasecmp])
index 56b9ed94897d2993a831544ac8824fcd9f3ef359..06fb553fd2050bf3cb730e8e8fc626ed29bbdfee 100644 (file)
@@ -6,7 +6,7 @@ lib/mbsrchr.c
 
 Depends-on:
 mbuiterf
-string
+string-h
 
 configure.ac:
 gl_STRING_MODULE_INDICATOR([mbsrchr])
index 6672d646419a17c26bbb528a0251942efc005065..08bbdbf51dcfff7cd0d62500a8e038dca1176402 100644 (file)
@@ -6,7 +6,7 @@ lib/mbssep.c
 
 Depends-on:
 mbuiterf
-string
+string-h
 mbspbrk
 strsep
 
index 25cfd3f59f36e4701b4c06a298d9cf8402af264d..d96c1cd5c135c51054c65042e81fd157b995af3b 100644 (file)
@@ -6,7 +6,7 @@ lib/mbsspn.c
 
 Depends-on:
 mbuiterf
-string
+string-h
 mbschr
 
 configure.ac:
index fa4949b26f621a27ea73ae8532020145976b4a01..d19351218c106358c6e15aabb7a6953a1d68c6db 100644 (file)
@@ -9,7 +9,7 @@ Depends-on:
 alignasof
 mbuiter
 stdbool-h
-string
+string-h
 mbslen
 malloca
 strnlen
index 0a41e552cac24da698545e2ac4857e9d76e55ee1..457ce53dfc39e8a59ad9a2b808380748b028c789 100644 (file)
@@ -5,7 +5,7 @@ Files:
 lib/mbstok_r.c
 
 Depends-on:
-string
+string-h
 mbsspn
 mbspbrk
 strtok_r
index d722c92083cd5a9fc86d15bfda0724252e70c226..ec8d198933cbd94e868b43181f5752eb09f5e3cd 100644 (file)
@@ -9,7 +9,7 @@ m4/mmap-anon.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_MEMCHR
index 4083b0f4de5cd96408c5e71b965c3ba7f018043f..539fb93df20fae0cc57bd33da45c7244d11beebf 100644 (file)
@@ -12,7 +12,7 @@ lib/memcpy.c
 m4/memcpy.m4
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 gl_FUNC_MEMCPY
index ab6c173041296a474d18191f32c251a0539f14dc..40e3aba584c8ac400d328ad6690a730cbbec8f3f 100644 (file)
@@ -9,7 +9,7 @@ m4/memmem.m4
 Depends-on:
 builtin-expect
 extensions
-string
+string-h
 stdint-h
 memchr
 memcmp
index 2afdb07d3960a48c58522658cc7e4c1e948ccff8..0b2cea50394d1f9f0a526efd8b258a833cffd80e 100644 (file)
@@ -12,7 +12,7 @@ lib/memmove.c
 m4/memmove.m4
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 gl_FUNC_MEMMOVE
index 469dbd8789da24d0532969b228c9f833f1c46470..710b87c6431223194151c2771e351254e994efa5 100644 (file)
@@ -7,7 +7,7 @@ m4/mempcpy.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_MEMPCPY
index c6b832a8cd92b90588b415857c28ebcb95a1f491..47c7e8c4b674616af43947d024b5302f68e118e6 100644 (file)
@@ -7,7 +7,7 @@ m4/memrchr.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_MEMRCHR
index defc5baf7d29bab5d456452a3ec996997f6ed06b..2ee1dfef28470b3dab4b0d88153cce4fd8072b1e 100644 (file)
@@ -12,7 +12,7 @@ lib/memset.c
 m4/memset.m4
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 gl_FUNC_MEMSET
index 294c9f4d8efec2e24edc976845eec44492e026f0..468aef0436d7a839bafe25432f3fc70148cf29f7 100644 (file)
@@ -6,7 +6,7 @@ lib/memset_explicit.c
 m4/memset_explicit.m4
 
 Depends-on:
-string
+string-h
 extensions
 
 configure.ac:
index fbb7d2c2c11d42d2fd45aa180cfe6c9bf7eb6f9c..8394ede762e29f1eb662a79a2779daea55e9bbb6 100644 (file)
@@ -30,7 +30,7 @@ signal-h
 spawn-h
 stdio-h
 stdlib-h
-string
+string-h
 strings
 sys_file
 sys_ioctl
index b235d1fb656bfa2c5926757b57bac34958578efa..f2e94c6acf21ea27ce0a884d0477e1b61848906e 100644 (file)
@@ -10,7 +10,7 @@ Depends-on:
 assert-h
 extensions
 stdint-h
-string
+string-h
 
 configure.ac:
 gl_FUNC_RAWMEMCHR
index 59a1e605b99c45a2a57c42684b679ee0010ace85..cfd1719a9f1f160b1bc039cbcbf478c4aba46978 100644 (file)
@@ -74,7 +74,7 @@ stddef-h
 stdckdint-h
 stdint-h
 stdlib-h
-string
+string-h
 sys_stat
 unistd
 xalloc-oversized
index 7531138fc03d22232dddd3d668b12b2e6fb608e4..a91e6ec9f62b7b8f94ab65f359ec12e201c9c254 100644 (file)
@@ -7,7 +7,7 @@ m4/sigabbrev_np.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_SIGABBREV_NP
index e085f9487b4e16fcdb661afbe018e76749d2a2d7..3e3b0a8f7d4fd15c47ef31eca95c6172c4fdd7e7 100644 (file)
@@ -7,7 +7,7 @@ m4/sigdescr_np.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_SIGDESCR_NP
index e099c7644e2f9b2166c2563d5b01b31c35e9eb29..1edfd3591d0b5a3376c5d966512fdb51b3bba5d0 100644 (file)
@@ -1,6 +1,6 @@
 Description:
 POSIX compatible snprintf() function: print formatted output to a fixed length
-string
+string-h
 
 Comment:
 This module should not be used as a dependency from a test module,
index b38e3500835c4ed1c52b71d841ba81e1bbd537ce..10b3f5586862927d98c93f4fb62bd9c9c101292f 100644 (file)
@@ -3,7 +3,7 @@ tests/test-stack.c
 tests/macros.h
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 
index 66c481d691b1d9618e37a8b96bf1f54b4e30a688..8dfc03076eff9104eee5ca8f5c3772edb8f736cf 100644 (file)
@@ -7,7 +7,7 @@ m4/stpcpy.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_STPCPY
index 5e95a25c99d12defaedca838452d84ea22082abd..c1093474d58b9384c44023c84745e8fb7ad9fb48 100644 (file)
@@ -7,7 +7,7 @@ m4/stpncpy.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_STPNCPY
index f7105e7f550660e53500d4d0a4b36fa34a0b9c27..c538d5d7bbbcd1557d7c9157e37e704b5edb6911 100644 (file)
@@ -7,7 +7,7 @@ lib/str-two-way.h
 m4/strcasestr.m4
 
 Depends-on:
-string
+string-h
 stdbool-h
 strcase
 memchr
index 6c3f088d906946902c82d21a8301f2194ab5b826..a563d7a30c82b26da7e4fd33bb25cc419b11872a 100644 (file)
@@ -8,7 +8,7 @@ lib/strchrnul.valgrind
 m4/strchrnul.m4
 
 Depends-on:
-string
+string-h
 extensions
 rawmemchr       [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1]
 
index fecdc554ba3fa96df521d842e9065c26ce116073..3b62dbaf8a5c104e28f7e2d62f184f1bc54e08d0 100644 (file)
@@ -11,7 +11,7 @@ Files:
 m4/strdup.m4
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 gl_FUNC_STRDUP
index 5eab0ed4157d6b42e2e8420d99ffd5e34b7c2d20..4d3dd428b6e6c5cf93dae34db72cb6a1c4648df9 100644 (file)
@@ -6,7 +6,7 @@ lib/strdup.c
 m4/strdup.m4
 
 Depends-on:
-string
+string-h
 malloc-posix    [test $REPLACE_STRDUP = 1]
 
 configure.ac:
index c058119036a772974730380ef979033923be22f4..ddba80c816db1858b88ac757413790e994bcad28 100644 (file)
@@ -6,7 +6,7 @@ lib/strerror.c
 m4/strerror.m4
 
 Depends-on:
-string
+string-h
 assert-h         [test $REPLACE_STRERROR = 1]
 errno-h          [test $REPLACE_STRERROR = 1]
 intprops         [test $REPLACE_STRERROR = 1]
index 350824e0567e36fc448ec9733475330d458128e7..eba6e8839b2c076cc1900579b9b1bdf91d401bfd 100644 (file)
@@ -6,7 +6,7 @@ lib/strerror_r.c
 m4/strerror_r.m4
 
 Depends-on:
-string
+string-h
 extensions
 errno-h         [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
 lock            [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
index 03e5e7de48f9c2b48591536ec10ce222a8a94890..b36352df09237cf4d2945dd1c025bf9b3392bfef 100644 (file)
@@ -7,7 +7,7 @@ m4/strerrorname_np.m4
 
 Depends-on:
 extensions
-string
+string-h
 
 configure.ac:
 gl_FUNC_STRERRORNAME_NP
index 0dfa096cc8212ecf55281e876ded2b21f3bf44b3..04039d5accef090595ebe9b7fb978dda54a7752c 100644 (file)
 Description:
 A GNU-like <string.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'string-h' instead.
+
 Files:
-lib/string.in.h
-m4/string_h.m4
 
 Depends-on:
-extensions
-extern-inline
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-stddef-h
-stdlib-h
+string-h
 
 configure.ac:
-gl_STRING_H
-gl_STRING_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += string.h
-
-# We need the following in order to create <string.h> when the system
-# doesn't have one that works with the given compiler.
-string.h: string.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_STRING_H''@|$(NEXT_STRING_H)|g' \
-             -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \
-             -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-             -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-             -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-             -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-             -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-             -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-             -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-             -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-             -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-             -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-             -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-             -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-             -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-             -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-             -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-             -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-             -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-             -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-             -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-             -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-             -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GNULIB_MEMSET_EXPLICIT)/g' \
-             -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-             -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-             -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-             -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-             -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-             -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-             -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-             -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-             -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-             -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-             -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-             -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-             -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-             -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-             -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-             -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \
-             -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \
-             -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \
-             -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-             -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
-             -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \
-             -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \
-             -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \
-             < $(srcdir)/string.in.h > $@-t1
-       $(AM_V_at)sed \
-             -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
-             -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-             -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-             -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
-             -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
-             -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
-             -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
-             -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \
-             -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
-             -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
-             -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
-             -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
-             -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \
-             -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \
-             -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \
-             -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \
-             -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
-             -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
-             -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-             -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
-             -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \
-             -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \
-             -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \
-             -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
-             -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
-             -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
-             -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
-             -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
-             -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
-             -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
-             -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
-             -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
-             -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
-             -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
-             -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
-             -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
-             -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
-             -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
-             -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
-             -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-             -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
-             -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-             -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
-             -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
-             -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
-             -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
-             -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \
-             < $@-t1 > $@-t2
-       $(AM_V_at)rm -f $@-t1
-       $(AM_V_at)mv $@-t2 $@
-MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
 
 Include:
 <string.h>
@@ -143,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all
diff --git a/modules/string-c++-tests b/modules/string-c++-tests
deleted file mode 100644 (file)
index fb44ae4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Files:
-tests/test-string-c++.cc
-tests/test-string-c++2.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-string-c++
-check_PROGRAMS += test-string-c++
-test_string_c___SOURCES = test-string-c++.cc test-string-c++2.cc
-test_string_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIBC32CONV) $(LIBTHREAD)
-endif
diff --git a/modules/string-h b/modules/string-h
new file mode 100644 (file)
index 0000000..0dfa096
--- /dev/null
@@ -0,0 +1,146 @@
+Description:
+A GNU-like <string.h>.
+
+Files:
+lib/string.in.h
+m4/string_h.m4
+
+Depends-on:
+extensions
+extern-inline
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+stddef-h
+stdlib-h
+
+configure.ac:
+gl_STRING_H
+gl_STRING_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += string.h
+
+# We need the following in order to create <string.h> when the system
+# doesn't have one that works with the given compiler.
+string.h: string.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_STRING_H''@|$(NEXT_STRING_H)|g' \
+             -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \
+             -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
+             -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
+             -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
+             -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
+             -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
+             -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
+             -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
+             -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
+             -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
+             -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
+             -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
+             -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
+             -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
+             -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
+             -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
+             -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
+             -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
+             -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
+             -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
+             -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
+             -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GNULIB_MEMSET_EXPLICIT)/g' \
+             -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
+             -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
+             -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
+             -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
+             -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
+             -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
+             -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
+             -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
+             -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
+             -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
+             -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
+             -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
+             -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
+             -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
+             -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
+             -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \
+             -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \
+             -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \
+             -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
+             -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
+             -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \
+             -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \
+             -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \
+             < $(srcdir)/string.in.h > $@-t1
+       $(AM_V_at)sed \
+             -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
+             -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
+             -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
+             -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+             -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
+             -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
+             -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
+             -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \
+             -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
+             -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
+             -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
+             -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
+             -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \
+             -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \
+             -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \
+             -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \
+             -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
+             -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
+             -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
+             -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
+             -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \
+             -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \
+             -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \
+             -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
+             -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
+             -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
+             -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
+             -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+             -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
+             -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
+             -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+             -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
+             -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
+             -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
+             -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
+             -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
+             -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
+             -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
+             -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
+             -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
+             -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
+             -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
+             -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
+             -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
+             -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+             -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
+             -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \
+             < $@-t1 > $@-t2
+       $(AM_V_at)rm -f $@-t1
+       $(AM_V_at)mv $@-t2 $@
+MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
+
+Include:
+<string.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/string-h-c++-tests b/modules/string-h-c++-tests
new file mode 100644 (file)
index 0000000..999c773
--- /dev/null
@@ -0,0 +1,20 @@
+Files:
+tests/test-string-h-c++.cc
+tests/test-string-h-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-string-h-c++
+check_PROGRAMS += test-string-h-c++
+test_string_h_c___SOURCES = test-string-h-c++.cc test-string-h-c++2.cc
+test_string_h_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIBC32CONV) $(LIBTHREAD)
+endif
diff --git a/modules/string-h-tests b/modules/string-h-tests
new file mode 100644 (file)
index 0000000..fd34276
--- /dev/null
@@ -0,0 +1,12 @@
+Files:
+tests/test-string-h.c
+
+Depends-on:
+assert-h
+string-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-string-h
+check_PROGRAMS += test-string-h
diff --git a/modules/string-tests b/modules/string-tests
deleted file mode 100644 (file)
index b469c2e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-string.c
-
-Depends-on:
-assert-h
-string-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-string
-check_PROGRAMS += test-string
index eacd0a402907c1985356f5904823cf336bf9cea8..7902267c04171bcab9d524e442c1e9d36f262fd9 100644 (file)
@@ -7,7 +7,7 @@ m4/strncat.m4
 m4/mmap-anon.m4
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 gl_FUNC_STRNCAT
index de91ffde5e6f6d8c5e07f2c4aef5a7b46a2cdf47..ac1188605b362860826d474f19868f2a82270c30 100644 (file)
@@ -10,7 +10,7 @@ This module is obsolete.
 Files:
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 
index af1214817ac2c19dff0276b40966477566c23366..b3b88ea0a5641de54ce84d2b70df56784257659b 100644 (file)
@@ -6,7 +6,7 @@ lib/strndup.c
 m4/strndup.m4
 
 Depends-on:
-string
+string-h
 extensions
 strnlen         [test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1]
 
index 3ef0b850f4b145788f1e9b29f93d6797f67b7670..9880361f1005f41e1e22b8fa6904426c782da496 100644 (file)
@@ -6,7 +6,7 @@ lib/strnlen.c
 m4/strnlen.m4
 
 Depends-on:
-string
+string-h
 extensions
 
 configure.ac:
index 76c0626c6c4215e6e93be6b379c727f8757d8107..61adc7da8f73952a7d1fd97523ef24f324b8d7e5 100644 (file)
@@ -12,7 +12,7 @@ lib/strpbrk.c
 m4/strpbrk.m4
 
 Depends-on:
-string
+string-h
 
 configure.ac:
 gl_FUNC_STRPBRK
index 44df3a08dd8dccd3dd8c2fcd515f9fd83be5049e..37cd9b6541eb2057329772023d16c25f4d559931 100644 (file)
@@ -10,7 +10,7 @@ Depends-on:
 time-h
 extensions
 sys_time        [test $HAVE_STRPTIME = 0]
-string          [test $HAVE_STRPTIME = 0]
+string-h        [test $HAVE_STRPTIME = 0]
 strcase         [test $HAVE_STRPTIME = 0]
 stdbool-h       [test $HAVE_STRPTIME = 0]
 time_r          [test $HAVE_STRPTIME = 0]
index 9717202f12605ed6375fb305a015e6977ee7b6c4..932b2483c041537356d0da355677d7cab4608a82 100644 (file)
@@ -6,7 +6,7 @@ lib/strsep.c
 m4/strsep.m4
 
 Depends-on:
-string
+string-h
 extensions
 strpbrk         [test $HAVE_STRSEP = 0]
 
index 2e8c6ad75913495e14c623dcb15443df164b7ef2..f97a528150cf008fcd1c50cb3044bf29622ab99c 100644 (file)
@@ -7,7 +7,7 @@ lib/siglist.h
 m4/strsignal.m4
 
 Depends-on:
-string
+string-h
 extensions
 gettext-h       [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
 gnulib-i18n     [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
index acc7d1469405a02e5b3b7f28802b92397caa046a..bb4568a66aa0d1080b1ca6d36cda9e8a7047a0d8 100644 (file)
@@ -7,7 +7,7 @@ lib/strstr.c
 m4/strstr.m4
 
 Depends-on:
-string
+string-h
 builtin-expect  [test $REPLACE_STRSTR = 1]
 stdbool-h       [test $REPLACE_STRSTR = 1]
 memchr          [test $REPLACE_STRSTR = 1]
index 32ac475c6df9e402053237a5eec63a63f2adf47b..99d87220bac4af4c57e12482696da08229807f26 100644 (file)
@@ -6,7 +6,7 @@ lib/strtok_r.c
 m4/strtok_r.m4
 
 Depends-on:
-string
+string-h
 strpbrk         [test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1]
 
 configure.ac:
index 79af6778484def49b8c7e7f668de2b7ca4e6ecd8..1bebb2dcda1432058bb027eae3da799f640368ba 100644 (file)
@@ -9,7 +9,7 @@ Depends-on:
 extensions
 libc-config  [test $HAVE_STRVERSCMP = 0 || test $REPLACE_STRVERSCMP = 1]
 stdint-h     [test $HAVE_STRVERSCMP = 0 || test $REPLACE_STRVERSCMP = 1]
-string
+string-h
 
 configure.ac:
 gl_FUNC_STRVERSCMP
index 720dcedf02439b144c58eda4dcbdc05a79e143dd..50b07d318f5837260bf7940be2d01a1d06e92013 100644 (file)
@@ -1,6 +1,6 @@
 Description:
 POSIX compatible vsnprintf() function: print formatted output to a fixed length
-string
+string-h
 
 Comment:
 This module should not be used as a dependency from a test module,
similarity index 100%
rename from tests/test-string.c
rename to tests/test-string-h.c