X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwcsnrtombs.m4;h=5607807bfd73ac385083e474bf7fa41f067c8a5f;hb=939dedd9a2fba934e5ff0313155f9f5f39cb6f6f;hp=9aef477e99197c77600b438de2c3d70d8a796423;hpb=a35b7df64eb0863e3d0759691e4d041354d7030f;p=gnulib.git

diff --git a/m4/wcsnrtombs.m4 b/m4/wcsnrtombs.m4
index 9aef477e9..5607807bf 100644
--- a/m4/wcsnrtombs.m4
+++ b/m4/wcsnrtombs.m4
@@ -1,5 +1,5 @@
-# wcsnrtombs.m4 serial 1
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# wcsnrtombs.m4 serial 3
+dnl Copyright (C) 2008-2011 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.
@@ -9,9 +9,17 @@ AC_DEFUN([gl_FUNC_WCSNRTOMBS],
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+
   AC_CHECK_FUNCS_ONCE([wcsnrtombs])
   if test $ac_cv_func_wcsnrtombs = no; then
     HAVE_WCSNRTOMBS=0
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_WCSNRTOMBS=1
+    fi
+  fi
+  if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then
     gl_REPLACE_WCHAR_H
     AC_LIBOBJ([wcsnrtombs])
     AC_LIBOBJ([wcsrtombs-state])