X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbsnrtowcs.m4;h=ade74f554a4d71806b0694e2ee100e496744c250;hb=831b84c59ef413c57a36b67344467d66a8a2ba70;hp=b61da902b26a7190a785c670b745ef989c3ddb9e;hpb=6906a95bfc7fc83e4ffa7ef2f68e377157d926f7;p=gnulib.git

diff --git a/m4/mbsnrtowcs.m4 b/m4/mbsnrtowcs.m4
index b61da902b..ade74f554 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 4
+dnl Copyright (C) 2008, 2010-2013 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,18 +13,14 @@ 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
-  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
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSNRTOWCS=1
+    fi
   fi
 ])