X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fwctype.m4;h=f6e85addc324cfcbf5a34f2c14ab72103dab1e85;hb=1d71dc7c690b5fe61e3e0c06303ffb59434bba4b;hp=d8aa554b1613f55818b266d076f1ef58c782484d;hpb=58e95e4ccdedb2d3aa24424d412167580346bb70;p=gnulib.git

diff --git a/m4/wctype.m4 b/m4/wctype.m4
index d8aa554b1..f6e85addc 100644
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -1,36 +1,12 @@
-dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
-
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# wctype.m4 serial 2
+dnl Copyright (C) 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.
 
-dnl Written by Paul Eggert.
-
-AC_DEFUN([gl_WCTYPE_H],
+AC_DEFUN([gl_FUNC_WCTYPE],
 [
-  AC_CHECK_FUNCS_ONCE([iswcntrl])
-  AC_CHECK_HEADERS_ONCE([wctype.h])
-  AC_REQUIRE([AC_C_INLINE])
-
-  AC_REQUIRE([gt_TYPE_WINT_T])
-  AC_SUBST([HAVE_WINT_T])
-
-  WCTYPE_H=wctype.h
-  if test $ac_cv_header_wctype_h = yes; then
-    if test "$ac_cv_func_iswcntrl" = yes; then
-      WCTYPE_H=
-      ABSOLUTE_WCTYPE_H=\"does/not/matter.h\"
-    else
-      gl_ABSOLUTE_HEADER([wctype.h])
-      ABSOLUTE_WCTYPE_H=\"$gl_cv_absolute_wctype_h\"
-    fi
-    HAVE_WCTYPE_H=1
-  else
-    ABSOLUTE_WCTYPE_H=\"no/such/file/wctype.h\"
-    HAVE_WCTYPE_H=0
-  fi
-  AC_SUBST([ABSOLUTE_WCTYPE_H])
-  AC_SUBST([HAVE_WCTYPE_H])
-  AC_SUBST([WCTYPE_H])
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  HAVE_WCTYPE=$HAVE_WCTYPE_T
 ])