tools/coreutils/patches/001-m4.patch

   1 --- a/m4/gnulib-comp.m4
   2 +++ b/m4/gnulib-comp.m4
   3 @@ -2671,7 +2671,7 @@ changequote([, ])dnl
   4    fi
   5    gl_SYS_SOCKET_MODULE_INDICATOR([socket])
   6    AC_REQUIRE([gt_TYPE_WCHAR_T])
   7 -  AC_REQUIRE([gt_TYPE_WINT_T])
   8 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
   9    gl_FUNC_STRERROR_R
  10    AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [
  11      AC_LIBOBJ([strerror_r])
  12 --- a/m4/stdint.m4
  13 +++ b/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_GNUTLS])
  20
  21    dnl For backward compatibility. Some packages may still be testing these
  22    dnl macros.
  23 --- a/m4/vasnprintf.m4
  24 +++ b/m4/vasnprintf.m4
  25 @@ -33,7 +33,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
  26  AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
  27  [
  28    AC_REQUIRE([gt_TYPE_WCHAR_T])
  29 -  AC_REQUIRE([gt_TYPE_WINT_T])
  30 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  31  ])
  32
  33  # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
  34 @@ -41,7 +41,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
  35  [
  36    AC_REQUIRE([gl_FEATURES_H])
  37    AC_REQUIRE([gt_TYPE_WCHAR_T])
  38 -  AC_REQUIRE([gt_TYPE_WINT_T])
  39 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  40    AC_REQUIRE([AC_TYPE_SIZE_T])
  41    AC_CHECK_TYPE([ptrdiff_t], ,
  42      [AC_DEFINE([ptrdiff_t], [long],
  43 @@ -55,7 +55,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
  44  [
  45    AC_REQUIRE([AC_FUNC_ALLOCA])
  46    AC_REQUIRE([gt_TYPE_WCHAR_T])
  47 -  AC_REQUIRE([gt_TYPE_WINT_T])
  48 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  49    AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
  50    dnl Use the _snprintf function only if it is declared (because on NetBSD it
  51    dnl is defined as a weak alias of snprintf; we prefer to use the latter).
  52 --- a/m4/wchar_h.m4
  53 +++ b/m4/wchar_h.m4
  54 @@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  55
  56    AC_REQUIRE([gl_FEATURES_H])
  57
  58 -  AC_REQUIRE([gt_TYPE_WINT_T])
  59 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  60    if test $gt_cv_c_wint_t = yes; then
  61      HAVE_WINT_T=1
  62    else
  63 --- a/m4/wctype_h.m4
  64 +++ b/m4/wctype_h.m4
  65 @@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
  66    fi
  67    AC_SUBST([HAVE_ISWCNTRL])
  68
  69 -  AC_REQUIRE([gt_TYPE_WINT_T])
  70 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  71    if test $gt_cv_c_wint_t = yes; then
  72      HAVE_WINT_T=1
  73    else
  74 --- a/m4/wcwidth.m4
  75 +++ b/m4/wcwidth.m4
  76 @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
  77    AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
  78
  79    AC_REQUIRE([gt_TYPE_WCHAR_T])
  80 -  AC_REQUIRE([gt_TYPE_WINT_T])
  81 +  AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  82
  83    AC_CHECK_HEADERS_ONCE([wchar.h])
  84    AC_CHECK_FUNCS_ONCE([wcwidth])
  85 --- a/m4/wint_t.m4
  86 +++ b/m4/wint_t.m4
  87 @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
  88  dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
  89  dnl Prerequisite: AC_PROG_CC
  90
  91 -AC_DEFUN([gt_TYPE_WINT_T],
  92 +AC_DEFUN([gt_TYPE_WINT_T_GNUTLS],
  93  [
  94    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
  95      [AC_COMPILE_IFELSE(