X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbchar.m4;h=f95e9267c32af80f3106c8d1e29340036dd05012;hb=ce401f14c2ef12dc46725ffd6f076b75c6ec72a0;hp=df351a6eb24ae2c53fb1d33dc8759188676c4bb6;hpb=be4b03ff802ce76ee841d09d7546039d5e991127;p=gnulib.git

diff --git a/m4/mbchar.m4 b/m4/mbchar.m4
index df351a6eb..f95e9267c 100644
--- a/m4/mbchar.m4
+++ b/m4/mbchar.m4
@@ -1,5 +1,5 @@
-# mbchar.m4 serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# mbchar.m4 serial 4
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,11 +10,14 @@ dnl From Bruno Haible.
 AC_DEFUN([gl_MBCHAR],
 [
   AC_REQUIRE([AC_GNU_SOURCE])
-  dnl The following line is that so the user can test
-  dnl HAVE_WCHAR_H && HAVE_WCTYPE_H before #include "mbchar.h".
-  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
-  dnl Compile mbchar.c only if HAVE_WCHAR_H && HAVE_WCTYPE_H.
-  if test $ac_cv_header_wchar_h = yes && test $ac_cv_header_wctype_h = yes; then
+  dnl The following line is that so the user can test HAVE_WCHAR_H
+  dnl before #include "mbchar.h".
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  dnl Compile mbchar.c only if HAVE_WCHAR_H.
+  if test $ac_cv_header_wchar_h = yes; then
     AC_LIBOBJ([mbchar])
+    dnl Prerequisites of mbchar.h and mbchar.c.
+    AC_CHECK_HEADERS_ONCE([wctype.h])
+    AC_CHECK_FUNCS([iswcntrl])
   fi
 ])