X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fwctype.m4;h=f6e85addc324cfcbf5a34f2c14ab72103dab1e85;hb=531e3287a33c005edeeba10b0ab0910c6686e049;hp=357c7a5f982f9df5112bfa7ee69132126bb84ce8;hpb=5feb40015695ca27cd3ca51a7c09ca1787fd4483;p=gnulib.git

diff --git a/m4/wctype.m4 b/m4/wctype.m4
index 357c7a5f9..f6e85addc 100644
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -1,56 +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])
-
-  if test $ac_cv_header_wctype_h = yes; then
-    gl_ABSOLUTE_HEADER([wctype.h])
-    ABSOLUTE_WCTYPE_H=\"$gl_cv_absolute_wctype_h\"
-    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])
-
-  WCTYPE_H=wctype.h
-  HAVE_WCTYPE_CTMP_BUG=0
-  if test $ac_cv_header_wctype_h = yes; then
-    dnl IRIX 5.3 has a bug: its isw* macros reference an undefined variable
-    dnl _ctmp_. Test against this bug.
-    AC_CACHE_CHECK([whether wctype macros need _ctmp_ declared],
-      [gl_cv_wctype_ctmp_bug],
-      [gl_cv_wctype_ctmp_bug=no
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-	    [[#include <wctype.h>
-	    ]],
-	    [[return iswprint (0);]])],
-	 [gl_cv_wctype_ctmp_bug='no, but bare wctype.h does not work'],
-	 [AC_COMPILE_IFELSE(
-	    [AC_LANG_PROGRAM(
-	       [[#include <wctype.h>
-		 static wint_t _ctmp_;]],
-	       [[return iswprint (0);]])],
-	    [gl_cv_wctype_ctmp_bug=yes])])])
-    case $gl_cv_wctype_ctmp_bug,$ac_cv_func_iswcntrl in #(
-      yes,*)
-	HAVE_WCTYPE_CTMP_BUG=1;; #(
-      no,yes)
-	WCTYPE_H=;;
-    esac
-  fi
-  AC_SUBST([WCTYPE_H])
-  AC_SUBST([HAVE_WCTYPE_CTMP_BUG])
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  HAVE_WCTYPE=$HAVE_WCTYPE_T
 ])