Re: [bug-gnulib] Re: mbrtowc.m4 on mingw32

[Bruno Haible]

Paul Eggert wrote:
> Yes, if the current Autoconf macro works
> for Bruno, we should simply use a copy of it in gnulib.

Yes, this macro works on mingw as well. I committed this patch.

2005-07-05  Bruno Haible  <address@hidden>

        * mbrtowc.m4 (gl_FUNC_MBRTOWC): Upgrade to version from current
        autoconf CVS. Needed for mingw.

diff -r -c3 --exclude=Makefile.in --exclude=configure --exclude=aclocal.m4 
gettext-0.14.5.orig/gettext-tools/m4/mbrtowc.m4 
gettext-0.14.5-mingw/gettext-tools/m4/mbrtowc.m4
*** gettext-0.14.5.orig/gettext-tools/m4/mbrtowc.m4     2005-01-19 
15:24:18.000000000 +0100
--- gettext-0.14.5-mingw/gettext-tools/m4/mbrtowc.m4    2005-07-06 
02:14:36.192321408 +0200
***************
*** 1,5 ****
! # mbrtowc.m4 serial 7
! dnl Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # mbrtowc.m4 serial 8
! dnl Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,25 ****
  dnl From Paul Eggert
  
  dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with
! dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere.
  
  AC_DEFUN([gl_FUNC_MBRTOWC],
  [
    AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
      gl_cv_func_mbrtowc,
!     [AC_TRY_LINK(
!        [#include <wchar.h>],
!        [mbstate_t state; return ! (sizeof state && mbrtowc);],
         gl_cv_func_mbrtowc=yes,
         gl_cv_func_mbrtowc=no)])
    if test $gl_cv_func_mbrtowc = yes; then
!     AC_DEFINE(HAVE_MBRTOWC, 1,
        [Define to 1 if mbrtowc and mbstate_t are properly declared.])
    fi
  ])
--- 7,31 ----
  dnl From Paul Eggert
  
  dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with
! dnl AC_FUNC_MBRTOWC, when autoconf 2.60 can be assumed everywhere.
  
  AC_DEFUN([gl_FUNC_MBRTOWC],
  [
+   dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60.
    AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
      gl_cv_func_mbrtowc,
!     [AC_LINK_IFELSE(
!        [AC_LANG_PROGRAM(
!             [[#include <wchar.h>]],
!             [[wchar_t wc;
!               char const s[] = "";
!               size_t n = 1;
!               mbstate_t state;
!               return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));]])],
         gl_cv_func_mbrtowc=yes,
         gl_cv_func_mbrtowc=no)])
    if test $gl_cv_func_mbrtowc = yes; then
!     AC_DEFINE([HAVE_MBRTOWC], 1,
        [Define to 1 if mbrtowc and mbstate_t are properly declared.])
    fi
  ])