package/libs/gettext-full/patches/010-m4.patch

   1 --- a/gettext-runtime/gnulib-m4/stddef_h.m4
   2 +++ b/gettext-runtime/gnulib-m4/stddef_h.m4
   3 @@ -8,7 +8,7 @@ dnl with or without modifications, as lo
   4  AC_DEFUN([gl_STDDEF_H],
   5  [
   6    AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
   7 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
   8 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
   9    STDDEF_H=
  10
  11    dnl Test whether the type max_align_t exists and whether its alignment
  12 --- a/gettext-runtime/gnulib-m4/stdint.m4
  13 +++ b/gettext-runtime/gnulib-m4/stdint.m4
  14 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
  15    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
  16
  17    AC_REQUIRE([gl_LIMITS_H])
  18 -  AC_REQUIRE([gt_TYPE_WINT_T])
  19 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
  20
  21    dnl For backward compatibility. Some packages may still be testing these
  22    dnl macros.
  23 --- a/gettext-runtime/gnulib-m4/wchar_h.m4
  24 +++ b/gettext-runtime/gnulib-m4/wchar_h.m4
  25 @@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H],
  26
  27    AC_REQUIRE([gl_FEATURES_H])
  28
  29 -  AC_REQUIRE([gt_TYPE_WINT_T])
  30 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
  31    if test $gt_cv_c_wint_t = yes; then
  32      HAVE_WINT_T=1
  33    else
  34 --- a/gettext-runtime/gnulib-m4/wchar_t.m4
  35 +++ b/gettext-runtime/gnulib-m4/wchar_t.m4
  36 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
  37  dnl Test whether <stddef.h> has the 'wchar_t' type.
  38  dnl Prerequisite: AC_PROG_CC
  39
  40 -AC_DEFUN([gt_TYPE_WCHAR_T],
  41 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
  42  [
  43    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
  44      [AC_COMPILE_IFELSE(
  45 --- a/gettext-runtime/gnulib-m4/wctype_h.m4
  46 +++ b/gettext-runtime/gnulib-m4/wctype_h.m4
  47 @@ -22,7 +22,7 @@ AC_DEFUN([gl_WCTYPE_H],
  48    fi
  49    AC_SUBST([HAVE_ISWCNTRL])
  50
  51 -  AC_REQUIRE([gt_TYPE_WINT_T])
  52 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
  53    if test $gt_cv_c_wint_t = yes; then
  54      HAVE_WINT_T=1
  55    else
  56 --- a/gettext-runtime/gnulib-m4/wcwidth.m4
  57 +++ b/gettext-runtime/gnulib-m4/wcwidth.m4
  58 @@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
  59    dnl Persuade glibc <wchar.h> to declare wcwidth().
  60    AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
  61
  62 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
  63 -  AC_REQUIRE([gt_TYPE_WINT_T])
  64 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
  65 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
  66
  67    AC_CHECK_HEADERS_ONCE([wchar.h])
  68    AC_CHECK_FUNCS_ONCE([wcwidth])
  69 --- a/gettext-runtime/gnulib-m4/wint_t.m4
  70 +++ b/gettext-runtime/gnulib-m4/wint_t.m4
  71 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
  72  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
  73  dnl Prerequisite: AC_PROG_CC
  74
  75 -AC_DEFUN([gt_TYPE_WINT_T],
  76 +AC_DEFUN([gt_TYPE_WINT_T_GT],
  77  [
  78    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
  79      [AC_COMPILE_IFELSE(
  80 --- a/gettext-runtime/intl/Makefile.am
  81 +++ b/gettext-runtime/intl/Makefile.am
  82 @@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h
  83             -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
  84             -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
  85             -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
  86 -           -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
  87 +           -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
  88             -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
  89           < $(srcdir)/libgnuintl.in.h \
  90         | if test '@WOE32DLL@' = yes; then \
  91 @@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h
  92             -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
  93             -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
  94             -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
  95 -           -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
  96 +           -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
  97             -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
  98           < $(srcdir)/libgnuintl.in.h > libintl.h
  99  MOSTLYCLEANFILES += libintl.h
 100 --- a/gettext-runtime/libasprintf/configure.ac
 101 +++ b/gettext-runtime/libasprintf/configure.ac
 102 @@ -76,8 +76,8 @@ dnl Checks for typedefs, structures, and
 103  AC_C_INLINE
 104  AC_TYPE_SIZE_T
 105  AC_TYPE_LONG_LONG_INT
 106 -gt_TYPE_WCHAR_T
 107 -gt_TYPE_WINT_T
 108 +gt_TYPE_WCHAR_T_GT
 109 +gt_TYPE_WINT_T_GT
 110  AC_TYPE_MBSTATE_T
 111  AC_CHECK_TYPE([ptrdiff_t], ,
 112    [AC_DEFINE([ptrdiff_t], [long],
 113 --- a/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4
 114 +++ b/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4
 115 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
 116  dnl Test whether <stddef.h> has the 'wchar_t' type.
 117  dnl Prerequisite: AC_PROG_CC
 118
 119 -AC_DEFUN([gt_TYPE_WCHAR_T],
 120 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
 121  [
 122    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
 123      [AC_COMPILE_IFELSE(
 124 --- a/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4
 125 +++ b/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4
 126 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
 127  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 128  dnl Prerequisite: AC_PROG_CC
 129
 130 -AC_DEFUN([gt_TYPE_WINT_T],
 131 +AC_DEFUN([gt_TYPE_WINT_T_GT],
 132  [
 133    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
 134      [AC_COMPILE_IFELSE(
 135 --- a/gettext-runtime/m4/intl.m4
 136 +++ b/gettext-runtime/m4/intl.m4
 137 @@ -31,8 +31,8 @@ AC_DEFUN([AM_INTL_SUBDIR],
 138    AC_REQUIRE([gl_VISIBILITY])dnl
 139    AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
 140    AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
 141 -  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
 142 -  AC_REQUIRE([gt_TYPE_WINT_T])dnl
 143 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])dnl
 144 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])dnl
 145    AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
 146    AC_REQUIRE([gt_TYPE_INTMAX_T])
 147    AC_REQUIRE([gt_PRINTF_POSIX])
 148 --- a/gettext-tools/gnulib-m4/gnulib-comp.m4
 149 +++ b/gettext-tools/gnulib-m4/gnulib-comp.m4
 150 @@ -1843,8 +1843,8 @@ changequote([, ])dnl
 151    AC_REQUIRE([gl_SOCKETS])
 152    gl_TYPE_SOCKLEN_T
 153    gl_STDALIGN_H
 154 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 155 -  AC_REQUIRE([gt_TYPE_WINT_T])
 156 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 157 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 158    gl_FUNC_STRERROR_R
 159    if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then
 160      AC_LIBOBJ([strerror_r])
 161 --- a/gettext-tools/gnulib-m4/stddef_h.m4
 162 +++ b/gettext-tools/gnulib-m4/stddef_h.m4
 163 @@ -8,7 +8,7 @@ dnl with or without modifications, as lo
 164  AC_DEFUN([gl_STDDEF_H],
 165  [
 166    AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
 167 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 168 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 169    STDDEF_H=
 170
 171    dnl Test whether the type max_align_t exists and whether its alignment
 172 --- a/gettext-tools/gnulib-m4/stdint.m4
 173 +++ b/gettext-tools/gnulib-m4/stdint.m4
 174 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
 175    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 176
 177    AC_REQUIRE([gl_LIMITS_H])
 178 -  AC_REQUIRE([gt_TYPE_WINT_T])
 179 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 180
 181    dnl For backward compatibility. Some packages may still be testing these
 182    dnl macros.
 183 --- a/gettext-tools/gnulib-m4/vasnprintf.m4
 184 +++ b/gettext-tools/gnulib-m4/vasnprintf.m4
 185 @@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
 186  # Prerequisites of lib/printf-args.h, lib/printf-args.c.
 187  AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 188  [
 189 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 190 -  AC_REQUIRE([gt_TYPE_WINT_T])
 191 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 192 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 193  ])
 194
 195  # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
 196  AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 197  [
 198    AC_REQUIRE([gl_FEATURES_H])
 199 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 200 -  AC_REQUIRE([gt_TYPE_WINT_T])
 201 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 202 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 203    AC_REQUIRE([AC_TYPE_SIZE_T])
 204    AC_CHECK_TYPE([ptrdiff_t], ,
 205      [AC_DEFINE([ptrdiff_t], [long],
 206 @@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 207  AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
 208  [
 209    AC_REQUIRE([AC_FUNC_ALLOCA])
 210 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 211 -  AC_REQUIRE([gt_TYPE_WINT_T])
 212 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 213 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 214    AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
 215    dnl Use the _snprintf function only if it is declared (because on NetBSD it
 216    dnl is defined as a weak alias of snprintf; we prefer to use the latter).
 217 --- a/gettext-tools/gnulib-m4/wchar_h.m4
 218 +++ b/gettext-tools/gnulib-m4/wchar_h.m4
 219 @@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H],
 220
 221    AC_REQUIRE([gl_FEATURES_H])
 222
 223 -  AC_REQUIRE([gt_TYPE_WINT_T])
 224 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 225    if test $gt_cv_c_wint_t = yes; then
 226      HAVE_WINT_T=1
 227    else
 228 --- a/gettext-tools/gnulib-m4/wchar_t.m4
 229 +++ b/gettext-tools/gnulib-m4/wchar_t.m4
 230 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
 231  dnl Test whether <stddef.h> has the 'wchar_t' type.
 232  dnl Prerequisite: AC_PROG_CC
 233
 234 -AC_DEFUN([gt_TYPE_WCHAR_T],
 235 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
 236  [
 237    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
 238      [AC_COMPILE_IFELSE(
 239 --- a/gettext-tools/gnulib-m4/wctype_h.m4
 240 +++ b/gettext-tools/gnulib-m4/wctype_h.m4
 241 @@ -22,7 +22,7 @@ AC_DEFUN([gl_WCTYPE_H],
 242    fi
 243    AC_SUBST([HAVE_ISWCNTRL])
 244
 245 -  AC_REQUIRE([gt_TYPE_WINT_T])
 246 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 247    if test $gt_cv_c_wint_t = yes; then
 248      HAVE_WINT_T=1
 249    else
 250 --- a/gettext-tools/gnulib-m4/wcwidth.m4
 251 +++ b/gettext-tools/gnulib-m4/wcwidth.m4
 252 @@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
 253    dnl Persuade glibc <wchar.h> to declare wcwidth().
 254    AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 255
 256 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 257 -  AC_REQUIRE([gt_TYPE_WINT_T])
 258 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 259 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 260
 261    AC_CHECK_HEADERS_ONCE([wchar.h])
 262    AC_CHECK_FUNCS_ONCE([wcwidth])
 263 --- a/gettext-tools/gnulib-m4/wint_t.m4
 264 +++ b/gettext-tools/gnulib-m4/wint_t.m4
 265 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
 266  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 267  dnl Prerequisite: AC_PROG_CC
 268
 269 -AC_DEFUN([gt_TYPE_WINT_T],
 270 +AC_DEFUN([gt_TYPE_WINT_T_GT],
 271  [
 272    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
 273      [AC_COMPILE_IFELSE(
 274 --- a/gettext-tools/intl/Makefile.am
 275 +++ b/gettext-tools/intl/Makefile.am
 276 @@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h
 277             -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
 278             -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
 279             -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
 280 -           -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
 281 +           -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
 282             -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
 283           < $(srcdir)/libgnuintl.in.h \
 284         | if test '@WOE32DLL@' = yes; then \
 285 @@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h
 286             -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
 287             -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
 288             -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
 289 -           -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \
 290 +           -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \
 291             -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
 292           < $(srcdir)/libgnuintl.in.h > libintl.h
 293  MOSTLYCLEANFILES += libintl.h
 294 --- a/libtextstyle/gnulib-m4/stddef_h.m4
 295 +++ b/libtextstyle/gnulib-m4/stddef_h.m4
 296 @@ -8,7 +8,7 @@ dnl with or without modifications, as lo
 297  AC_DEFUN([gl_STDDEF_H],
 298  [
 299    AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
 300 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 301 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 302    STDDEF_H=
 303
 304    dnl Test whether the type max_align_t exists and whether its alignment
 305 --- a/libtextstyle/gnulib-m4/stdint.m4
 306 +++ b/libtextstyle/gnulib-m4/stdint.m4
 307 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
 308    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 309
 310    AC_REQUIRE([gl_LIMITS_H])
 311 -  AC_REQUIRE([gt_TYPE_WINT_T])
 312 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 313
 314    dnl For backward compatibility. Some packages may still be testing these
 315    dnl macros.
 316 --- a/libtextstyle/gnulib-m4/vasnprintf.m4
 317 +++ b/libtextstyle/gnulib-m4/vasnprintf.m4
 318 @@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
 319  # Prerequisites of lib/printf-args.h, lib/printf-args.c.
 320  AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 321  [
 322 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 323 -  AC_REQUIRE([gt_TYPE_WINT_T])
 324 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 325 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 326  ])
 327
 328  # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
 329  AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 330  [
 331    AC_REQUIRE([gl_FEATURES_H])
 332 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 333 -  AC_REQUIRE([gt_TYPE_WINT_T])
 334 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 335 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 336    AC_REQUIRE([AC_TYPE_SIZE_T])
 337    AC_CHECK_TYPE([ptrdiff_t], ,
 338      [AC_DEFINE([ptrdiff_t], [long],
 339 @@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 340  AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
 341  [
 342    AC_REQUIRE([AC_FUNC_ALLOCA])
 343 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 344 -  AC_REQUIRE([gt_TYPE_WINT_T])
 345 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 346 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 347    AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
 348    dnl Use the _snprintf function only if it is declared (because on NetBSD it
 349    dnl is defined as a weak alias of snprintf; we prefer to use the latter).
 350 --- a/libtextstyle/gnulib-m4/wchar_h.m4
 351 +++ b/libtextstyle/gnulib-m4/wchar_h.m4
 352 @@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H],
 353
 354    AC_REQUIRE([gl_FEATURES_H])
 355
 356 -  AC_REQUIRE([gt_TYPE_WINT_T])
 357 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 358    if test $gt_cv_c_wint_t = yes; then
 359      HAVE_WINT_T=1
 360    else
 361 --- a/libtextstyle/gnulib-m4/wchar_t.m4
 362 +++ b/libtextstyle/gnulib-m4/wchar_t.m4
 363 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
 364  dnl Test whether <stddef.h> has the 'wchar_t' type.
 365  dnl Prerequisite: AC_PROG_CC
 366
 367 -AC_DEFUN([gt_TYPE_WCHAR_T],
 368 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
 369  [
 370    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
 371      [AC_COMPILE_IFELSE(
 372 --- a/libtextstyle/gnulib-m4/wint_t.m4
 373 +++ b/libtextstyle/gnulib-m4/wint_t.m4
 374 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
 375  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 376  dnl Prerequisite: AC_PROG_CC
 377
 378 -AC_DEFUN([gt_TYPE_WINT_T],
 379 +AC_DEFUN([gt_TYPE_WINT_T_GT],
 380  [
 381    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
 382      [AC_COMPILE_IFELSE(