X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbsnrtowcs.m4;h=d72942f033aa2896d151d685e07b1b1836b5fcb4;hb=23db13ed046cc279d59d4d78fb254c160846a09f;hp=b61da902b26a7190a785c670b745ef989c3ddb9e;hpb=6906a95bfc7fc83e4ffa7ef2f68e377157d926f7;p=gnulib.git

diff --git a/m4/mbsnrtowcs.m4 b/m4/mbsnrtowcs.m4
index b61da902b..d72942f03 100644
--- a/m4/mbsnrtowcs.m4
+++ b/m4/mbsnrtowcs.m4
@@ -1,5 +1,5 @@
-# mbsnrtowcs.m4 serial 1
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# mbsnrtowcs.m4 serial 3
+dnl Copyright (C) 2008, 2010-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.
@@ -13,15 +13,16 @@ AC_DEFUN([gl_FUNC_MBSNRTOWCS],
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   gl_MBSTATE_T_BROKEN
-  if test $REPLACE_MBSTATE_T = 1; then
-    REPLACE_MBSNRTOWCS=1
-  fi
+
   AC_CHECK_FUNCS_ONCE([mbsnrtowcs])
   if test $ac_cv_func_mbsnrtowcs = no; then
     HAVE_MBSNRTOWCS=0
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSNRTOWCS=1
+    fi
   fi
   if test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1; then
-    gl_REPLACE_WCHAR_H
     AC_LIBOBJ([mbsnrtowcs])
     AC_LIBOBJ([mbsrtowcs-state])
     gl_PREREQ_MBSNRTOWCS