Make the generated wctype.h more self-contained.

diff --git a/ChangeLog b/ChangeLog
index a84e79867d358f8132be79de3c479ced9a5f1558..f302e62007e1a4c489fdc50256a4beb8f94b0967 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-01  Bruno Haible  <bruno@clisp.org>
+
+       * 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.
+
 2007-05-01  Bruno Haible  <bruno@clisp.org>
 
        * lib/sys_stat_.h: Test HAVE_LSTAT, HAVE_DECL_MKDIR, HAVE_IO_H at
@@ -30171,4 +30178,4 @@
 
        * m4/isc-posix.m4: New file.
 
-1998-05-10  Jim Meyering  <meyering@ascend.com>
\ No newline at end of file
+1998-05-10  Jim Meyering  <meyering@ascend.com>

diff --git a/lib/wctype_.h b/lib/wctype_.h
index 460cee2bc6c32ebad8cb9c19ca6ec3216f063ef5..110a68eda06b95c6391d5ced41306df232ebc751 100644 (file)
--- a/lib/wctype_.h
+++ b/lib/wctype_.h
@@ -63,7 +63,7 @@ typedef int __wctype_wint_t;
 
 /* 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
+#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

diff --git a/m4/wctype.m4 b/m4/wctype.m4
index 62994c62bae15968b543a861b033d0d42dd95e4c..a56834d0ce6acabb0f0d84c9467d78a9419e31d0 100644 (file)
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -10,6 +10,12 @@ dnl Written by Paul Eggert.
 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,7 +29,7 @@ AC_DEFUN([gl_WCTYPE_H],
 
   WCTYPE_H=wctype.h
   if test $ac_cv_header_wctype_h = yes; then
-    if test "$ac_cv_func_iswcntrl" = yes; then
+    if test $ac_cv_func_iswcntrl = yes; then
       WCTYPE_H=
     fi
     dnl Compute ABSOLUTE_WCTYPE_H even if WCTYPE_H is empty,

diff --git a/modules/wctype b/modules/wctype
index a6fd3467e9aedcf79e0db2816a49c250ec4f04f5..3365ecc239d50dbc1d53340ea2871a87c880fff5 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -22,7 +22,7 @@ wctype.h: wctype_.h
        { 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_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
              < $(srcdir)/wctype_.h; \
        } > $@-t