make wctype.h self-contained

[Bruno Haible]

wctype.h too can be made more self-contained.

2007-05-01  Bruno Haible  <address@hidden>

        * lib/wctype_.h: Test HAVE_ISWCNTRL at configure time.
        * m4/wctype.m4 (gl_WCTYPE_H): Substitute HAVE_ISWCNTRL.
        * modules/wctype (Makefile.am): Substitute HAVE_ISWCNTRL instead of
        HAVE_WCTYPE_CTMP_BUG into wctype.h.

*** lib/wctype_.h       27 Apr 2007 11:09:11 -0000      1.10
--- lib/wctype_.h       1 May 2007 18:18:29 -0000
***************
*** 63,69 ****
  
  /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
     Assume all 12 functions are implemented the same way, or not at all.  */
! #if ! HAVE_ISWCNTRL
  
  /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
     undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
--- 63,69 ----
  
  /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
     Assume all 12 functions are implemented the same way, or not at all.  */
! #if ! @HAVE_ISWCNTRL@
  
  /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
     undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
*** m4/wctype.m4        10 Jan 2007 22:25:04 -0000      1.8
--- m4/wctype.m4        1 May 2007 18:18:29 -0000
***************
*** 10,15 ****
--- 10,21 ----
  AC_DEFUN([gl_WCTYPE_H],
  [
    AC_CHECK_FUNCS_ONCE([iswcntrl])
+   if test $ac_cv_func_iswcntrl = yes; then
+     HAVE_ISWCNTRL=1
+   else
+     HAVE_ISWCNTRL=0
+   fi
+   AC_SUBST([HAVE_ISWCNTRL])
    AC_CHECK_HEADERS_ONCE([wctype.h])
    AC_REQUIRE([AC_C_INLINE])
  
***************
*** 23,29 ****
  
    WCTYPE_H=wctype.h
    if test $ac_cv_header_wctype_h = yes; then
!     if test "$ac_cv_func_iswcntrl" = yes; then
        WCTYPE_H=
      fi
      dnl Compute ABSOLUTE_WCTYPE_H even if WCTYPE_H is empty,
--- 29,35 ----
  
    WCTYPE_H=wctype.h
    if test $ac_cv_header_wctype_h = yes; then
!     if test $ac_cv_func_iswcntrl = yes; then
        WCTYPE_H=
      fi
      dnl Compute ABSOLUTE_WCTYPE_H even if WCTYPE_H is empty,
*** modules/wctype      10 Jan 2007 22:25:04 -0000      1.5
--- modules/wctype      1 May 2007 18:18:29 -0000
***************
*** 22,28 ****
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
              -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
!             -e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
              < $(srcdir)/wctype_.h; \
        } > address@hidden
--- 22,28 ----
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
              -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
!             -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
              < $(srcdir)/wctype_.h; \
        } > address@hidden