chown: Update doc regarding AIX.

[gnulib.git] / m4 / mbsrtowcs.m4

diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index d18ef13..f9c430f 100644 (file)
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,5 +1,5 @@
-# mbsrtowcs.m4 serial 3
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# mbsrtowcs.m4 serial 6
+dnl Copyright (C) 2008-2010 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,23 +10,25 @@ AC_DEFUN([gl_FUNC_MBSRTOWCS],
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   gl_MBSTATE_T_BROKEN
-  if test $REPLACE_MBSTATE_T = 1; then
-    REPLACE_MBSRTOWCS=1
-  fi
+
   AC_CHECK_FUNCS_ONCE([mbsrtowcs])
   if test $ac_cv_func_mbsrtowcs = no; then
     HAVE_MBSRTOWCS=0
-  fi
-  if test $HAVE_MBSRTOWCS != 0 && test $REPLACE_MBSRTOWCS != 1; then
-    gl_MBSRTOWCS_WORKS
-    case "$gl_cv_func_mbsrtowcs_works" in
-      *yes) ;;
-      *) REPLACE_MBSRTOWCS=1 ;;
-    esac
+  else
+    if test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBSRTOWCS=1
+    else
+      gl_MBSRTOWCS_WORKS
+      case "$gl_cv_func_mbsrtowcs_works" in
+        *yes) ;;
+        *) REPLACE_MBSRTOWCS=1 ;;
+      esac
+    fi
   fi
   if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
     gl_REPLACE_WCHAR_H
     AC_LIBOBJ([mbsrtowcs])
+    AC_LIBOBJ([mbsrtowcs-state])
     gl_PREREQ_MBSRTOWCS
   fi
 ])
@@ -109,7 +111,7 @@ int main ()
 }],
           [gl_cv_func_mbsrtowcs_works=yes],
           [gl_cv_func_mbsrtowcs_works=no],
-          [])
+          [:])
       fi
     ])
 ])