X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwcsnrtombs.m4;h=d1fac8ca8be382d77c751f45ece362dda5f6dc0f;hb=1062e7a84e38a0e708fa3a7de81bba8ad45a2d45;hp=e16278c5949d12fb0bdc8bab72885b55fb5fbd0d;hpb=eea4c1569af3cfd540e449fce0997fc94a096325;p=gnulib.git

diff --git a/m4/wcsnrtombs.m4 b/m4/wcsnrtombs.m4
index e16278c59..d1fac8ca8 100644
--- a/m4/wcsnrtombs.m4
+++ b/m4/wcsnrtombs.m4
@@ -1,5 +1,5 @@
-# wcsnrtombs.m4 serial 2
-dnl Copyright (C) 2008-2009 Free Software Foundation, Inc.
+# wcsnrtombs.m4 serial 5
+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.
@@ -10,18 +10,14 @@ AC_DEFUN([gl_FUNC_WCSNRTOMBS],
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   gl_MBSTATE_T_BROKEN
-  if test $REPLACE_MBSTATE_T = 1; then
-    REPLACE_WCSNRTOMBS=1
-  fi
+
   AC_CHECK_FUNCS_ONCE([wcsnrtombs])
   if test $ac_cv_func_wcsnrtombs = no; then
     HAVE_WCSNRTOMBS=0
-  fi
-  if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then
-    gl_REPLACE_WCHAR_H
-    AC_LIBOBJ([wcsnrtombs])
-    AC_LIBOBJ([wcsrtombs-state])
-    gl_PREREQ_WCSNRTOMBS
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_WCSNRTOMBS=1
+    fi
   fi
 ])