libs/gnutls/patches/010-m4.patch

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