+2020-01-04 Bruno Haible <bruno@clisp.org>
+
+ mbrtowc, mbrtoc32: Tighten dependendies.
+ * modules/mbrtowc (Depends-on): Disable hard-locale, mbsinit if
+ REPLACE_MBSTATE_T is 1.
+ (configure.ac): Don't compile lc-charset-dispatch.c and mbtowc-lock.c if
+ REPLACE_MBSTATE_T is 0.
+ * modules/mbrtoc32 (Depends-on): Remove hard-locale, mbsinit. Disable
+ mbrtowc dependency if REPLACE_MBSTATE_T is 1.
+ (configure.ac): Don't compile lc-charset-dispatch.c and mbtowc-lock.c if
+ REPLACE_MBSTATE_T is 0.
+
2020-01-04 Bruno Haible <bruno@clisp.org>
uchar: Decide about _GL_LARGE_CHAR32_T at configure time.
Depends-on:
uchar
-hard-locale [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
-mbrtowc [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
-mbsinit [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
+mbrtowc [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0]
localcharset [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
streq [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
verify [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1]
gl_FUNC_MBRTOC32
if test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; then
AC_LIBOBJ([mbrtoc32])
- AC_LIBOBJ([lc-charset-dispatch])
- AC_LIBOBJ([mbtowc-lock])
+ if test $REPLACE_MBSTATE_T = 1; then
+ AC_LIBOBJ([lc-charset-dispatch])
+ AC_LIBOBJ([mbtowc-lock])
+ gl_PREREQ_MBTOWC_LOCK
+ fi
gl_PREREQ_MBRTOC32
- gl_PREREQ_MBTOWC_LOCK
fi
gl_UCHAR_MODULE_INDICATOR([mbrtoc32])
wchar
extensions
stdint [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
-hard-locale [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
-mbsinit [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
+hard-locale [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
+mbsinit [{ test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; } && test $REPLACE_MBSTATE_T = 0]
localcharset [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
streq [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
verify [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
gl_FUNC_MBRTOWC
if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
AC_LIBOBJ([mbrtowc])
- AC_LIBOBJ([lc-charset-dispatch])
- AC_LIBOBJ([mbtowc-lock])
+ if test $REPLACE_MBSTATE_T = 1; then
+ AC_LIBOBJ([lc-charset-dispatch])
+ AC_LIBOBJ([mbtowc-lock])
+ gl_PREREQ_MBTOWC_LOCK
+ fi
gl_PREREQ_MBRTOWC
- gl_PREREQ_MBTOWC_LOCK
fi
gl_WCHAR_MODULE_INDICATOR([mbrtowc])