X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbchar.m4;h=763dd81e3e3a31192d7a7aaabf122548b1fb3962;hb=06a366de002272748bd110dcd4da6d967ff57d46;hp=f95e9267c32af80f3106c8d1e29340036dd05012;hpb=09cc2e4029b6e1601a44a05688449b9834918fae;p=gnulib.git

diff --git a/m4/mbchar.m4 b/m4/mbchar.m4
index f95e9267c..763dd81e3 100644
--- a/m4/mbchar.m4
+++ b/m4/mbchar.m4
@@ -1,5 +1,5 @@
-# mbchar.m4 serial 4
-dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
+# mbchar.m4 serial 8
+dnl Copyright (C) 2005-2007, 2009-2011 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.
@@ -9,15 +9,6 @@ dnl From Bruno Haible.
 
 AC_DEFUN([gl_MBCHAR],
 [
-  AC_REQUIRE([AC_GNU_SOURCE])
-  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
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([AC_C_INLINE])
 ])