---- a/gettext-tools/intl/Makefile.am
-+++ b/gettext-tools/intl/Makefile.am
-@@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h
- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-- -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
-+ -e 's,@''HAVE_NAMELESS_LOCALES''@,0,g' \
- -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
- < $(srcdir)/libgnuintl.in.h \
- | if test '@WOE32DLL@' = yes; then \
-@@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h
- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-- -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
-+ -e 's,@''HAVE_NAMELESS_LOCALES''@,0,g' \
- -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
- < $(srcdir)/libgnuintl.in.h > libintl.h
- MOSTLYCLEANFILES += libintl.h
---- a/libtextstyle/gnulib-m4/stddef_h.m4
-+++ b/libtextstyle/gnulib-m4/stddef_h.m4
-@@ -8,7 +8,7 @@ dnl with or without modifications, as lo
- AC_DEFUN([gl_STDDEF_H],
- [
- AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-- AC_REQUIRE([gt_TYPE_WCHAR_T])
-+ AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
- STDDEF_H=
-
- dnl Test whether the type max_align_t exists and whether its alignment