problem with mbchar module on OpenBSD

[Paul Eggert]

With coreutils CVS on OpenBSD 3.4, I ran into the same problem with
the mbchar module that Yoann Vandoorselaere first reported with OpenBSD 3.7 in
<http://lists.gnu.org/archive/html/bug-gnulib/2005-09/msg00006.html>.

I installed the following patch into coreutils, which is about the
same as Derek Price's proposed gnulib patch
<http://lists.gnu.org/archive/html/bug-gnulib/2005-09/msg00242.html>.

2005-09-24  Paul Eggert  <address@hidden>

        * lib/Makefile.am (libcoreutils_a_SOURCES): Remove mbchar.c, since
        it doesn't build in OpenBSD 3.4.  See
        <http://lists.gnu.org/archive/html/bug-gnulib/2005-09/msg00242.html>.
        * m4/mbchar.m4 (gl_MBCHAR): Check for wchar.h and wctype.h, and
        don't compile mbchar.c unless both headers exist.  See
        <http://lists.gnu.org/archive/html/bug-gnulib/2005-09/msg00242.html>.

--- lib/Makefile.am     22 Sep 2005 06:58:56 -0000      1.233
+++ lib/Makefile.am     24 Sep 2005 23:06:14 -0000
@@ -35,7 +35,7 @@ libcoreutils_a_SOURCES = \
   getaddrinfo.h \
   gettext.h \
   localcharset.c localcharset.h \
-  mbchar.c mbchar.h \
+  mbchar.h \
   mbswidth.c mbswidth.h \
   mbuiter.h \
   readtokens0.c readtokens0.h \
--- m4/mbchar.m4        22 Sep 2005 06:22:44 -0000      1.1
+++ m4/mbchar.m4        24 Sep 2005 23:06:14 -0000
@@ -1,4 +1,4 @@
-# mbchar.m4 serial 1
+# mbchar.m4 serial 2
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,13 @@ dnl From Bruno Haible.
 
 AC_DEFUN([gl_MBCHAR],
 [
+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
+
+  case $ac_cv_header_wchar_h,$ac_cv_header_wctype_h in
+  yes,yes)
+    AC_LIBOBJ([mbchar]);;
+  esac
+
   AC_REQUIRE([AC_GNU_SOURCE])
   :
 ])