Make mbiter, mbuiter, mbfile usable also if !HAVE_MBRTOWC.

diff --git a/ChangeLog b/ChangeLog
index 9c139e63048cb147989af7516f400e6b3f10609d..ea31f30abc2880be77dda5c4d6ac13a7509a91f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-12-21  Bruno Haible  <bruno@clisp.org>
+
+       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 <alanh@fairlite.co.uk>
+       via Sergey Poznyakoff <gray@gnu.org.ua>.
+
 2008-12-21  Bruno Haible  <bruno@clisp.org>
 
        * MODULES.html.sh (Extended multibyte and wide character utilities

diff --git a/NEWS b/NEWS
index 45c23ce66d4769d64e91380c95e8ddc46ca32876..d69ad0a5c7afe1f27d45d39d7ffa92934522969f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,13 @@ User visible incompatible changes
 
 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.
 

diff --git a/m4/mbfile.m4 b/m4/mbfile.m4
index d2fc3c454218cbb6a633b955b2e41dc67b21181c..ec862a861317a955ad7c743d1c9eddc3988a114e 100644 (file)
--- a/m4/mbfile.m4
+++ b/m4/mbfile.m4
@@ -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_DEFUN([gl_MBFILE],
 [
   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])
   :
 ])

diff --git a/m4/mbiter.m4 b/m4/mbiter.m4
index 828376878eea41ef2050bc09f53502b6120139da..88ba5694039327676f5d57ed5185b59c48c789c1 100644 (file)
--- a/m4/mbiter.m4
+++ b/m4/mbiter.m4
@@ -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_DEFUN([gl_MBITER],
 [
   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])
   :
 ])

diff --git a/modules/mbfile b/modules/mbfile
index d6787b41c1b9e16d25bc7d143ce43e374e67c2a7..1d2f5156cf7eb9d310577ecd6047259f828bc76b 100644 (file)
--- a/modules/mbfile
+++ b/modules/mbfile
@@ -8,6 +8,8 @@ m4/mbrtowc.m4
 
 Depends-on:
 mbchar
+mbrtowc
+mbsinit
 wchar
 stdbool
 
@@ -18,9 +20,7 @@ Makefile.am:
 lib_SOURCES += mbfile.h
 
 Include:
-#if HAVE_MBRTOWC
 #include "mbfile.h"
-#endif
 
 License:
 LGPL

diff --git a/modules/mbiter b/modules/mbiter
index 427cbe104d74012ec63dab2ea3381ebdcdf86510..af55076e11cf818b45cd20052191537d3d01a8a3 100644 (file)
--- a/modules/mbiter
+++ b/modules/mbiter
@@ -8,6 +8,8 @@ m4/mbrtowc.m4
 
 Depends-on:
 mbchar
+mbrtowc
+mbsinit
 wchar
 stdbool
 
@@ -18,9 +20,7 @@ Makefile.am:
 lib_SOURCES += mbiter.h
 
 Include:
-#if HAVE_MBRTOWC
 #include "mbiter.h"
-#endif
 
 License:
 LGPL

diff --git a/modules/mbuiter b/modules/mbuiter
index fbcabe3cf37f984fd3bb83817709514161f86c3b..b828e643e8d71cc902e2d4370b2a2ef26d3411a0 100644 (file)
--- a/modules/mbuiter
+++ b/modules/mbuiter
@@ -8,6 +8,8 @@ m4/mbrtowc.m4
 
 Depends-on:
 mbchar
+mbrtowc
+mbsinit
 wchar
 stdbool
 strnlen1
@@ -19,9 +21,7 @@ Makefile.am:
 lib_SOURCES += mbuiter.h
 
 Include:
-#if HAVE_MBRTOWC
 #include "mbuiter.h"
-#endif
 
 License:
 LGPL