Index: m4/mbchar.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mbchar.m4,v
retrieving revision 1.1
diff -u -p -r1.1 mbchar.m4
--- m4/mbchar.m4	16 Aug 2005 12:06:55 -0000	1.1
+++ m4/mbchar.m4	2 Sep 2005 21:24:58 -0000
@@ -9,6 +9,13 @@ dnl From Bruno Haible.
 
 AC_DEFUN([gl_MBCHAR],
 [
+  AC_LIBSOURCES([mbchar.c, mbchar.h])
+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
+
+  if test x$ac_cv_header_wchar_h = xyes && test x$ac_cv_header_wctype_h = xyes; then
+  	AC_LIBOBJ(mbchar)
+  fi
+
   AC_REQUIRE([AC_GNU_SOURCE])
   :
 ])
Index: modules/mbchar
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/mbchar,v
retrieving revision 1.1
diff -u -p -r1.1 mbchar
--- modules/mbchar	16 Aug 2005 12:06:55 -0000	1.1
+++ modules/mbchar	2 Sep 2005 21:24:58 -0000
@@ -13,7 +13,6 @@ configure.ac:
 gl_MBCHAR
 
 Makefile.am:
-lib_SOURCES += mbchar.h mbchar.c
 
 Include:
 "mbchar.h"