streq: Rename to streq-opt.

* lib/streq-opt.h: Renamed from lib/streq.h.
* modules/streq-opt: Renamed from modules/streq.
* NEWS: Mention the change.
* lib/c32is-impl.h: Include streq-opt.h instead of streq.h.
* lib/c32to-impl.h: Likewise.
* lib/c32rtomb.c: Likewise.
* lib/c32width.c: Likewise.
* lib/lc-charset-dispatch.c: Likewise.
* lib/lc-charset-unicode.c: Likewise.
* lib/mbrtoc32.c: Likewise.
* lib/uniwidth/cjk.h: Likewise.
* lib/wcwidth.c: Likewise.
* modules/c32is* (Depends-on): Add streq-opt. Remove streq.
* modules/c32to* (Depends-on): Likewise.
* modules/c32rtomb (Depends-on): Likewise.
* modules/mbrtoc32 (Depends-on): Likewise.
* modules/mbrtowc (Depends-on): Likewise.
* modules/uchar-h-c23 (Depends-on): Likewise.
* modules/unilbrk/u*-possible-linebreaks (Depends-on): Likewise.
* modules/uniwidth/width (Depends-on): Likewise.
* modules/wcwidth (Depends-on): Likewise.
* MODULES.html.sh: Update.

diff --git a/ChangeLog b/ChangeLog
index 7928d808932e94e22fea23aabac278d5d5cf5075..43929ca5a2251c7461cbd8bdba574b49639b512c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2026-02-21  Bruno Haible  <bruno@clisp.org>
+
+       streq: Rename to streq-opt.
+       * lib/streq-opt.h: Renamed from lib/streq.h.
+       * modules/streq-opt: Renamed from modules/streq.
+       * NEWS: Mention the change.
+       * lib/c32is-impl.h: Include streq-opt.h instead of streq.h.
+       * lib/c32to-impl.h: Likewise.
+       * lib/c32rtomb.c: Likewise.
+       * lib/c32width.c: Likewise.
+       * lib/lc-charset-dispatch.c: Likewise.
+       * lib/lc-charset-unicode.c: Likewise.
+       * lib/mbrtoc32.c: Likewise.
+       * lib/uniwidth/cjk.h: Likewise.
+       * lib/wcwidth.c: Likewise.
+       * modules/c32is* (Depends-on): Add streq-opt. Remove streq.
+       * modules/c32to* (Depends-on): Likewise.
+       * modules/c32rtomb (Depends-on): Likewise.
+       * modules/mbrtoc32 (Depends-on): Likewise.
+       * modules/mbrtowc (Depends-on): Likewise.
+       * modules/uchar-h-c23 (Depends-on): Likewise.
+       * modules/unilbrk/u*-possible-linebreaks (Depends-on): Likewise.
+       * modules/uniwidth/width (Depends-on): Likewise.
+       * modules/wcwidth (Depends-on): Likewise.
+       * MODULES.html.sh: Update.
+
 2026-02-20  Bruno Haible  <bruno@clisp.org>
 
        csharpcomp: Use str_endswith.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index a5e108365e70b5c5a2dcaa1752b493b0a84dd2c3..b274c5696093d0353defc8e2db847840852520f1 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1870,7 +1870,7 @@ func_all_modules ()
   func_module strcasestr
   func_module strcasestr-simple
   func_module strchrnul
-  func_module streq
+  func_module streq-opt
   func_module strerrorname_np
   func_module strerror_r-posix
   func_module string-buffer

diff --git a/NEWS b/NEWS
index 5fea672149971c03c857d8a42e3db20f1cbf574d..10790f391b03346655992de9e46a6d43ca19aa2c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -78,6 +78,9 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2026-02-21  streq           This module is renamed to 'streq-opt'. Its include
+                            file is renamed from "streq.h" to "streq-opt.h".
+
 2025-12-04  issymlinkat     The include file is changed from "issymlink.h" to
                             "issymlinkat.h".
 

diff --git a/lib/c32is-impl.h b/lib/c32is-impl.h
index 7fa7929186d4a0617e4cc8acc3cd225a17c6a735..2cd03dc4d25b57fa285a5dcdb0abcca06f837ad0 100644 (file)
--- a/lib/c32is-impl.h
+++ b/lib/c32is-impl.h
@@ -25,7 +25,7 @@
 
 #if GNULIB_defined_mbstate_t
 # include "localcharset.h"
-# include "streq.h"
+# include "streq-opt.h"
 #endif
 
 #if GL_CHAR32_T_IS_UNICODE

diff --git a/lib/c32rtomb.c b/lib/c32rtomb.c
index 2969fe3e57f54dce34a87b669c8788cd684b07c7..74d38ed754cf2af40569897038553e0544f01db2 100644 (file)
--- a/lib/c32rtomb.c
+++ b/lib/c32rtomb.c
@@ -26,7 +26,7 @@
 
 #include "attribute.h" /* FALLTHROUGH */
 #include "localcharset.h"
-#include "streq.h"
+#include "streq-opt.h"
 
 #if GL_CHAR32_T_IS_UNICODE
 # include "lc-charset-unicode.h"

diff --git a/lib/c32to-impl.h b/lib/c32to-impl.h
index 2528e51dc1cb269cc0e182ccaa3b7525fab5604d..f6eaf5fdb459c6d5921590671c770b286b6b706d 100644 (file)
--- a/lib/c32to-impl.h
+++ b/lib/c32to-impl.h
@@ -21,7 +21,7 @@
 
 #if GNULIB_defined_mbstate_t
 # include "localcharset.h"
-# include "streq.h"
+# include "streq-opt.h"
 #endif
 
 #if GL_CHAR32_T_IS_UNICODE

diff --git a/lib/c32width.c b/lib/c32width.c
index 727c2bd34b781d798a8ed6104de10715e83b0829..da944cfe74c33c4637088b85ef25317f1febd64e 100644 (file)
--- a/lib/c32width.c
+++ b/lib/c32width.c
@@ -29,7 +29,7 @@
 #endif
 
 #if GNULIB_defined_mbstate_t
-# include "streq.h"
+# include "streq-opt.h"
 #endif
 
 #include "localcharset.h"

diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c
index 53a9b2cd9b05b1d069eb898ab0e5a66f383ba89e..09f83f18871795ab3b27c41af8bd317a3889be1c 100644 (file)
--- a/lib/lc-charset-dispatch.c
+++ b/lib/lc-charset-dispatch.c
@@ -24,7 +24,7 @@
 #if GNULIB_defined_mbstate_t
 
 # include "localcharset.h"
-# include "streq.h"
+# include "streq-opt.h"
 
 # if GNULIB_WCHAR_SINGLE_LOCALE
 /* When we know that the locale does not change, provide a speedup by

diff --git a/lib/lc-charset-unicode.c b/lib/lc-charset-unicode.c
index fada05f8c797968fa3e49192a27657df7e2b7a8c..2d8941a2dc231ce3821a369d5014889e7ec4b198 100644 (file)
--- a/lib/lc-charset-unicode.c
+++ b/lib/lc-charset-unicode.c
@@ -35,7 +35,7 @@
 # include <wchar.h>
 
 # include "localcharset.h"
-# include "streq.h"
+# include "streq-opt.h"
 # include "glthread/once.h"
 # include "glthread/tls.h"
 # include "unistr.h"

diff --git a/lib/mbrtoc32.c b/lib/mbrtoc32.c
index 4c8f52670164cef31b6e3e68a29b0db1b5dcb08f..f3570f73ff8c05289188c9c3c2a44b7006dc927d 100644 (file)
--- a/lib/mbrtoc32.c
+++ b/lib/mbrtoc32.c
@@ -87,7 +87,7 @@ mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps)
 # include <wchar.h>
 
 # include "localcharset.h"
-# include "streq.h"
+# include "streq-opt.h"
 
 # if MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ
 #  include "hard-locale.h"

diff --git a/lib/streq.h b/lib/streq-opt.h
similarity index 98%
rename from lib/streq.h
rename to lib/streq-opt.h
index 505fc4ae37068202c712c423c199b3b04063a8c3..31f0e77583d560b1e3cd940f44d28d6e44e9be68 100644 (file)
--- a/lib/streq.h
+++ b/lib/streq-opt.h
@@ -16,8 +16,8 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
-#ifndef _GL_STREQ_H
-#define _GL_STREQ_H
+#ifndef _GL_STREQ_OPT_H
+#define _GL_STREQ_OPT_H
 
 #include <string.h>
 
@@ -183,4 +183,4 @@ streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23,
 }
 #endif
 
-#endif /* _GL_STREQ_H */
+#endif /* _GL_STREQ_OPT_H */

diff --git a/lib/uniwidth/cjk.h b/lib/uniwidth/cjk.h
index bcd49fbf4e29d2e77b6b4dfc0721c16c6ba7b38e..9fc0dbdec38327bf0764adaf23aed5bbee2e9717 100644 (file)
--- a/lib/uniwidth/cjk.h
+++ b/lib/uniwidth/cjk.h
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#include "streq.h"
+#include "streq-opt.h"
 
 static int
 is_cjk_encoding (const char *encoding)

diff --git a/lib/wcwidth.c b/lib/wcwidth.c
index ffcc9778432fd4336f9f78e5c0aaf9f29d67dbc3..0f5c5ea4b055fc9aa120fc6873f80209e8c73ae6 100644 (file)
--- a/lib/wcwidth.c
+++ b/lib/wcwidth.c
@@ -23,7 +23,7 @@
 #include <wctype.h>
 
 #include "localcharset.h"
-#include "streq.h"
+#include "streq-opt.h"
 #include "uniwidth.h"
 
 /* Returns 1 if the current locale is an UTF-8 locale, 0 otherwise.  */

diff --git a/modules/c32isalnum b/modules/c32isalnum
index 04ed803cb269bfcd5bc497cedabb36ecbe026b83..c3a5201a5d5994c001ac35994ef4239348aa9364 100644 (file)
--- a/modules/c32isalnum
+++ b/modules/c32isalnum
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-alnum
 assert-h
 

diff --git a/modules/c32isalpha b/modules/c32isalpha
index 6964786445643c14080050c28cbf0243ceef803f..f23147b1c6e116a18d7f191259c9eaec4a45e6e2 100644 (file)
--- a/modules/c32isalpha
+++ b/modules/c32isalpha
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-alpha
 assert-h
 

diff --git a/modules/c32isblank b/modules/c32isblank
index dfaf3deb434e6b7f87463f7a20294f81d1e592dd..03cfc264590b0aa6e79d277572e4f5a579f750ee 100644 (file)
--- a/modules/c32isblank
+++ b/modules/c32isblank
@@ -19,7 +19,7 @@ wchar-h
 wctype-h
 iswblank
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-blank
 assert-h
 

diff --git a/modules/c32iscntrl b/modules/c32iscntrl
index 46c9ce692f06c4dbc81bbdb28d1312043636a275..0b438c95265d8bfb4cc95c658d685894cb96dabf 100644 (file)
--- a/modules/c32iscntrl
+++ b/modules/c32iscntrl
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-cntrl
 assert-h
 

diff --git a/modules/c32isdigit b/modules/c32isdigit
index 29ffcb890509ff1ead254693c7a8d8aa0600080f..98eeb05247a764b0baabf25d902146da339934ee 100644 (file)
--- a/modules/c32isdigit
+++ b/modules/c32isdigit
@@ -19,7 +19,7 @@ wchar-h
 wctype-h
 iswdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-digit
 assert-h
 

diff --git a/modules/c32isgraph b/modules/c32isgraph
index d99a6603b5a8ea4987e47b42153b9de0d6a298f9..4c3efd9d5b2b09324820e97efee6b94f60b00683 100644 (file)
--- a/modules/c32isgraph
+++ b/modules/c32isgraph
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-graph
 assert-h
 

diff --git a/modules/c32islower b/modules/c32islower
index 01c61a8b91a52ebeabe464ac42c3b7bbb70b02ab..6d4d0eeeb3ce256d974d247fe068798c9ff2887d 100644 (file)
--- a/modules/c32islower
+++ b/modules/c32islower
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-lower
 assert-h
 

diff --git a/modules/c32isprint b/modules/c32isprint
index aefc14d67d6209321e42b23b8a049be4058b6977..0035d5a2a79f032c5eee387018d277a504c2d690 100644 (file)
--- a/modules/c32isprint
+++ b/modules/c32isprint
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-print
 assert-h
 

diff --git a/modules/c32ispunct b/modules/c32ispunct
index 08d2fbb4f7e21664a9befc95bc387f160834db5e..b2bf734121f83a241a7aaee5e15f73621e151b2d 100644 (file)
--- a/modules/c32ispunct
+++ b/modules/c32ispunct
@@ -20,7 +20,7 @@ wchar-h
 wctype-h
 iswpunct
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-punct
 assert-h
 

diff --git a/modules/c32isspace b/modules/c32isspace
index cdb23a31feb020a30da5872e1171314cebd8efb1..c3f8e4603f72a5b84940cd1f3e9e88636ec33316 100644 (file)
--- a/modules/c32isspace
+++ b/modules/c32isspace
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-space
 assert-h
 

diff --git a/modules/c32isupper b/modules/c32isupper
index 801cd2d6a61a079a75ee6e0270efbf0e12eaa9f2..5c05f11b3d32f75c46cf02ddeeaedb74d9cedd63 100644 (file)
--- a/modules/c32isupper
+++ b/modules/c32isupper
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-upper
 assert-h
 

diff --git a/modules/c32isxdigit b/modules/c32isxdigit
index 3591b1c076c828ac240fadce5626007f74059bba..a20caeaa9475141f58416612df161304a2bdd646 100644 (file)
--- a/modules/c32isxdigit
+++ b/modules/c32isxdigit
@@ -20,7 +20,7 @@ wchar-h
 wctype-h
 iswxdigit
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unictype/ctype-xdigit
 assert-h
 

diff --git a/modules/c32rtomb b/modules/c32rtomb
index 8a4e0a0f9400ca9fa856459c6a000fbd77cf9b60..1b1bd000d08abbd8d1dd2df3e1f0359b8fc45d1f 100644 (file)
--- a/modules/c32rtomb
+++ b/modules/c32rtomb
@@ -16,7 +16,7 @@ attribute       [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 wchar-h         [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 wcrtomb         [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1]
 localcharset    [{ test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; } && test $SMALL_WCHAR_T = 1]
-streq           [{ test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; } && test $SMALL_WCHAR_T = 1]
+streq-opt       [{ test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1; } && test $SMALL_WCHAR_T = 1]
 
 configure.ac:
 gl_FUNC_C32RTOMB

diff --git a/modules/c32tolower b/modules/c32tolower
index 139c7e2eee4101813f004a274a9c9d3316cf742b..95dc427cd24069c88f4ee2d902253cf39b930139 100644 (file)
--- a/modules/c32tolower
+++ b/modules/c32tolower
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unicase/tolower
 assert-h
 

diff --git a/modules/c32toupper b/modules/c32toupper
index 10f023742a6e9a2c342e9abebd630dadde07827c..f6a83a3d48cb8eace6a692d2f1ce39b895fe6b5c 100644 (file)
--- a/modules/c32toupper
+++ b/modules/c32toupper
@@ -18,7 +18,7 @@ uchar-h
 wchar-h
 wctype-h
 localcharset    [test $REPLACE_MBSTATE_T = 1]
-streq           [test $REPLACE_MBSTATE_T = 1]
+streq-opt       [test $REPLACE_MBSTATE_T = 1]
 unicase/toupper
 assert-h
 

diff --git a/modules/mbrtoc32 b/modules/mbrtoc32
index ac2391dd79939a74f765181c548bc672def7d333..f8f82575176f06bce5526498727ee37968eb801e 100644 (file)
--- a/modules/mbrtoc32
+++ b/modules/mbrtoc32
@@ -31,7 +31,7 @@ mbsinit         [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && t
 mbszero         [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
 assert-h        [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 localcharset    [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
-streq           [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
+streq-opt       [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
 
 configure.ac:
 gl_FUNC_MBRTOC32

diff --git a/modules/mbrtowc b/modules/mbrtowc
index 7a989178f224b43882fbea36c569387416d55739..cba9487814a7bdc04d76833db6645d6d74c2657d 100644 (file)
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -28,7 +28,7 @@ hard-locale     [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && tes
 mbsinit         [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
 assert-h        [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 localcharset    [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
-streq           [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+streq-opt       [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBRTOWC

diff --git a/modules/streq b/modules/streq-opt
similarity index 82%
rename from modules/streq
rename to modules/streq-opt
index aadce69305128ac7316a554fee53068ad9a01787..6a6ce63402a3c695bbc8918547dee20f83b65cec 100644 (file)
--- a/modules/streq
+++ b/modules/streq-opt
@@ -2,7 +2,7 @@ Description:
 Optimized string comparison.
 
 Files:
-lib/streq.h
+lib/streq-opt.h
 
 Depends-on:
 stringeq
@@ -12,7 +12,7 @@ configure.ac:
 Makefile.am:
 
 Include:
-"streq.h"
+"streq-opt.h"
 
 License:
 LGPLv2+

diff --git a/modules/uchar-h-c23 b/modules/uchar-h-c23
index dec9eaec03fa99e4bd4b574ccaee7af7b712c8ff..b22f68a6ab8cb1d6ada2f4bd398d8628fa898848 100644 (file)
--- a/modules/uchar-h-c23
+++ b/modules/uchar-h-c23
@@ -10,7 +10,7 @@ uchar-h
 wchar-h
 iconv
 localcharset
-streq
+streq-opt
 once
 tls
 mbszero

diff --git a/modules/unilbrk/u16-possible-linebreaks b/modules/unilbrk/u16-possible-linebreaks
index 60a52881089cc38a4641063653574411cf628df3..f2d0c1bde250a2b376b949885748995cbfc19ae6 100644 (file)
--- a/modules/unilbrk/u16-possible-linebreaks
+++ b/modules/unilbrk/u16-possible-linebreaks
@@ -10,7 +10,7 @@ Depends-on:
 unilbrk/base
 unilbrk/tables
 unistr/u16-mbtouc-unsafe
-streq
+streq-opt
 
 configure.ac:
 gl_LIBUNISTRING_MODULE([1.4], [unilbrk/u16-possible-linebreaks])

diff --git a/modules/unilbrk/u32-possible-linebreaks b/modules/unilbrk/u32-possible-linebreaks
index 5921768fc067b011f4ae0fd555b541956e7137ee..fcae636d5d360f71e3e0320ba7d5445a6c5029d9 100644 (file)
--- a/modules/unilbrk/u32-possible-linebreaks
+++ b/modules/unilbrk/u32-possible-linebreaks
@@ -9,7 +9,7 @@ lib/uniwidth/cjk.h
 Depends-on:
 unilbrk/base
 unilbrk/tables
-streq
+streq-opt
 
 configure.ac:
 gl_LIBUNISTRING_MODULE([1.4], [unilbrk/u32-possible-linebreaks])

diff --git a/modules/unilbrk/u8-possible-linebreaks b/modules/unilbrk/u8-possible-linebreaks
index bc47767d236dd8e05382caca459994f6b7c615c1..43b933b39a634b778a75a2130ce017e1d0239c62 100644 (file)
--- a/modules/unilbrk/u8-possible-linebreaks
+++ b/modules/unilbrk/u8-possible-linebreaks
@@ -10,7 +10,7 @@ Depends-on:
 unilbrk/base
 unilbrk/tables
 unistr/u8-mbtouc-unsafe
-streq
+streq-opt
 
 configure.ac:
 gl_LIBUNISTRING_MODULE([1.4], [unilbrk/u8-possible-linebreaks])

diff --git a/modules/uniwidth/width b/modules/uniwidth/width
index 323221f2803c255e4357da531cdd11548074ebfd..68faff17a288c5cd2823a718d3e4ce61ab9e3a30 100644 (file)
--- a/modules/uniwidth/width
+++ b/modules/uniwidth/width
@@ -10,7 +10,7 @@ lib/unictype/bitmap.h
 
 Depends-on:
 uniwidth/base
-streq
+streq-opt
 
 configure.ac:
 gl_LIBUNISTRING_MODULE([1.4], [uniwidth/width])

diff --git a/modules/wcwidth b/modules/wcwidth
index d1cae499183d910f58aa7c1575c849fd4882807d..0573636a4c90dfea723f6754bf9ca774ead58ca8 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -11,7 +11,7 @@ wchar-h
 extensions
 wctype-h        [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 localcharset    [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
-streq           [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+streq-opt       [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 uniwidth/width  [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 
 configure.ac: