diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-09-22 06:44:26 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-09-22 06:44:26 +0000 |
| commit | eba2793d1131e5c03d6357d5a727120340836e8f (patch) | |
| tree | 992c967b6e97d1793e15adfe32bda95b67b9c8f1 /m4/mbrtowc.m4 | |
| parent | da6ced865126d933c839f19ce9dd002b71d1d5a3 (diff) | |
| download | coreutils-eba2793d1131e5c03d6357d5a727120340836e8f.tar.xz | |
Nontrivial sync from gnulib.
Diffstat (limited to 'm4/mbrtowc.m4')
| -rw-r--r-- | m4/mbrtowc.m4 | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 2eee1a64f..a3bd9114c 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 7 -dnl Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. +# 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,19 +7,25 @@ dnl with or without modifications, as long as this notice is preserved. 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. +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_TRY_LINK( - [#include <wchar.h>], - [mbstate_t state; return ! (sizeof state && 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, + AC_DEFINE([HAVE_MBRTOWC], 1, [Define to 1 if mbrtowc and mbstate_t are properly declared.]) fi ]) |