You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

73 lines
2.3 KiB

  1. --- a/m4/stdint.m4
  2. +++ b/m4/stdint.m4
  3. @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
  4. AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
  5. AC_REQUIRE([gl_LIMITS_H])
  6. - AC_REQUIRE([gt_TYPE_WINT_T])
  7. + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  8. dnl For backward compatibility. Some packages may still be testing these
  9. dnl macros.
  10. --- a/m4/vasnprintf.m4
  11. +++ b/m4/vasnprintf.m4
  12. @@ -33,7 +33,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
  13. AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
  14. [
  15. AC_REQUIRE([gt_TYPE_WCHAR_T])
  16. - AC_REQUIRE([gt_TYPE_WINT_T])
  17. + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  18. ])
  19. # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
  20. @@ -41,7 +41,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
  21. [
  22. AC_REQUIRE([gl_FEATURES_H])
  23. AC_REQUIRE([gt_TYPE_WCHAR_T])
  24. - AC_REQUIRE([gt_TYPE_WINT_T])
  25. + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  26. AC_REQUIRE([AC_TYPE_SIZE_T])
  27. AC_CHECK_TYPE([ptrdiff_t], ,
  28. [AC_DEFINE([ptrdiff_t], [long],
  29. @@ -55,7 +55,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
  30. [
  31. AC_REQUIRE([AC_FUNC_ALLOCA])
  32. AC_REQUIRE([gt_TYPE_WCHAR_T])
  33. - AC_REQUIRE([gt_TYPE_WINT_T])
  34. + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  35. AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
  36. dnl Use the _snprintf function only if it is declared (because on NetBSD it
  37. dnl is defined as a weak alias of snprintf; we prefer to use the latter).
  38. --- a/m4/wchar_t.m4
  39. +++ b/m4/wchar_t.m4
  40. @@ -8,7 +8,7 @@ dnl From Bruno Haible.
  41. dnl Test whether <stddef.h> has the 'wchar_t' type.
  42. dnl Prerequisite: AC_PROG_CC
  43. -AC_DEFUN([gt_TYPE_WCHAR_T],
  44. +AC_DEFUN([gt_TYPE_WCHAR_T_GNUTLS],
  45. [
  46. AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
  47. [AC_COMPILE_IFELSE(
  48. --- a/m4/wint_t.m4
  49. +++ b/m4/wint_t.m4
  50. @@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint
  51. dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
  52. dnl Prerequisite: AC_PROG_CC
  53. -AC_DEFUN([gt_TYPE_WINT_T],
  54. +AC_DEFUN([gt_TYPE_WINT_T_GNUTLS],
  55. [
  56. AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
  57. [AC_COMPILE_IFELSE(
  58. --- a/src/gl/m4/gnulib-comp.m4
  59. +++ b/src/gl/m4/gnulib-comp.m4
  60. @@ -1064,7 +1064,7 @@ changequote([, ])dnl
  61. gl_UNISTD_MODULE_INDICATOR([sleep])
  62. AC_CHECK_DECLS_ONCE([alarm])
  63. AC_REQUIRE([gt_TYPE_WCHAR_T])
  64. - AC_REQUIRE([gt_TYPE_WINT_T])
  65. + AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS])
  66. gl_FUNC_STRERROR_R
  67. if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then
  68. AC_LIBOBJ([strerror_r])