X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbsnrtowcs.m4;h=28e4921adae359e5454fceea924d06eb971b2063;hb=1aeca770e12bdc87d6cfe0e43cc2f37a910213a0;hp=3b15e2670689b9c45f41995bc16f6888fee82b30;hpb=3030c5b5e0a5199e16b05927da72c43c42f211c3;p=gnulib.git

diff --git a/m4/mbsnrtowcs.m4 b/m4/mbsnrtowcs.m4
index 3b15e2670..28e4921ad 100644
--- a/m4/mbsnrtowcs.m4
+++ b/m4/mbsnrtowcs.m4
@@ -1,5 +1,5 @@
-# mbsnrtowcs.m4 serial 1
-dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# mbsnrtowcs.m4 serial 4
+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,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
 ])