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 @@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
   4  AC_DEFUN_ONCE([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
  10    dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
  11    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
  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_ONCE([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_ONCE([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/libasprintf/configure.ac
  81 +++ b/gettext-runtime/libasprintf/configure.ac
  82 @@ -76,8 +76,8 @@ dnl Checks for typedefs, structures, and
  83  AC_C_INLINE
  84  AC_TYPE_SIZE_T
  85  AC_TYPE_LONG_LONG_INT
  86 -gt_TYPE_WCHAR_T
  87 -gt_TYPE_WINT_T
  88 +gt_TYPE_WCHAR_T_GT
  89 +gt_TYPE_WINT_T_GT
  90  AC_TYPE_MBSTATE_T
  91  AC_CHECK_TYPE([ptrdiff_t], ,
  92    [AC_DEFINE([ptrdiff_t], [long],
  93 --- a/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4
  94 +++ b/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4
  95 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
  96  dnl Test whether <stddef.h> has the 'wchar_t' type.
  97  dnl Prerequisite: AC_PROG_CC
  98
  99 -AC_DEFUN([gt_TYPE_WCHAR_T],
 100 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
 101  [
 102    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
 103      [AC_COMPILE_IFELSE(
 104 --- a/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4
 105 +++ b/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4
 106 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
 107  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 108  dnl Prerequisite: AC_PROG_CC
 109
 110 -AC_DEFUN([gt_TYPE_WINT_T],
 111 +AC_DEFUN([gt_TYPE_WINT_T_GT],
 112  [
 113    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
 114      [AC_COMPILE_IFELSE(
 115 --- a/gettext-runtime/m4/intl.m4
 116 +++ b/gettext-runtime/m4/intl.m4
 117 @@ -31,8 +31,8 @@ AC_DEFUN([AM_INTL_SUBDIR],
 118    AC_REQUIRE([gl_VISIBILITY])dnl
 119    AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
 120    AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
 121 -  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
 122 -  AC_REQUIRE([gt_TYPE_WINT_T])dnl
 123 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])dnl
 124 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])dnl
 125    AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
 126    AC_REQUIRE([gt_TYPE_INTMAX_T])
 127    AC_REQUIRE([gt_PRINTF_POSIX])
 128 --- a/gettext-tools/gnulib-m4/stdint.m4
 129 +++ b/gettext-tools/gnulib-m4/stdint.m4
 130 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
 131    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 132
 133    AC_REQUIRE([gl_LIMITS_H])
 134 -  AC_REQUIRE([gt_TYPE_WINT_T])
 135 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 136
 137    dnl For backward compatibility. Some packages may still be testing these
 138    dnl macros.
 139 --- a/gettext-tools/gnulib-m4/vasnprintf.m4
 140 +++ b/gettext-tools/gnulib-m4/vasnprintf.m4
 141 @@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
 142  # Prerequisites of lib/printf-args.h, lib/printf-args.c.
 143  AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 144  [
 145 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 146 -  AC_REQUIRE([gt_TYPE_WINT_T])
 147 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 148 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 149  ])
 150
 151  # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
 152  AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 153  [
 154    AC_REQUIRE([gl_FEATURES_H])
 155 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 156 -  AC_REQUIRE([gt_TYPE_WINT_T])
 157 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 158 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 159    AC_REQUIRE([AC_TYPE_SIZE_T])
 160    AC_CHECK_TYPE([ptrdiff_t], ,
 161      [AC_DEFINE([ptrdiff_t], [long],
 162 @@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 163  AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
 164  [
 165    AC_REQUIRE([AC_FUNC_ALLOCA])
 166 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 167 -  AC_REQUIRE([gt_TYPE_WINT_T])
 168 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 169 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 170    AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
 171    dnl Use the _snprintf function only if it is declared (because on NetBSD it
 172    dnl is defined as a weak alias of snprintf; we prefer to use the latter).
 173 --- a/gettext-tools/gnulib-m4/wchar_h.m4
 174 +++ b/gettext-tools/gnulib-m4/wchar_h.m4
 175 @@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
 176
 177    AC_REQUIRE([gl_FEATURES_H])
 178
 179 -  AC_REQUIRE([gt_TYPE_WINT_T])
 180 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 181    if test $gt_cv_c_wint_t = yes; then
 182      HAVE_WINT_T=1
 183    else
 184 --- a/gettext-tools/gnulib-m4/wchar_t.m4
 185 +++ b/gettext-tools/gnulib-m4/wchar_t.m4
 186 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
 187  dnl Test whether <stddef.h> has the 'wchar_t' type.
 188  dnl Prerequisite: AC_PROG_CC
 189
 190 -AC_DEFUN([gt_TYPE_WCHAR_T],
 191 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
 192  [
 193    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
 194      [AC_COMPILE_IFELSE(
 195 --- a/gettext-tools/gnulib-m4/wctype_h.m4
 196 +++ b/gettext-tools/gnulib-m4/wctype_h.m4
 197 @@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
 198    fi
 199    AC_SUBST([HAVE_ISWCNTRL])
 200
 201 -  AC_REQUIRE([gt_TYPE_WINT_T])
 202 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 203    if test $gt_cv_c_wint_t = yes; then
 204      HAVE_WINT_T=1
 205    else
 206 --- a/gettext-tools/gnulib-m4/wcwidth.m4
 207 +++ b/gettext-tools/gnulib-m4/wcwidth.m4
 208 @@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
 209    dnl Persuade glibc <wchar.h> to declare wcwidth().
 210    AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 211
 212 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 213 -  AC_REQUIRE([gt_TYPE_WINT_T])
 214 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 215 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 216
 217    AC_CHECK_HEADERS_ONCE([wchar.h])
 218    AC_CHECK_FUNCS_ONCE([wcwidth])
 219 --- a/gettext-tools/gnulib-m4/wint_t.m4
 220 +++ b/gettext-tools/gnulib-m4/wint_t.m4
 221 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
 222  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 223  dnl Prerequisite: AC_PROG_CC
 224
 225 -AC_DEFUN([gt_TYPE_WINT_T],
 226 +AC_DEFUN([gt_TYPE_WINT_T_GT],
 227  [
 228    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
 229      [AC_COMPILE_IFELSE(
 230 --- a/libtextstyle/gnulib-m4/stdint.m4
 231 +++ b/libtextstyle/gnulib-m4/stdint.m4
 232 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
 233    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 234
 235    AC_REQUIRE([gl_LIMITS_H])
 236 -  AC_REQUIRE([gt_TYPE_WINT_T])
 237 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 238
 239    dnl For backward compatibility. Some packages may still be testing these
 240    dnl macros.
 241 --- a/libtextstyle/gnulib-m4/vasnprintf.m4
 242 +++ b/libtextstyle/gnulib-m4/vasnprintf.m4
 243 @@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
 244  # Prerequisites of lib/printf-args.h, lib/printf-args.c.
 245  AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 246  [
 247 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 248 -  AC_REQUIRE([gt_TYPE_WINT_T])
 249 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 250 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 251  ])
 252
 253  # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
 254  AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 255  [
 256    AC_REQUIRE([gl_FEATURES_H])
 257 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 258 -  AC_REQUIRE([gt_TYPE_WINT_T])
 259 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 260 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 261    AC_REQUIRE([AC_TYPE_SIZE_T])
 262    AC_CHECK_TYPE([ptrdiff_t], ,
 263      [AC_DEFINE([ptrdiff_t], [long],
 264 @@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 265  AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
 266  [
 267    AC_REQUIRE([AC_FUNC_ALLOCA])
 268 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 269 -  AC_REQUIRE([gt_TYPE_WINT_T])
 270 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 271 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 272    AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
 273    dnl Use the _snprintf function only if it is declared (because on NetBSD it
 274    dnl is defined as a weak alias of snprintf; we prefer to use the latter).
 275 --- a/libtextstyle/gnulib-m4/wchar_h.m4
 276 +++ b/libtextstyle/gnulib-m4/wchar_h.m4
 277 @@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
 278
 279    AC_REQUIRE([gl_FEATURES_H])
 280
 281 -  AC_REQUIRE([gt_TYPE_WINT_T])
 282 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 283    if test $gt_cv_c_wint_t = yes; then
 284      HAVE_WINT_T=1
 285    else
 286 --- a/libtextstyle/gnulib-m4/wchar_t.m4
 287 +++ b/libtextstyle/gnulib-m4/wchar_t.m4
 288 @@ -8,7 +8,7 @@ dnl From Bruno Haible.
 289  dnl Test whether <stddef.h> has the 'wchar_t' type.
 290  dnl Prerequisite: AC_PROG_CC
 291
 292 -AC_DEFUN([gt_TYPE_WCHAR_T],
 293 +AC_DEFUN([gt_TYPE_WCHAR_T_GT],
 294  [
 295    AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
 296      [AC_COMPILE_IFELSE(
 297 --- a/libtextstyle/gnulib-m4/wint_t.m4
 298 +++ b/libtextstyle/gnulib-m4/wint_t.m4
 299 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
 300  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
 301  dnl Prerequisite: AC_PROG_CC
 302
 303 -AC_DEFUN([gt_TYPE_WINT_T],
 304 +AC_DEFUN([gt_TYPE_WINT_T_GT],
 305  [
 306    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
 307      [AC_COMPILE_IFELSE(
 308 --- a/gettext-tools/gnulib-m4/gnulib-comp.m4
 309 +++ b/gettext-tools/gnulib-m4/gnulib-comp.m4
 310 @@ -2218,8 +2218,8 @@ changequote([, ])dnl
 311    AC_REQUIRE([gl_SOCKETLIB])
 312    AC_REQUIRE([gl_SOCKETS])
 313    gl_TYPE_SOCKLEN_T
 314 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 315 -  AC_REQUIRE([gt_TYPE_WINT_T])
 316 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 317 +  AC_REQUIRE([gt_TYPE_WINT_T_GT])
 318    gl_FUNC_STRERROR_R
 319    AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [
 320      AC_LIBOBJ([strerror_r])
 321 --- a/libtextstyle/gnulib-m4/stddef_h.m4
 322 +++ b/libtextstyle/gnulib-m4/stddef_h.m4
 323 @@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
 324  AC_DEFUN_ONCE([gl_STDDEF_H],
 325  [
 326    AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
 327 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 328 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 329
 330    dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
 331    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 332 --- a/gettext-tools/gnulib-m4/stddef_h.m4
 333 +++ b/gettext-tools/gnulib-m4/stddef_h.m4
 334 @@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
 335  AC_DEFUN_ONCE([gl_STDDEF_H],
 336  [
 337    AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
 338 -  AC_REQUIRE([gt_TYPE_WCHAR_T])
 339 +  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
 340
 341    dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
 342    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])