mbfile, mbiter: Complete change from 2008-12-21.

* m4/mbfile.m4 (gl_MBFILE): Don't require AC_FUNC_MBRTOWC.
* m4/mbiter.m4 (gl_MBITER): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9ee388eb2da169e469971eb618218785f8531752..8ac17f98b09851633ef01902afb05d5f0e14a2d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-20  Bruno Haible  <bruno@clisp.org>
+
+       mbfile, mbiter: Complete change from 2008-12-21.
+       * m4/mbfile.m4 (gl_MBFILE): Don't require AC_FUNC_MBRTOWC.
+       * m4/mbiter.m4 (gl_MBITER): Likewise.
+
 2011-01-20  Jim Meyering  <meyering@redhat.com>
 
        init.sh: insert space between each function name and "()"

diff --git a/m4/mbfile.m4 b/m4/mbfile.m4
index 4e7b40d0e95eafe5ec1f5c608d016ed009d1edfe..4e53a6bd430c2c68affb73eae9536fb3544d9829 100644 (file)
--- a/m4/mbfile.m4
+++ b/m4/mbfile.m4
@@ -1,4 +1,4 @@
-# mbfile.m4 serial 5
+# mbfile.m4 serial 6
 dnl Copyright (C) 2005, 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,
@@ -11,8 +11,5 @@ AC_DEFUN([gl_MBFILE],
 [
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  dnl The following line is that so the user can test HAVE_MBRTOWC before
-  dnl #include "mbfile.h". It can be removed in 2010.
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
   :
 ])

diff --git a/m4/mbiter.m4 b/m4/mbiter.m4
index cb7ec042bc21985ad61aa134cf6ca483ce436525..8582b30b0685281e28de4ae215a5b4173baba5d1 100644 (file)
--- a/m4/mbiter.m4
+++ b/m4/mbiter.m4
@@ -1,4 +1,4 @@
-# mbiter.m4 serial 5
+# mbiter.m4 serial 6
 dnl Copyright (C) 2005, 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,
@@ -11,8 +11,5 @@ AC_DEFUN([gl_MBITER],
 [
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  dnl The following line is that so the user can test HAVE_MBRTOWC before
-  dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010.
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
   :
 ])