mbiter, mbuiter, mbfile: make usable on all platforms

[Bruno Haible]

Hi,

It was reported by Sergey Poznyakoff that it is desirable that mbiter and
mbuiter can be used on all platforms, without a fallback code for
platforms like HP-UX 11.00, IRIX 6.5, Solaris 2.6, mingw.

[1] http://lists.gnu.org/archive/html/bug-gnulib/2008-10/msg00554.html


2008-12-21  Bruno Haible  <address@hidden>

        Make mbiter.h, mbuiter.h, mbfile.h usable unconditionally.
        * modules/mbiter (Depends-on): Add mbrtowc, mbsinit.
        (Include): Remove conditionalization.
        * modules/mbuiter (Depends-on): Add mbrtowc, mbsinit.
        (Include): Remove conditionalization.
        * modules/mbfile (Depends-on): Add mbrtowc, mbsinit.
        (Include): Remove conditionalization.
        * m4/mbiter.m4 (gl_MBITER): Deprecate the use of AC_FUNC_MBRTOWC.
        * m4/mbfile.m4 (gl_MBFILE): Likewise.
        * NEWS: Mention the change.
        Reported by Alan Hourihane <address@hidden>
        via Sergey Poznyakoff <address@hidden>.

--- NEWS.orig   2008-12-22 03:36:33.000000000 +0100
+++ NEWS        2008-12-22 01:55:09.000000000 +0100
@@ -6,6 +6,13 @@
 
 Date        Modules         Changes
 
+2008-12-21  mbiter          The header files "mbiter.h", "mbuiter.h",
+            mbuiter         "mbfile.h" can now be included without checking
+            mbfile          HAVE_MBRTOWC. The macro HAVE_MBRTOWC will no
+                            longer be defined by these modules in a year. If
+                            you want to continue to use it, you need to invoke
+                            AC_FUNC_MBRTOWC yourself.
+
 2008-11-11  warnings        This module subsumes the file m4/warning.m4 which
                             was removed.
 
--- modules/mbiter.orig 2008-12-22 03:36:33.000000000 +0100
+++ modules/mbiter      2008-12-22 01:55:09.000000000 +0100
@@ -8,6 +8,8 @@
 
 Depends-on:
 mbchar
+mbrtowc
+mbsinit
 wchar
 stdbool
 
@@ -18,9 +20,7 @@
 lib_SOURCES += mbiter.h
 
 Include:
-#if HAVE_MBRTOWC
 #include "mbiter.h"
-#endif
 
 License:
 LGPL
--- modules/mbuiter.orig        2008-12-22 03:36:33.000000000 +0100
+++ modules/mbuiter     2008-12-22 01:55:09.000000000 +0100
@@ -8,6 +8,8 @@
 
 Depends-on:
 mbchar
+mbrtowc
+mbsinit
 wchar
 stdbool
 strnlen1
@@ -19,9 +21,7 @@
 lib_SOURCES += mbuiter.h
 
 Include:
-#if HAVE_MBRTOWC
 #include "mbuiter.h"
-#endif
 
 License:
 LGPL
--- modules/mbfile.orig 2008-12-22 03:36:33.000000000 +0100
+++ modules/mbfile      2008-12-22 01:55:09.000000000 +0100
@@ -8,6 +8,8 @@
 
 Depends-on:
 mbchar
+mbrtowc
+mbsinit
 wchar
 stdbool
 
@@ -18,9 +20,7 @@
 lib_SOURCES += mbfile.h
 
 Include:
-#if HAVE_MBRTOWC
 #include "mbfile.h"
-#endif
 
 License:
 LGPL
--- m4/mbiter.m4.orig   2008-12-22 03:36:33.000000000 +0100
+++ m4/mbiter.m4        2008-12-22 01:55:09.000000000 +0100
@@ -1,4 +1,4 @@
-# mbiter.m4 serial 3
+# mbiter.m4 serial 4
 dnl Copyright (C) 2005, 2008 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,7 +11,7 @@
 [
   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".
+  dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010.
   AC_REQUIRE([AC_FUNC_MBRTOWC])
   :
 ])
--- m4/mbfile.m4.orig   2008-12-22 03:36:33.000000000 +0100
+++ m4/mbfile.m4        2008-12-22 01:55:09.000000000 +0100
@@ -1,4 +1,4 @@
-# mbfile.m4 serial 3
+# mbfile.m4 serial 4
 dnl Copyright (C) 2005, 2008 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,7 +11,7 @@
 [
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   dnl The following line is that so the user can test HAVE_MBRTOWC before
-  dnl #include "mbfile.h".
+  dnl #include "mbfile.h". It can be removed in 2010.
   AC_REQUIRE([AC_FUNC_MBRTOWC])
   :
 ])