001-m4.patch 2.8 KB

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